diff --git a/doc/source/man/nova-status.rst b/doc/source/man/nova-status.rst
index 5d38911a8e..032cf69ced 100644
--- a/doc/source/man/nova-status.rst
+++ b/doc/source/man/nova-status.rst
@@ -61,16 +61,25 @@ Upgrade
   service catalog.
 
   **Return Codes**
-    ::
 
-    0) All upgrade readiness checks passed successfully and there is nothing
-       to do.
-    1) At least one check encountered an issue and requires further
-       investigation. This is considered a warning but the upgrade may be OK.
-    2) There was an upgrade status check failure that needs to be
-       investigated. This should be considered something that stops an
-       upgrade.
-    255) An unexpected error occurred.
+  .. list-table::
+     :widths: 20 80
+     :header-rows: 1
+
+     * - Return code
+       - Description
+     * - 0
+       - All upgrade readiness checks passed successfully and there is nothing
+         to do.
+     * - 1
+       - At least one check encountered an issue and requires further
+         investigation. This is considered a warning but the upgrade may be OK.
+     * - 2
+       - There was an upgrade status check failure that needs to be
+         investigated. This should be considered something that stops an
+         upgrade.
+     * - 255
+       - An unexpected error occurred.
 
   **History of Checks**
 
diff --git a/etc/nova/nova-config-generator.conf b/etc/nova/nova-config-generator.conf
index 5c4424ff5d..0f0f81bc75 100644
--- a/etc/nova/nova-config-generator.conf
+++ b/etc/nova/nova-config-generator.conf
@@ -2,8 +2,6 @@
 output_file = etc/nova/nova.conf.sample
 wrap_width = 80
 namespace = nova.conf
-namespace = nova.api
-namespace = nova.cells
 namespace = oslo.log
 namespace = oslo.messaging
 namespace = oslo.policy
diff --git a/setup.cfg b/setup.cfg
index f956373c4c..1448e7086d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,7 +29,7 @@ oslo.config.opts =
     nova.conf = nova.conf.opts:list_opts
 
 oslo.config.opts.defaults =
-    nova.api = nova.common.config:set_middleware_defaults
+    nova.conf = nova.common.config:set_middleware_defaults
 
 oslo.policy.enforcer =
     nova = nova.policy:get_enforcer