diff --git a/doc/install-guide/section_ceilometer-controller.xml b/doc/install-guide/section_ceilometer-controller.xml
index 75b597a3e6..678e11fe5f 100644
--- a/doc/install-guide/section_ceilometer-controller.xml
+++ b/doc/install-guide/section_ceilometer-controller.xml
@@ -153,8 +153,8 @@ Repeat User Password:
         <step>
           <para>Create the <literal>ceilometer</literal> service
             entity:</para>
-          <screen><prompt>$</prompt> <userinput>openstack service create --type metering \
-  --description "Telemetry" ceilometer</userinput>
+          <screen><prompt>$</prompt> <userinput>openstack service create --name ceilometer \
+  --description "Telemetry" metering</userinput>
 <computeroutput>+-------------+----------------------------------+
 | Field       | Value                            |
 +-------------+----------------------------------+
diff --git a/doc/install-guide/section_cinder-controller-node.xml b/doc/install-guide/section_cinder-controller-node.xml
index bf68e18877..d8942fc0f0 100644
--- a/doc/install-guide/section_cinder-controller-node.xml
+++ b/doc/install-guide/section_cinder-controller-node.xml
@@ -76,8 +76,8 @@ Repeat User Password:
         </step>
         <step>
           <para>Create the <literal>cinder</literal> service entities:</para>
-          <screen><prompt>$</prompt> <userinput>openstack service create --type volume \
-  --description "OpenStack Block Storage" cinder</userinput>
+          <screen><prompt>$</prompt> <userinput>openstack service create --name cinder \
+  --description "OpenStack Block Storage" volume</userinput>
 <computeroutput>+-------------+----------------------------------+
 | Field       | Value                            |
 +-------------+----------------------------------+
@@ -87,8 +87,8 @@ Repeat User Password:
 | name        | cinder                           |
 | type        | volume                           |
 +-------------+----------------------------------+</computeroutput></screen>
-          <screen><prompt>$</prompt> <userinput>openstack service create --type volumev2 \
-  --description "OpenStack Block Storage" cinderv2</userinput>
+          <screen><prompt>$</prompt> <userinput>openstack service create --name cinderv2 \
+  --description "OpenStack Block Storage" volumev2</userinput>
 <computeroutput>+-------------+----------------------------------+
 | Field       | Value                            |
 +-------------+----------------------------------+
diff --git a/doc/install-guide/section_glance-install.xml b/doc/install-guide/section_glance-install.xml
index eacb020501..a375f4c098 100644
--- a/doc/install-guide/section_glance-install.xml
+++ b/doc/install-guide/section_glance-install.xml
@@ -84,9 +84,9 @@ Repeat User Password:
         </step>
         <step>
           <para>Create the <literal>glance</literal> service entity:</para>
-          <screen><prompt>$</prompt> <userinput>openstack service create --type image \
-  --description "OpenStack Image service" glance</userinput>
-<computeroutput>+-------------+----------------------------------+
+          <screen><prompt>$</prompt> <userinput>openstack service create --name glance \
+  --description "OpenStack Image service" image</userinput></screen>
+<screen><computeroutput>+-------------+----------------------------------+
 | Field       | Value                            |
 +-------------+----------------------------------+
 | description | OpenStack Image service          |
diff --git a/doc/install-guide/section_heat-install.xml b/doc/install-guide/section_heat-install.xml
index 76827de85e..435ad03260 100644
--- a/doc/install-guide/section_heat-install.xml
+++ b/doc/install-guide/section_heat-install.xml
@@ -118,8 +118,8 @@ Repeat User Password:
         <step>
           <para>Create the <literal>heat</literal> and
             <literal>heat-cfn</literal> service entities:</para>
-          <screen><prompt>$</prompt> <userinput>openstack service create --type orchestration \
-  --description "Orchestration" heat</userinput>
+          <screen><prompt>$</prompt> <userinput>openstack service create --name heat \
+  --description "Orchestration" orchestration</userinput>
 <computeroutput>+-------------+----------------------------------+
 | Field       | Value                            |
 +-------------+----------------------------------+
@@ -129,8 +129,8 @@ Repeat User Password:
 | name        | heat                             |
 | type        | orchestration                    |
 +-------------+----------------------------------+</computeroutput>
-<prompt>$</prompt> <userinput>openstack service create --type cloudformation \
-  --description "Orchestration" heat-cfn</userinput>
+<prompt>$</prompt> <userinput>openstack service create --name heat-cfn \
+  --description "Orchestration"  cloudformation</userinput>
 <computeroutput>+-------------+----------------------------------+
 | Field       | Value                            |
 +-------------+----------------------------------+
diff --git a/doc/install-guide/section_keystone-install.xml b/doc/install-guide/section_keystone-install.xml
index c8397cd6cb..19f7b2c000 100644
--- a/doc/install-guide/section_keystone-install.xml
+++ b/doc/install-guide/section_keystone-install.xml
@@ -252,7 +252,7 @@ admin_token = <replaceable>ADMIN_TOKEN</replaceable></programlisting>
       <title>Create the Identity service endpoints</title>
       <para>In Debian, the Keystone package offers automatic registration of Keystone
         in the service catalogue. This is equivalent of running the below commands:</para>
-      <screen><prompt>#</prompt> <userinput>openstack service create --type identity --description "OpenStack Identity" keystone</userinput>
+      <screen><prompt>#</prompt> <userinput>openstack service create --name keystone --description "OpenStack Identity"  identity</userinput>
 <prompt>#</prompt> <userinput>keystone endpoint-create \
   --publicurl http://<replaceable>controller</replaceable>:5000/v2.0 \
   --internalurl http://<replaceable>controller</replaceable>:5000/v2.0 \
