Small refactoring of namespace usage