Renamed entities to have Factory