am aa76c462: Merge "Give enum types CamelCase names for clarity."

* commit 'aa76c46288a61d4bf4cafd2da0028ca6418119c9':
  Give enum types CamelCase names for clarity.