Namespace refactor and fix.