Renamed few classes