Update namespaces to pass tests