Namespace refactoring (part 6)