names and namespaces refactoring