Factory name refactoring