CONN-1256 Update for direct namespaces

DO NOT MERGE.  Goes with update of our CI.