diff --git a/docs/en-US/aws-ec2-configuration.xml b/docs/en-US/aws-ec2-configuration.xml
index d6dd2b5467e..f0f2d0f6cdc 100644
--- a/docs/en-US/aws-ec2-configuration.xml
+++ b/docs/en-US/aws-ec2-configuration.xml
@@ -95,8 +95,8 @@
         <note>
             <para>(Optional) The AWS API listens for requests on port 7080. If you prefer AWS API to listen on another port, you can change it as follows:</para>
             <orderedlist numeration="loweralpha">
-                <listitem><para>Edit the files /etc/cloud/management/server.xml, /etc/cloud/management/server-nonssl.xml,
-                          and /etc/cloud/management/server-ssl.xml.</para></listitem>
+                <listitem><para>Edit the files /etc/cloudstack/management/server.xml, /etc/cloudstack/management/server-nonssl.xml,
+                          and /etc/cloudstack/management/server-ssl.xml.</para></listitem>
                 <listitem><para>In each file, find the tag &lt;Service name="Catalina7080"&gt;. Under this tag,
                           locate &lt;Connector executor="tomcatThreadPool-internal" port= ....&lt;.</para></listitem>
                 <listitem><para>Change the port to whatever port you want to use, then save the files.</para></listitem>
diff --git a/docs/en-US/change-database-config.xml b/docs/en-US/change-database-config.xml
index 34e767251e0..567b9e41d04 100644
--- a/docs/en-US/change-database-config.xml
+++ b/docs/en-US/change-database-config.xml
@@ -24,5 +24,5 @@
 
 <section id="change-database-config">
     <title>Changing the Database Configuration</title>
-    <para>The &PRODUCT; Management Server stores database configuration information (e.g., hostname, port, credentials) in the file <filename>/etc/cloud/management/db.properties</filename>. To effect a change, edit this file on each Management Server, then restart the Management Server.</para> 
+    <para>The &PRODUCT; Management Server stores database configuration information (e.g., hostname, port, credentials) in the file <filename>/etc/cloudstack/management/db.properties</filename>. To effect a change, edit this file on each Management Server, then restart the Management Server.</para> 
 </section>
diff --git a/docs/en-US/change-database-password.xml b/docs/en-US/change-database-password.xml
index 2bff289eb5a..e9b972f45bf 100644
--- a/docs/en-US/change-database-password.xml
+++ b/docs/en-US/change-database-password.xml
@@ -24,7 +24,7 @@
 
 <section id="change-database-password">
     <title>Changing the Database Password</title>
-    <para>You may need to change the password for the MySQL account used by CloudStack. If so, you'll need to change the password in MySQL, and then add the encrypted password to <filename>/etc/cloud/management/db.properties</filename>.</para> 
+    <para>You may need to change the password for the MySQL account used by CloudStack. If so, you'll need to change the password in MySQL, and then add the encrypted password to <filename>/etc/cloudstack/management/db.properties</filename>.</para> 
     <orderedlist>
     <listitem>
         <para>Before changing the password, you'll need to stop CloudStack's management server and the usage engine if you've deployed that component.</para>
@@ -46,11 +46,11 @@
 </screen>
     </listitem>
     <listitem>
-        <para>The next step is to encrypt the password and copy the encrypted password to CloudStack's database configuration (<filename>/etc/cloud/management/db.properties</filename>).</para>
+        <para>The next step is to encrypt the password and copy the encrypted password to CloudStack's database configuration (<filename>/etc/cloudstack/management/db.properties</filename>).</para>
 <screen>
-<command># java -classpath /usr/share/java/cloud-jasypt-1.8.jar \
+    <command># java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.0.jar \
 org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh \ 
-input="newpassword123" password="`cat /etc/cloud/management/key`" \
+input="newpassword123" password="`cat /etc/cloudstack/management/key`" \
 verbose=false 
 </command>
 </screen>
@@ -59,7 +59,7 @@ verbose=false
 </note>
 </listitem>
 <listitem>
-    <para>Now, you'll update <filename>/etc/cloud/management/db.properties</filename> with the new ciphertext. Open <filename>/etc/cloud/management/db.properties</filename> in a text editor, and update these parameters: </para>
+    <para>Now, you'll update <filename>/etc/cloudstack/management/db.properties</filename> with the new ciphertext. Open <filename>/etc/cloudstack/management/db.properties</filename> in a text editor, and update these parameters: </para>
     <programlisting>
 db.cloud.password=ENC(encrypted_password_from_above) 
 db.usage.password=ENC(encrypted_password_from_above) 
diff --git a/docs/en-US/database-replication.xml b/docs/en-US/database-replication.xml
index 7354aaa9f34..8ca80713732 100644
--- a/docs/en-US/database-replication.xml
+++ b/docs/en-US/database-replication.xml
@@ -132,7 +132,7 @@ mysql> start slave;
         <listitem><para>Stop the Management Servers (via service cloudstack-management stop).</para></listitem>
         <listitem><para>Change the replica's configuration to be a master and restart it.</para></listitem>
         <listitem><para>Ensure that the replica's port 3306 is open to the Management Servers.</para></listitem>
-        <listitem><para>Make a change so that the Management Server uses the new database. The simplest process here is to put the IP address of the new database server into each Management Server's /etc/cloud/management/db.properties.</para></listitem>
+        <listitem><para>Make a change so that the Management Server uses the new database. The simplest process here is to put the IP address of the new database server into each Management Server's /etc/cloudstack/management/db.properties.</para></listitem>
         <listitem>
         <para>Restart the Management Servers:</para>
         <programlisting>
diff --git a/docs/en-US/increase-management-server-max-memory.xml b/docs/en-US/increase-management-server-max-memory.xml
index 51c8724a020..8992ad6f16a 100644
--- a/docs/en-US/increase-management-server-max-memory.xml
+++ b/docs/en-US/increase-management-server-max-memory.xml
@@ -26,7 +26,7 @@
     <title>Increase Management Server Maximum Memory</title>
     <para>If the Management Server is subject to high demand, the default maximum JVM memory allocation can be insufficient. To increase the memory:</para>
     <orderedlist>
-        <listitem><para>Edit the Tomcat configuration file:</para><programlisting>/etc/cloud/management/tomcat6.conf</programlisting></listitem>
+        <listitem><para>Edit the Tomcat configuration file:</para><programlisting>/etc/cloudstack/management/tomcat6.conf</programlisting></listitem>
         <listitem><para>Change the command-line parameter -XmxNNNm to a higher value of N.</para><para>For example, if the current value is -Xmx128m, change it to -Xmx1024m or higher.</para></listitem>
         <listitem><para>To put the new setting into effect, restart the Management Server.</para><programlisting># service cloudstack-management restart</programlisting></listitem>
       </orderedlist>