Renamed api class and model class