Simple names refactoring