Use values from enum types for field labels.
Fix some capitalization inconsistencies.