Renamed some factories