Renamed two enums to follow convention.