Changed Enum Types to Uppercase