CONN-1256 Update for direct namespaces

Ready for merge.