While there, change to uppercase letters to match v2 style. *Risk Level*: n/a *Testing*: bazel test //test/... *Docs Changes*: n/a *Release Notes*: n/a Signed-off-by: Piotr Sikora <piotrsikora@google.com> (cherry picked from commit a614808b9aab7cfd94d66a307a8b65c6c7890097) Signed-off-by: Matt Klein <mklein@lyft.com>