Refactor factory name