Renamed a factory class