diff --git a/docs/en-US/citrix-xenserver-installation.xml b/docs/en-US/citrix-xenserver-installation.xml
index 9ea632accca..a50b9bcb9ab 100644
--- a/docs/en-US/citrix-xenserver-installation.xml
+++ b/docs/en-US/citrix-xenserver-installation.xml
@@ -555,7 +555,7 @@ master-password=[your password]</programlisting>
         <orderedlist>
           <listitem>
             <para>Copy the script from the Management Server in
-              /usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh to the
+              /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh to the
               master host and ensure it is executable.</para>
           </listitem>
           <listitem>
@@ -614,7 +614,7 @@ master-password=[your password]</programlisting>
             <para>Restart the Management Server and Usage Server. You only need to do this once for
               all clusters.</para>
             <programlisting># service cloudstack-management start
-# service cloud-usage start</programlisting>
+# service cloudstack-usage start</programlisting>
           </listitem>
         </orderedlist>
       </listitem>
@@ -679,19 +679,19 @@ vm: b6cf79c8-02ee-050b-922f-49583d9f1a14 (i-2-8-VM)</programlisting>
                 </thead>
                 <tbody>
                   <row>
-                    <entry><para>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py</para></entry>
+                    <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py</para></entry>
                     <entry><para>/opt/xensource/sm/NFSSR.py</para></entry>
                   </row>
                   <row>
-                    <entry><para>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/setupxenserver.sh</para></entry>
+                    <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/setupxenserver.sh</para></entry>
                     <entry><para>/opt/xensource/bin/setupxenserver.sh</para></entry>
                   </row>
                   <row>
-                    <entry><para>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/make_migratable.sh</para></entry>
+                    <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/make_migratable.sh</para></entry>
                     <entry><para>/opt/xensource/bin/make_migratable.sh</para></entry>
                   </row>
                   <row>
-                    <entry><para>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/cloud-clean-vlan.sh</para></entry>
+                    <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/cloud-clean-vlan.sh</para></entry>
                     <entry><para>/opt/xensource/bin/cloud-clean-vlan.sh</para></entry>
                   </row>
                 </tbody>
diff --git a/docs/en-US/first_ms_node_install.xml b/docs/en-US/first_ms_node_install.xml
index 3c3e51acca1..af6b35b2c53 100644
--- a/docs/en-US/first_ms_node_install.xml
+++ b/docs/en-US/first_ms_node_install.xml
@@ -38,8 +38,8 @@
                     <para>
                         Install the &PRODUCT; management server packages by
                         issuing one of the following commands as appropriate: 
-                        <programlisting><prompt>#</prompt> <command>yum</command> install cloud-client</programlisting>
-                        <programlisting><prompt>#</prompt> <command>apt-get</command> install cloud-client</programlisting>
+                        <programlisting><prompt>#</prompt> <command>yum</command> install cloudstack-management</programlisting>
+                        <programlisting><prompt>#</prompt> <command>apt-get</command> install cloudstack-management</programlisting>
                     </para>
                 </listitem>          
                 <listitem>
diff --git a/docs/en-US/host-add-xenserver-kvm-ovm.xml b/docs/en-US/host-add-xenserver-kvm-ovm.xml
index 6973dbd1cc2..91c36aba7f6 100644
--- a/docs/en-US/host-add-xenserver-kvm-ovm.xml
+++ b/docs/en-US/host-add-xenserver-kvm-ovm.xml
@@ -62,7 +62,7 @@
       <orderedlist>
         <listitem>
           <para>Copy the script from the Management Server in
-            /usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh to the
+            /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh to the
             master host and ensure it is executable.</para>
         </listitem>
         <listitem>
diff --git a/docs/en-US/management-server-install-client.xml b/docs/en-US/management-server-install-client.xml
index 1796142932e..2c5ded76352 100644
--- a/docs/en-US/management-server-install-client.xml
+++ b/docs/en-US/management-server-install-client.xml
@@ -48,6 +48,6 @@
     <para>If the Management Server is RHEL or CentOS, copy vhd-util to
       /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver.</para>
     <para>If the Management Server is Ubuntu, copy vhd-util to
-      /usr/lib/cloud/common/scripts/vm/hypervisor/xenserver.</para>
+      /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver.</para>
   </section>
 </section>
diff --git a/docs/en-US/management-server-install-multi-node.xml b/docs/en-US/management-server-install-multi-node.xml
index ae925bf8447..480d84ea94f 100644
--- a/docs/en-US/management-server-install-multi-node.xml
+++ b/docs/en-US/management-server-install-multi-node.xml
@@ -35,10 +35,8 @@ linkend="sect-source-buildrpm"/> or <xref linkend="sect-source-builddebs"/> as
       <para>This step is required only for installations where XenServer is installed on the hypervisor hosts.</para>
       <para>Download vhd-util from <ulink
           url="http://download.cloud.com.s3.amazonaws.com/tools/vhd-util">vhd-util</ulink></para>
-      <para>If the Management Server is RHEL or CentOS, copy vhd-util to
-        /usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver.</para>
-      <para>If the Management Server is Ubuntu, copy vhd-util to
-        /usr/lib/cloud/common/scripts/vm/hypervisor/xenserver/vhd-util.</para>
+      <para>Copy vhd-util to
+        /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver.</para>
     </listitem>
     <listitem>
       <para> Ensure that necessary services are started and set to start on boot.
diff --git a/docs/en-US/management-server-install-systemvm.xml b/docs/en-US/management-server-install-systemvm.xml
index 928b95618fa..0d930ad62e0 100644
--- a/docs/en-US/management-server-install-systemvm.xml
+++ b/docs/en-US/management-server-install-systemvm.xml
@@ -59,7 +59,7 @@
         </listitem>
       </itemizedlist>
       <para>On Ubuntu, use the following path instead:</para>
-      <programlisting># /usr/lib/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt</programlisting>
+      <programlisting># /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt</programlisting>
     </listitem>
     <listitem>
       <para>If you are using a separate NFS server, perform this step. If you are using the