Renamed some classes and images