Changed Enums to be all caps