diff --git a/activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt b/activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt
index cddde50691..70b2b8b0b1 100644
--- a/activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt
+++ b/activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt
@@ -1,8 +1,8 @@
-  _   _                       _    ___
- | | | | ___  _ __ _ __   ___| |_ / _ \
- | |_| |/ _ \| '__| '_ \ / _ \ __| | | |
- |  _  | (_) | |  | | | |  __/ |_| |_| |
- |_| |_|\___/|_|  |_| |_|\___|\__|\__\_\
+     _        _   _           __  __  ___
+    / \   ___| |_(_)_   _____|  \/  |/ _ \
+   / _ \ / __| __| | \ / / _ \ |\/| | | | |
+  / ___ \ (__| |_| |\ V /  __/ |  | | |_| |
+ /_/   \_\___|\__|_| \_/ \___|_|  |_|\__\_\
  ActiveMQ ${project.version}
 
 
diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config.xml b/activemq-server/src/test/resources/live-only-hapolicy-config.xml
index 35818e4f5c..5152e15de4 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+      xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <ha-policy>
       <live-only>
          <scale-down>
diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config2.xml b/activemq-server/src/test/resources/live-only-hapolicy-config2.xml
index db9d4222a2..e80d509681 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config2.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config2.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+      xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <ha-policy>
       <!--only one of the following-->
       <!--on server shutdown scale down to another live server-->
diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config3.xml b/activemq-server/src/test/resources/live-only-hapolicy-config3.xml
index c77f8e4183..6d842beb94 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config3.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config3.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+      xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <ha-policy>
       <!--only one of the following-->
       <!--on server shutdown scale down to another live server-->
diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config4.xml b/activemq-server/src/test/resources/live-only-hapolicy-config4.xml
index 0e7f45a2ec..2fa7fbc2d4 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config4.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config4.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+      xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <ha-policy/>
 
 </configuration>
diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config5.xml b/activemq-server/src/test/resources/live-only-hapolicy-config5.xml
index 83c6c33de8..2a7a560e18 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config5.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config5.xml
@@ -1,6 +1,6 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+      xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
 </configuration>
diff --git a/activemq-server/src/test/resources/replica-hapolicy-config.xml b/activemq-server/src/test/resources/replica-hapolicy-config.xml
index 6874afb63c..01661395c3 100644
--- a/activemq-server/src/test/resources/replica-hapolicy-config.xml
+++ b/activemq-server/src/test/resources/replica-hapolicy-config.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+      xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <ha-policy>
       <replication>
          <slave>
diff --git a/activemq-server/src/test/resources/replica-hapolicy-config2.xml b/activemq-server/src/test/resources/replica-hapolicy-config2.xml
index dba47b09b3..868d056ad9 100644
--- a/activemq-server/src/test/resources/replica-hapolicy-config2.xml
+++ b/activemq-server/src/test/resources/replica-hapolicy-config2.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+      xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <ha-policy>
       <replication>
          <slave>
diff --git a/activemq-server/src/test/resources/replica-hapolicy-config3.xml b/activemq-server/src/test/resources/replica-hapolicy-config3.xml
index 6dea68dd4f..5c08357dc1 100644
--- a/activemq-server/src/test/resources/replica-hapolicy-config3.xml
+++ b/activemq-server/src/test/resources/replica-hapolicy-config3.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+      xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <ha-policy>
       <replication>
          <slave>
diff --git a/activemq-server/src/test/resources/replicated-hapolicy-config.xml b/activemq-server/src/test/resources/replicated-hapolicy-config.xml
index 3cb67e1c3d..75e96f72fa 100644
--- a/activemq-server/src/test/resources/replicated-hapolicy-config.xml
+++ b/activemq-server/src/test/resources/replicated-hapolicy-config.xml
@@ -1,7 +1,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+      xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <ha-policy>
       <replication>
          <master>
diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
index 06f014a44d..5bc5b61810 100644
--- a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
@@ -3,7 +3,7 @@
                xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <!--
    if you want to run this as a backup on different ports you would need to set the following variable
-   export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
+   export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dactivemq.remoting.netty.host=localhost -Dactivemq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
    -->
 
    <paging-directory>${data.dir:../data}/paging</paging-directory>
diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
index 0f60895812..45f3820fa8 100644
--- a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
@@ -3,7 +3,7 @@
                xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <!--
    if you want to run this as a backup on different ports you would need to set the following variable
-   export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
+   export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dactivemq.remoting.netty.host=localhost -Dactivemq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
    -->
 
    <paging-directory>${data.dir:../data}/paging</paging-directory>
diff --git a/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.ent b/docs/quickstart-guide/en/ActiveMQ_QuickStart_Guide.ent
similarity index 100%
rename from docs/quickstart-guide/en/HornetQ_QuickStart_Guide.ent
rename to docs/quickstart-guide/en/ActiveMQ_QuickStart_Guide.ent
diff --git a/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.xml b/docs/quickstart-guide/en/ActiveMQ_QuickStart_Guide.xml
similarity index 100%
rename from docs/quickstart-guide/en/HornetQ_QuickStart_Guide.xml
rename to docs/quickstart-guide/en/ActiveMQ_QuickStart_Guide.xml
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml
index 5cbdcfc213..b42e5aaf58 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml
index 2010768430..00f88bebbc 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml
index 11aecb59bf..43692a40e1 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -34,7 +34,7 @@
       <broadcast-group name="my-broadcast-group">
          <broadcast-period>5000</broadcast-period>
          <jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
-         <jgroups-channel>hornetq_broadcast_channel</jgroups-channel>
+         <jgroups-channel>active_broadcast_channel</jgroups-channel>
          <connector-ref>netty-connector</connector-ref>
       </broadcast-group>
    </broadcast-groups>
@@ -42,7 +42,7 @@
    <discovery-groups>
       <discovery-group name="my-discovery-group">
          <jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
-         <jgroups-channel>hornetq_broadcast_channel</jgroups-channel>
+         <jgroups-channel>active_broadcast_channel</jgroups-channel>
          <refresh-timeout>10000</refresh-timeout>
       </discovery-group>
    </discovery-groups>
diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-configuration.xml
index 4023a2eed8..b19c11f80e 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -33,7 +33,7 @@
       <broadcast-group name="my-broadcast-group">
          <broadcast-period>5000</broadcast-period>
          <jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
-         <jgroups-channel>hornetq_broadcast_channel</jgroups-channel>
+         <jgroups-channel>active_broadcast_channel</jgroups-channel>
          <connector-ref>netty-connector</connector-ref>
       </broadcast-group>
    </broadcast-groups>
@@ -41,7 +41,7 @@
    <discovery-groups>
       <discovery-group name="my-discovery-group">
          <jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
-         <jgroups-channel>hornetq_broadcast_channel</jgroups-channel>
+         <jgroups-channel>active_broadcast_channel</jgroups-channel>
          <refresh-timeout>10000</refresh-timeout>
       </discovery-group>
    </discovery-groups>
diff --git a/examples/jms/clustered-standalone/readme.html b/examples/jms/clustered-standalone/readme.html
index 54f0d4e009..220e76a1c2 100644
--- a/examples/jms/clustered-standalone/readme.html
+++ b/examples/jms/clustered-standalone/readme.html
@@ -32,10 +32,10 @@
         <li>in the first terminal, go to the <code>bin</code> directory and start the first server (with default configuration):
            <pre class="prettyprint"><code>./run.sh ../config/stand-alone/clustered</code></pre>
         <li>in the second terminal, start the second server:
-           <pre class="prettyprint"><code>export CLUSTER_PROPS="-Ddata.dir=../data-server2 -Djnp.port=2099 -Djnp.rmiPort=2098 -Dhornetq.remoting.netty.port=6445 -Dhornetq.remoting.netty.batch.port=6455"
+           <pre class="prettyprint"><code>export CLUSTER_PROPS="-Ddata.dir=../data-server2 -Djnp.port=2099 -Djnp.rmiPort=2098 -Dactivemq.remoting.netty.port=6445 -Dhornetq.remoting.netty.batch.port=6455"
 ./run.sh ../config/stand-alone/clustered</code></pre>
         <li>in the third terminal, start the third server (with default configuration):
-           <pre class="prettyprint"><code>export CLUSTER_PROPS="-Ddata.dir=../data-server3 -Djnp.port=3099 -Djnp.rmiPort=3098 -Dhornetq.remoting.netty.port=7445 -Dhornetq.remoting.netty.batch.port=7455"
+           <pre class="prettyprint"><code>export CLUSTER_PROPS="-Ddata.dir=../data-server3 -Djnp.port=3099 -Djnp.rmiPort=3098 -Dactivemq.remoting.netty.port=7445 -Dhornetq.remoting.netty.batch.port=7455"
 ./run.sh ../config/stand-alone/clustered</code></pre>
         <li>finally, in the fourth terminal, start the example
            <pre class="prettyprint"><code>./build.sh runRemote</code> (or <code>build.bat runRemote</code> on windows)</pre>
diff --git a/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml
index f7f5375caf..5db43ea3d8 100644
--- a/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml
+++ b/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq ../schema/activemq-security.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-security.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
index 5cbdcfc213..b42e5aaf58 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
index b4dd7a1040..2094f57719 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml
index ee881cd67c..c1d1e842b1 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
index a506972eed..5dce0cd511 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
index 4e2efba7ef..c9301200a5 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
index 00a8aa0283..27bbe99ba2 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml
index ee93080305..b1ccc9ace3 100644
--- a/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <connectors>
       <connector name="netty-connector">
diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
index 482f52a5f3..3854f191d0 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml
index 4f698014c6..b6e3935a04 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
index fd176b609e..7e9f424493 100644
--- a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
index 6e9d929d22..95c55966af 100644
--- a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
index 437b70ecd3..1b19ccf2f7 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
index b9fb02e20e..0be89a708f 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
index b25cb75d00..e1e6d9e20a 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server2/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
index ec4de64b1e..a586414d87 100644
--- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
index b74f4cea46..f545a188e0 100644
--- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
index 34a26c1e15..5f96c16b40 100644
--- a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
index 2e226bdb7b..2089d76138 100644
--- a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/soak/normal/server0/activemq-configuration.xml b/examples/soak/normal/server0/activemq-configuration.xml
index 43d329775e..3a7a4cb296 100644
--- a/examples/soak/normal/server0/activemq-configuration.xml
+++ b/examples/soak/normal/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <connectors>
       <connector name="netty-connector">