Place name refactoring