CORE-4614: Updates for namespace changes