Renamed a couple of classes