Renamed some classes to make more sense.