Refactoring names and namespaces