Renamed some classes to more appropriate names