Renames factories to include _factory for a little disambiguation.