namespaces, refactoring, renaming