Renamed some things to get rid of the old factory name.