diff --git a/doc/install-guide/section_keystone-services.xml b/doc/install-guide/section_keystone-services.xml
index 837a8474ac..8f783bdedd 100644
--- a/doc/install-guide/section_keystone-services.xml
+++ b/doc/install-guide/section_keystone-services.xml
@@ -55,9 +55,10 @@
         OpenStack environment. Services use this catalog to determine
         the other services available in your environment.</para>
       <para>Create the service entity for the Identity service:</para>
-      <screen><prompt>$</prompt> <userinput>openstack service create --type identity \
-  --description "OpenStack Identity" keystone</userinput>
-<computeroutput>+-------------+----------------------------------+
+
+      <screen><prompt>$</prompt> <userinput>openstack service create \
+  --name keystone --description "OpenStack Identity" identity</userinput></screen>
+<screen><computeroutput>+-------------+----------------------------------+
 | Field       | Value                            |
 +-------------+----------------------------------+
 | description | OpenStack Identity               |
diff --git a/doc/install-guide/section_neutron-controller-node.xml b/doc/install-guide/section_neutron-controller-node.xml
index bc9a661a67..be34583fea 100644
--- a/doc/install-guide/section_neutron-controller-node.xml
+++ b/doc/install-guide/section_neutron-controller-node.xml
@@ -73,9 +73,9 @@ Repeat User Password:
         </step>
         <step>
           <para>Create the <literal>neutron</literal> service entity:</para>
-          <screen><prompt>$</prompt> <userinput>openstack service create --type network \
-  --description "OpenStack Networking" neutron</userinput>
-<computeroutput>+-------------+----------------------------------+
+          <screen><prompt>$</prompt> <userinput>openstack service create --name neutron \
+  --description "OpenStack Networking" network</userinput></screen>
+<screen><computeroutput>+-------------+----------------------------------+
 | Field       | Value                            |
 +-------------+----------------------------------+
 | description | OpenStack Networking             |
diff --git a/doc/install-guide/section_nova-controller-install.xml b/doc/install-guide/section_nova-controller-install.xml
index 4bd2639135..0e41debbe4 100644
--- a/doc/install-guide/section_nova-controller-install.xml
+++ b/doc/install-guide/section_nova-controller-install.xml
@@ -76,9 +76,9 @@ Repeat User Password:
         </step>
         <step>
           <para>Create the <literal>nova</literal> service entity:</para>
-<screen><prompt>$</prompt> <userinput>openstack service create --type compute \
-  --description "OpenStack Compute" nova</userinput>
-<computeroutput>+-------------+----------------------------------+
+<screen><prompt>$</prompt> <userinput>openstack service create --name nova \
+  --description "OpenStack Compute" compute</userinput></screen>
+<screen><computeroutput>+-------------+----------------------------------+
 | Field       | Value                            |
 +-------------+----------------------------------+
 | description | OpenStack Compute                |
diff --git a/doc/install-guide/section_sahara-install.xml b/doc/install-guide/section_sahara-install.xml
index 49518cad8f..064e33be13 100644
--- a/doc/install-guide/section_sahara-install.xml
+++ b/doc/install-guide/section_sahara-install.xml
@@ -162,8 +162,8 @@ Repeat User Password:
         </step>
         <step>
           <para>Create the <literal>sahara</literal> service entity:</para>
-          <screen><prompt>$</prompt> <userinput>openstack service create --type data_processing \
-  --description "Data processing service" sahara</userinput>
+          <screen><prompt>$</prompt> <userinput>openstack service create --name sahara \
+  --description "Data processing service" data_processing</userinput>
 <computeroutput>+-------------+----------------------------------+
 | Field       | Value                            |
 +-------------+----------------------------------+
diff --git a/doc/install-guide/section_swift-controller-node.xml b/doc/install-guide/section_swift-controller-node.xml
index 62e0f10f66..aa215c22d0 100644
--- a/doc/install-guide/section_swift-controller-node.xml
+++ b/doc/install-guide/section_swift-controller-node.xml
@@ -61,8 +61,8 @@ Repeat User Password:
         </step>
         <step>
           <para>Create the <literal>swift</literal> service entity:</para>
-          <screen><prompt>$</prompt> <userinput>openstack service create --type object-store \
-  --description "OpenStack Object Storage" swift</userinput>
+          <screen><prompt>$</prompt> <userinput>openstack service create --name swift \
+  --description "OpenStack Object Storage" object-store</userinput>
 <computeroutput>+-------------+----------------------------------+
 | Field       | Value                            |
 +-------------+----------------------------------+
diff --git a/doc/install-guide/section_trove-install.xml b/doc/install-guide/section_trove-install.xml
index b2ffbdc62d..3ae91dd2f4 100644
--- a/doc/install-guide/section_trove-install.xml
+++ b/doc/install-guide/section_trove-install.xml
@@ -226,8 +226,8 @@ Repeat User Password:
         </step>
         <step>
           <para>Create the <literal>neutron</literal> service entity:</para>
-          <screen><prompt>$</prompt> <userinput>openstack service create --type database \
-  --description "OpenStack Database service" trove</userinput>
+          <screen><prompt>$</prompt> <userinput>openstack service create --name trove \
+  --description "OpenStack Database service" database</userinput>
 <computeroutput>+-------------+----------------------------------+
 | Field       | Value                            |
 +-------------+----------------------------------+