Renamed API classes