Refactoring for name change