Renamed several values
Changed EnumValue's equals() to check for type as well for strict enum
comparison