Fix refactoring name issue