Renamed classes names