CRM-17488 Correct capitalization of values