Merge "Give enum types CamelCase names for clarity."