Refactoring names and namespaces.