diff --git a/config-generator.conf b/config-generator.conf
index 80a39b9d6d..678f19d59d 100644
--- a/config-generator.conf
+++ b/config-generator.conf
@@ -4,7 +4,7 @@ wrap_width = 79
 namespace = heat.common.config
 namespace = heat.common.context
 namespace = heat.common.crypt
-namespace = heat.engine.clients.keystone.heat_keystoneclient
+namespace = heat.engine.clients.os.keystone.heat_keystoneclient
 namespace = heat.common.wsgi
 namespace = heat.engine.clients
 namespace = heat.engine.notification
diff --git a/setup.cfg b/setup.cfg
index d32d4b5e77..585fec7047 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -45,7 +45,7 @@ oslo.config.opts =
     heat.common.config = heat.common.config:list_opts
     heat.common.context = heat.common.context:list_opts
     heat.common.crypt = heat.common.crypt:list_opts
-    heat.common.heat_keystoneclient = heat.engine.clients.os.keystone.heat_keystoneclient:list_opts
+    heat.engine.clients.os.keystone.heat_keystoneclient = heat.engine.clients.os.keystone.heat_keystoneclient:list_opts
     heat.common.wsgi = heat.common.wsgi:list_opts
     heat.engine.clients = heat.engine.clients:list_opts
     heat.engine.notification = heat.engine.notification:list_opts