Renamed categories to be consistent.