Renamed classes and files