- Finished refactoring for namespace change