Fixed namespacing oversights