Renamed config classes