diff --git a/doc/install-guide/section_nova-compute.xml b/doc/install-guide/section_nova-compute.xml
index cc6217fbbb..8ce028a5ed 100644
--- a/doc/install-guide/section_nova-compute.xml
+++ b/doc/install-guide/section_nova-compute.xml
@@ -55,7 +55,7 @@
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT auth_host <replaceable>controller</replaceable></userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_user nova</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_tenant_name service</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_password <replaceable>NOVA_PASS</replaceable></userinput></screen>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_password <replaceable>NOVA_DBPASS</replaceable></userinput></screen>
   <para os="ubuntu;debian">Edit <filename>/etc/nova/nova.conf</filename> and add to the <literal>[DEFAULT]</literal> section.</para>
   <programlisting os="ubuntu;debian" language="ini">...
 [DEFAULT]
@@ -64,7 +64,7 @@ auth_strategy=keystone
 auth_host=<replaceable>controller</replaceable>
 admin_user=nova
 admin_tenant_name=service
-admin_password=<replaceable>NOVA_PASS</replaceable></programlisting>
+admin_password=<replaceable>NOVA_DBPASS</replaceable></programlisting>
 
       <screen os="fedora;rhel;centos"><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf \
   DEFAULT rpc_backend nova.openstack.common.rpc.impl_qpid</userinput>
@@ -109,7 +109,7 @@ paste.filter_factory=keystoneclient.middleware.auth_token:filter_factory
 auth_host=controller
 admin_user=nova
 admin_tenant_name=service
-admin_password=<replaceable>NOVA_PASS</replaceable>
+admin_password=<replaceable>NOVA_DBPASS</replaceable>
 </programlisting>
       <note os="fedora;rhel;centos;opensuse"><para>Ensure that <filename>api_paste_config=/etc/nova/api-paste.ini</filename> is set in
         <filename>/etc/nova/nova.conf</filename>.</para></note>
diff --git a/doc/install-guide/section_nova-controller.xml b/doc/install-guide/section_nova-controller.xml
index e0ec2d721a..e992f289d2 100644
--- a/doc/install-guide/section_nova-controller.xml
+++ b/doc/install-guide/section_nova-controller.xml
@@ -97,7 +97,7 @@ vncserver_proxyclient_address=192.168.0.10
   <literal>service</literal> tenant and give the user the
   <literal>admin</literal> role.</para>
 
-  <screen><prompt>#</prompt> <userinput>keystone user-create --name=nova --pass=<replaceable>NOVA_PASS</replaceable> --email=<replaceable>nova@example.com</replaceable></userinput>
+  <screen><prompt>#</prompt> <userinput>keystone user-create --name=nova --pass=<replaceable>NOVA_DBPASS</replaceable> --email=<replaceable>nova@example.com</replaceable></userinput>
 <prompt>#</prompt> <userinput>keystone user-role-add --user=nova --tenant=service --role=admin</userinput></screen>
   </step>
   <step>
@@ -108,7 +108,7 @@ vncserver_proxyclient_address=192.168.0.10
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT auth_host <replaceable>controller</replaceable></userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_user nova</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_tenant_name service</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_password <replaceable>NOVA_PASS</replaceable></userinput></screen>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_password <replaceable>NOVA_DBPASS</replaceable></userinput></screen>
   <para os="ubuntu;debian">Edit <filename>/etc/nova/nova.conf</filename> and add to the <literal>[DEFAULT]</literal> section.</para>
   <programlisting os="ubuntu;debian" language="ini">
 ...
@@ -118,7 +118,7 @@ auth_strategy=keystone
 auth_host=<replaceable>controller</replaceable>
 admin_user=nova
 admin_tenant_name=service
-admin_password=<replaceable>NOVA_PASS</replaceable>
+admin_password=<replaceable>NOVA_DBPASS</replaceable>
       </programlisting>
 
 
@@ -136,7 +136,7 @@ paste.filter_factory=keystoneclient.middleware.auth_token:filter_factory
 auth_host=<replaceable>controller</replaceable>
 admin_user=nova
 admin_tenant_name=service
-admin_password=<replaceable>NOVA_PASS</replaceable>
+admin_password=<replaceable>NOVA_DBPASS</replaceable>
 </programlisting>
   <note os="fedora;rhel;centos;opensuse;debian"><para>Ensure that <literal>api_paste_config=/etc/nova/api-paste.ini</literal>
   is set in <filename>/etc/nova/nova.conf</filename>.</para></note>