updated namespaces post-move