refactoring namespace to be shorter