#242 More namespace refactoring