Cleanup namespacing issues
Cleanup namespacing issues #2