Renamed some classes to remove some naming collisions