clean up namespace issues from refactor