Made the Enum more consistent