Naming Refactoring Done