Namespace fix

Ensure namespacing is proper