diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
index 9f9489a552..35ca9c6e5f 100644
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
    <jms xmlns="urn:activemq:jms">
       <queue name="DLQ"/>
       <queue name="ExpiryQueue"/>
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/FileJMSConfiguration.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/FileJMSConfiguration.java
index c3610cd9ce..68ac4bc203 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/FileJMSConfiguration.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/FileJMSConfiguration.java
@@ -38,7 +38,7 @@ import java.util.Map;
 
 public class FileJMSConfiguration extends JMSConfigurationImpl implements Deployable
 {
-   private static final String CONFIGURATION_SCHEMA_URL = "schema/activemq-jms.xsd";
+   private static final String CONFIGURATION_SCHEMA_URL = "schema/artemis-jms.xsd";
 
    private static final String CONFIGURATION_SCHEMA_ROOT_ELEMENT = "jms";
 
diff --git a/artemis-jms-server/src/main/resources/schema/activemq-jms.xsd b/artemis-jms-server/src/main/resources/schema/artemis-jms.xsd
similarity index 100%
rename from artemis-jms-server/src/main/resources/schema/activemq-jms.xsd
rename to artemis-jms-server/src/main/resources/schema/artemis-jms.xsd
diff --git a/artemis-rest/src/main/resources/schema/activemq-rest.xsd b/artemis-rest/src/main/resources/schema/artemis-rest.xsd
similarity index 100%
rename from artemis-rest/src/main/resources/schema/activemq-rest.xsd
rename to artemis-rest/src/main/resources/schema/artemis-rest.xsd
diff --git a/artemis-rest/src/test/resources/broker.xml b/artemis-rest/src/test/resources/broker.xml
index 5986c24bed..2993d98bc5 100644
--- a/artemis-rest/src/test/resources/broker.xml
+++ b/artemis-rest/src/test/resources/broker.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
       <queue name="exampleQueue"/>
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/FileConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/FileConfiguration.java
index a3aa9ba56c..be9497bc02 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/FileConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/FileConfiguration.java
@@ -34,7 +34,7 @@ public final class FileConfiguration extends ConfigurationImpl implements Deploy
 {
    private static final long serialVersionUID = -4766689627675039596L;
 
-   private static final String CONFIGURATION_SCHEMA_URL = "schema/activemq-configuration.xsd";
+   private static final String CONFIGURATION_SCHEMA_URL = "schema/artemis-configuration.xsd";
 
    private static final String CONFIGURATION_SCHEMA_ROOT_ELEMENT = "core";
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
index c64bee2ffc..8a2969b01e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
@@ -73,7 +73,7 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 /**
- * Parses an XML document according to the {@literal activemq-configuration.xsd} schema.
+ * Parses an XML document according to the {@literal artemis-configuration.xsd} schema.
  */
 public final class FileConfigurationParser extends XMLConfigurationUtil
 {
diff --git a/artemis-server/src/main/resources/schema/activemq-configuration.xsd b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
similarity index 100%
rename from artemis-server/src/main/resources/schema/activemq-configuration.xsd
rename to artemis-server/src/main/resources/schema/artemis-configuration.xsd
diff --git a/artemis-server/src/main/resources/schema/activemq-server.xsd b/artemis-server/src/main/resources/schema/artemis-server.xsd
similarity index 100%
rename from artemis-server/src/main/resources/schema/activemq-server.xsd
rename to artemis-server/src/main/resources/schema/artemis-server.xsd
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java
index 065e17a1ed..9ec1bc39aa 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java
@@ -64,7 +64,7 @@ public class WrongRoleFileConfigurationParserTest extends UnitTestCase
    private static final String configuration =
       "<configuration xmlns=\"urn:activemq\"\n" +
          "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-         "xsi:schemaLocation=\"urn:activemq /schema/activemq-configuration.xsd\">\n" +
+         "xsi:schemaLocation=\"urn:activemq /schema/artemis-configuration.xsd\">\n" +
          "<name>ActiveMQ.main.config</name>" + "\n" +
          "<log-delegate-factory-class-name>org.apache.activemq.artemis.integration.logging.Log4jLogDelegateFactory</log-delegate-factory-class-name>" + "\n" +
          "<bindings-directory>${jboss.server.data.dir}/activemq/bindings</bindings-directory>" + "\n" +
diff --git a/artemis-server/src/test/resources/ConfigurationTest-defaults.xml b/artemis-server/src/test/resources/ConfigurationTest-defaults.xml
index 6c6afb066e..cb97112521 100644
--- a/artemis-server/src/test/resources/ConfigurationTest-defaults.xml
+++ b/artemis-server/src/test/resources/ConfigurationTest-defaults.xml
@@ -17,7 +17,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:activemq ../../src/schemas/activemq-server.xsd ">
+   xsi:schemaLocation="urn:activemq ../../src/schemas/artemis-server.xsd ">
    <!-- just use the defaults -->
    <core xmlns="urn:activemq:core"/>
 </configuration>
diff --git a/artemis-server/src/test/resources/ConfigurationTest-full-config.xml b/artemis-server/src/test/resources/ConfigurationTest-full-config.xml
index 72b89e8c8f..06c9d95f72 100644
--- a/artemis-server/src/test/resources/ConfigurationTest-full-config.xml
+++ b/artemis-server/src/test/resources/ConfigurationTest-full-config.xml
@@ -17,7 +17,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-server.xsd">
+   xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <resolve-protocols>false</resolve-protocols>
diff --git a/artemis-server/src/test/resources/InvalidConfigurationTest0.xml b/artemis-server/src/test/resources/InvalidConfigurationTest0.xml
index 0efb6b3981..e92eb56999 100644
--- a/artemis-server/src/test/resources/InvalidConfigurationTest0.xml
+++ b/artemis-server/src/test/resources/InvalidConfigurationTest0.xml
@@ -17,7 +17,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:activemq ../../src/config/common/schema/activemq-server.xsd">
+   xsi:schemaLocation="urn:activemq ../../src/config/common/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>
diff --git a/artemis-server/src/test/resources/InvalidConfigurationTest1.xml b/artemis-server/src/test/resources/InvalidConfigurationTest1.xml
index 86ab74644f..debdc10876 100644
--- a/artemis-server/src/test/resources/InvalidConfigurationTest1.xml
+++ b/artemis-server/src/test/resources/InvalidConfigurationTest1.xml
@@ -17,7 +17,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:activemq ../../src/config/common/schema/activemq-server.xsd">
+   xsi:schemaLocation="urn:activemq ../../src/config/common/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>
diff --git a/artemis-server/src/test/resources/InvalidConfigurationTest2.xml b/artemis-server/src/test/resources/InvalidConfigurationTest2.xml
index 300f601226..26484d22cb 100644
--- a/artemis-server/src/test/resources/InvalidConfigurationTest2.xml
+++ b/artemis-server/src/test/resources/InvalidConfigurationTest2.xml
@@ -17,7 +17,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:activemq ../../src/config/common/schema/activemq-server.xsd">
+   xsi:schemaLocation="urn:activemq ../../src/config/common/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>
diff --git a/artemis-server/src/test/resources/InvalidConfigurationTest3.xml b/artemis-server/src/test/resources/InvalidConfigurationTest3.xml
index 00df30e3c4..49f6d44749 100644
--- a/artemis-server/src/test/resources/InvalidConfigurationTest3.xml
+++ b/artemis-server/src/test/resources/InvalidConfigurationTest3.xml
@@ -17,7 +17,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:activemq ../../src/config/common/schema/activemq-server.xsd">
+   xsi:schemaLocation="urn:activemq ../../src/config/common/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>
diff --git a/artemis-server/src/test/resources/InvalidConfigurationTest4.xml b/artemis-server/src/test/resources/InvalidConfigurationTest4.xml
index 40e9af8ca5..032fd7e78b 100644
--- a/artemis-server/src/test/resources/InvalidConfigurationTest4.xml
+++ b/artemis-server/src/test/resources/InvalidConfigurationTest4.xml
@@ -17,7 +17,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:activemq ../../src/config/common/schema/activemq-server.xsd">
+   xsi:schemaLocation="urn:activemq ../../src/config/common/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>
diff --git a/artemis-server/src/test/resources/InvalidConfigurationTest5.xml b/artemis-server/src/test/resources/InvalidConfigurationTest5.xml
index ce7c56fd96..3d32ac43ee 100644
--- a/artemis-server/src/test/resources/InvalidConfigurationTest5.xml
+++ b/artemis-server/src/test/resources/InvalidConfigurationTest5.xml
@@ -17,7 +17,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:activemq ../../src/config/common/schema/activemq-server.xsd">
+   xsi:schemaLocation="urn:activemq ../../src/config/common/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>
diff --git a/artemis-server/src/test/resources/colocated-hapolicy-config.xml b/artemis-server/src/test/resources/colocated-hapolicy-config.xml
index f1bd7840ab..f7872d4e21 100644
--- a/artemis-server/src/test/resources/colocated-hapolicy-config.xml
+++ b/artemis-server/src/test/resources/colocated-hapolicy-config.xml
@@ -17,7 +17,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-server.xsd">
+      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <discovery-groups>
          <discovery-group name="wahey"/>
diff --git a/artemis-server/src/test/resources/colocated-hapolicy-config2.xml b/artemis-server/src/test/resources/colocated-hapolicy-config2.xml
index 415b50a009..ff65b54449 100644
--- a/artemis-server/src/test/resources/colocated-hapolicy-config2.xml
+++ b/artemis-server/src/test/resources/colocated-hapolicy-config2.xml
@@ -17,7 +17,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-server.xsd">
+      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <ha-policy>
          <shared-store>
diff --git a/artemis-server/src/test/resources/divertRoutingNameNotRequired.xml b/artemis-server/src/test/resources/divertRoutingNameNotRequired.xml
index 230021bb61..924c22e8db 100644
--- a/artemis-server/src/test/resources/divertRoutingNameNotRequired.xml
+++ b/artemis-server/src/test/resources/divertRoutingNameNotRequired.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
 
    <core xmlns="urn:activemq:core">
 
diff --git a/artemis-server/src/test/resources/live-only-hapolicy-config.xml b/artemis-server/src/test/resources/live-only-hapolicy-config.xml
index e27924e3f0..356b4860f8 100644
--- a/artemis-server/src/test/resources/live-only-hapolicy-config.xml
+++ b/artemis-server/src/test/resources/live-only-hapolicy-config.xml
@@ -17,7 +17,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+      xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <discovery-groups>
          <discovery-group name="wahey"/>
diff --git a/artemis-server/src/test/resources/live-only-hapolicy-config2.xml b/artemis-server/src/test/resources/live-only-hapolicy-config2.xml
index 0541783f29..b1de311a36 100644
--- a/artemis-server/src/test/resources/live-only-hapolicy-config2.xml
+++ b/artemis-server/src/test/resources/live-only-hapolicy-config2.xml
@@ -17,7 +17,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+      xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <ha-policy>
          <!--only one of the following-->
diff --git a/artemis-server/src/test/resources/live-only-hapolicy-config3.xml b/artemis-server/src/test/resources/live-only-hapolicy-config3.xml
index 1f79134994..6cd2554422 100644
--- a/artemis-server/src/test/resources/live-only-hapolicy-config3.xml
+++ b/artemis-server/src/test/resources/live-only-hapolicy-config3.xml
@@ -17,7 +17,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+      xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <ha-policy>
          <!--only one of the following-->
diff --git a/artemis-server/src/test/resources/live-only-hapolicy-config4.xml b/artemis-server/src/test/resources/live-only-hapolicy-config4.xml
index cd05bf405a..19def04acb 100644
--- a/artemis-server/src/test/resources/live-only-hapolicy-config4.xml
+++ b/artemis-server/src/test/resources/live-only-hapolicy-config4.xml
@@ -17,7 +17,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+      xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <ha-policy/>
    </core>
diff --git a/artemis-server/src/test/resources/live-only-hapolicy-config5.xml b/artemis-server/src/test/resources/live-only-hapolicy-config5.xml
index b244b9e05d..6fa80ff3e9 100644
--- a/artemis-server/src/test/resources/live-only-hapolicy-config5.xml
+++ b/artemis-server/src/test/resources/live-only-hapolicy-config5.xml
@@ -17,7 +17,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+      xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <core xmlns="urn:activemq:core"/>
 
diff --git a/artemis-server/src/test/resources/replica-hapolicy-config.xml b/artemis-server/src/test/resources/replica-hapolicy-config.xml
index e6946a9091..71836734f5 100644
--- a/artemis-server/src/test/resources/replica-hapolicy-config.xml
+++ b/artemis-server/src/test/resources/replica-hapolicy-config.xml
@@ -17,7 +17,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+      xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <discovery-groups>
          <discovery-group name="wahey"/>
diff --git a/artemis-server/src/test/resources/replica-hapolicy-config2.xml b/artemis-server/src/test/resources/replica-hapolicy-config2.xml
index 15e85c5da4..95df78bbd7 100644
--- a/artemis-server/src/test/resources/replica-hapolicy-config2.xml
+++ b/artemis-server/src/test/resources/replica-hapolicy-config2.xml
@@ -17,7 +17,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+      xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <core xmlns="urn:activemq:core">
       <ha-policy>
diff --git a/artemis-server/src/test/resources/replica-hapolicy-config3.xml b/artemis-server/src/test/resources/replica-hapolicy-config3.xml
index 71b86b380f..369eca6603 100644
--- a/artemis-server/src/test/resources/replica-hapolicy-config3.xml
+++ b/artemis-server/src/test/resources/replica-hapolicy-config3.xml
@@ -17,7 +17,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+      xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <core xmlns="urn:activemq:core">
       <ha-policy>
diff --git a/artemis-server/src/test/resources/replicated-hapolicy-config.xml b/artemis-server/src/test/resources/replicated-hapolicy-config.xml
index 1225208943..d41931499c 100644
--- a/artemis-server/src/test/resources/replicated-hapolicy-config.xml
+++ b/artemis-server/src/test/resources/replicated-hapolicy-config.xml
@@ -17,7 +17,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+      xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <core xmlns="urn:activemq:core">
       <ha-policy>
diff --git a/artemis-server/src/test/resources/shared-store-master-hapolicy-config.xml b/artemis-server/src/test/resources/shared-store-master-hapolicy-config.xml
index a79589a500..cb55b42875 100644
--- a/artemis-server/src/test/resources/shared-store-master-hapolicy-config.xml
+++ b/artemis-server/src/test/resources/shared-store-master-hapolicy-config.xml
@@ -17,7 +17,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-server.xsd">
+      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <ha-policy>
          <shared-store>
diff --git a/artemis-server/src/test/resources/shared-store-slave-hapolicy-config.xml b/artemis-server/src/test/resources/shared-store-slave-hapolicy-config.xml
index 05b6817c90..57dff39245 100644
--- a/artemis-server/src/test/resources/shared-store-slave-hapolicy-config.xml
+++ b/artemis-server/src/test/resources/shared-store-slave-hapolicy-config.xml
@@ -17,7 +17,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-server.xsd">
+      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <discovery-groups>
          <discovery-group name="wahey"/>
diff --git a/artemis-server/src/test/resources/shared-store-slave-hapolicy-config2.xml b/artemis-server/src/test/resources/shared-store-slave-hapolicy-config2.xml
index 3f5a9edf62..3c1c19b5e0 100644
--- a/artemis-server/src/test/resources/shared-store-slave-hapolicy-config2.xml
+++ b/artemis-server/src/test/resources/shared-store-slave-hapolicy-config2.xml
@@ -17,7 +17,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-server.xsd">
+      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <ha-policy>
          <shared-store>
diff --git a/artemis-server/src/test/resources/shared-store-slave-hapolicy-config3.xml b/artemis-server/src/test/resources/shared-store-slave-hapolicy-config3.xml
index 06b0fbb481..1c62ae3f7f 100644
--- a/artemis-server/src/test/resources/shared-store-slave-hapolicy-config3.xml
+++ b/artemis-server/src/test/resources/shared-store-slave-hapolicy-config3.xml
@@ -17,7 +17,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-server.xsd">
+      xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <ha-policy>
          <shared-store>
diff --git a/docs/user-manual/en/large-messages.md b/docs/user-manual/en/large-messages.md
index b2cbe8f95f..b9870a0d0d 100644
--- a/docs/user-manual/en/large-messages.md
+++ b/docs/user-manual/en/large-messages.md
@@ -32,7 +32,7 @@ large messages are stored.
 
     <configuration xmlns="urn:activemq"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+       xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
     ...
     <large-messages-directory>/data/large-messages</large-messages-directory>
     ...
diff --git a/docs/user-manual/en/paging.md b/docs/user-manual/en/paging.md
index f6b92cf383..a7252e221d 100644
--- a/docs/user-manual/en/paging.md
+++ b/docs/user-manual/en/paging.md
@@ -45,7 +45,7 @@ Global paging parameters are specified on the main configuration file
 
     <configuration xmlns="urn:activemq"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+       xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
     ...
     <paging-directory>/somewhere/paging-directory</paging-directory>
     ...
diff --git a/docs/user-manual/en/spring-integration.md b/docs/user-manual/en/spring-integration.md
index 6806912060..34c7545e9a 100644
--- a/docs/user-manual/en/spring-integration.md
+++ b/docs/user-manual/en/spring-integration.md
@@ -12,7 +12,7 @@ Let's take this `activemq-jms.xml` file for instance:
 
     <configuration xmlns="urn:activemq"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+       xsi:schemaLocation="urn:activemq /schema/artemis-jms.xsd">
 
        <!--the queue used by the example-->
        <queue name="exampleQueue"/>
diff --git a/examples/core/perf/src/main/resources/server0/broker.xml b/examples/core/perf/src/main/resources/server0/broker.xml
index 842ef3fbbc..6896640215 100644
--- a/examples/core/perf/src/main/resources/server0/broker.xml
+++ b/examples/core/perf/src/main/resources/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <bindings-directory>target/server0/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml b/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
index ce83e85e8a..74b120e813 100644
--- a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
+++ b/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 
diff --git a/examples/core/vertx-connector/src/main/resources/server0/broker.xml b/examples/core/vertx-connector/src/main/resources/server0/broker.xml
index bef776487b..1012860da9 100644
--- a/examples/core/vertx-connector/src/main/resources/server0/broker.xml
+++ b/examples/core/vertx-connector/src/main/resources/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
       <queue name="exampleQueue"/>
diff --git a/examples/jms/aerogear/src/main/resources/activemq/server0/broker.xml b/examples/jms/aerogear/src/main/resources/activemq/server0/broker.xml
index a48e6758e6..8645df43a3 100644
--- a/examples/jms/aerogear/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/aerogear/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/broker.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/broker.xml
index 2b2b61f2e4..74270c7d0d 100644
--- a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
    </jms>
diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/broker.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/broker.xml
index 4230f2d7ce..bc5ad7144b 100644
--- a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/broker.xml
@@ -21,7 +21,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/broker.xml b/examples/jms/bridge/src/main/resources/activemq/server0/broker.xml
index 248d875180..cc79ef07a5 100644
--- a/examples/jms/bridge/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/bridge/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
       <queue name="sausage-factory"/>
diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/broker.xml b/examples/jms/bridge/src/main/resources/activemq/server1/broker.xml
index ae4375d798..516f179cdf 100644
--- a/examples/jms/bridge/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/bridge/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/browser/src/main/resources/activemq/server0/broker.xml b/examples/jms/browser/src/main/resources/activemq/server0/broker.xml
index a92fa6cbc2..50039913ca 100644
--- a/examples/jms/browser/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/browser/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/broker.xml b/examples/jms/client-kickoff/src/main/resources/activemq/server0/broker.xml
index 337e4346cb..df642d1782 100644
--- a/examples/jms/client-kickoff/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/client-kickoff/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <jms xmlns="urn:activemq:jms">
 
    </jms>
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/broker.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/broker.xml
index ace0831dbb..18550ef69d 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
       <queue name="exampleQueue"/>
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/broker.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/broker.xml
index 63413f68f2..eb70455fff 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/broker.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/broker.xml
index b21b2f568d..7d54128a08 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
       <queue name="exampleQueue"/>
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/broker.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/broker.xml
index a3ed424f9f..3d6efdd66e 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
       <queue name="exampleQueue"/>
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/broker.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/broker.xml
index b704957073..e4bcf5e443 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/broker.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <jms xmlns="urn:activemq:jms">
    </jms>
    <core xmlns="urn:activemq:core">
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml
index d94b55a137..e32c8cbd38 100644
--- a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml
index a27d74cecc..b863f560d3 100644
--- a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/broker.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/broker.xml
index e363263272..8c14b205c7 100644
--- a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/broker.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/broker.xml
index 5c4bb4ff6c..06fefc6d6c 100644
--- a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/broker.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/broker.xml
index 0e98c4a5cf..7ad49e4737 100644
--- a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/broker.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/broker.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/broker.xml
index cb6abfd741..3edefd06ae 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/broker.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/broker.xml
index 6a6b1da32d..aacaecb57a 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/broker.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server0/broker.xml
index cd5ec4d763..ebdbd530dc 100644
--- a/examples/jms/clustered-queue/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/clustered-queue/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/broker.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server1/broker.xml
index 25f49d25db..7e6426dcca 100644
--- a/examples/jms/clustered-queue/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/clustered-queue/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/broker.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/broker.xml
index d13506ae10..f9db9bc634 100644
--- a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/broker.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/broker.xml
index b7fc5e5f2f..6cb750ec7e 100644
--- a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/broker.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/broker.xml
index 3f0bdd1af3..6ea8a26bf3 100644
--- a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/broker.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/broker.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/broker.xml
index b37f4d8fda..a655fa1711 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/broker.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/broker.xml
index 8816fb7065..7925ff9dba 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml
index a90c7b9cd5..0888816709 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml
@@ -17,7 +17,7 @@
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml
index b38eae0dc1..60fb6cef63 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml
@@ -17,7 +17,7 @@
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml
index 403d6a0257..4da5fa916c 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml
@@ -17,7 +17,7 @@
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml
index 9ba1943a28..f8662cfe6d 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml
@@ -17,7 +17,7 @@
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml
index 63c70cd879..a3a8a47566 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml
@@ -17,7 +17,7 @@
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server0/broker.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server0/broker.xml
index 90e975d3e0..4856aa828f 100644
--- a/examples/jms/clustered-topic/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/clustered-topic/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server1/broker.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server1/broker.xml
index bb60ecbd54..a9d16a8c7f 100644
--- a/examples/jms/clustered-topic/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/clustered-topic/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml
index 779f66f963..c9dec4ce4c 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml
index f8e1a17f87..20ceb15731 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
index f125585f80..5b3221d7c7 100644
--- a/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
index f2c8d50b1d..84f38f1302 100644
--- a/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/broker.xml b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/dead-letter/src/main/resources/activemq/server0/broker.xml b/examples/jms/dead-letter/src/main/resources/activemq/server0/broker.xml
index a684f4ee40..3180b7efb7 100644
--- a/examples/jms/dead-letter/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/dead-letter/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/broker.xml b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/broker.xml
index fca483af16..d23db3d8ae 100644
--- a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/divert/src/main/resources/activemq/server0/broker.xml b/examples/jms/divert/src/main/resources/activemq/server0/broker.xml
index 8c7fe63a5c..295f882d75 100644
--- a/examples/jms/divert/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/divert/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!-- Destinations used by the example -->
diff --git a/examples/jms/divert/src/main/resources/activemq/server1/broker.xml b/examples/jms/divert/src/main/resources/activemq/server1/broker.xml
index a90aee2ff2..d624897313 100644
--- a/examples/jms/divert/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/divert/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!-- Destinations used by the example -->
diff --git a/examples/jms/durable-subscription/src/main/resources/activemq/server0/broker.xml b/examples/jms/durable-subscription/src/main/resources/activemq/server0/broker.xml
index 51d9a56f57..6b661e4d37 100644
--- a/examples/jms/durable-subscription/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/durable-subscription/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->
diff --git a/examples/jms/embedded-simple/src/main/resources/broker.xml b/examples/jms/embedded-simple/src/main/resources/broker.xml
index 68cca46ace..0448e3b6d9 100644
--- a/examples/jms/embedded-simple/src/main/resources/broker.xml
+++ b/examples/jms/embedded-simple/src/main/resources/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <core xmlns="urn:activemq:core">
 
diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/broker.xml b/examples/jms/expiry/src/main/resources/activemq/server0/broker.xml
index e7ff821e9f..3333732716 100644
--- a/examples/jms/expiry/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/expiry/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/broker.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/broker.xml
index 08ee2551c8..8c38aead9b 100644
--- a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/broker.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/broker.xml
index d40f743c87..ca0f81157e 100644
--- a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/http-transport/src/main/resources/activemq/server0/broker.xml b/examples/jms/http-transport/src/main/resources/activemq/server0/broker.xml
index 5bb2090326..40cf947242 100644
--- a/examples/jms/http-transport/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/http-transport/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/broker.xml b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/broker.xml
index 5b6b4b4391..273b698304 100644
--- a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/broker.xml b/examples/jms/interceptor/src/main/resources/activemq/server0/broker.xml
index 7fa4b1c805..b9d2c3c013 100644
--- a/examples/jms/interceptor/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/interceptor/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/broker.xml b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/broker.xml
index d3989711ce..0f0eebc7c7 100644
--- a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server0/broker.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server0/broker.xml
index 3b1b3a68a5..d1e96e7de0 100644
--- a/examples/jms/jms-bridge/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/jms-bridge/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <topic name="topic"/>
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server1/broker.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server1/broker.xml
index 00d4d23255..a8802d3f69 100644
--- a/examples/jms/jms-bridge/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/jms-bridge/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <queue name="target"/>
diff --git a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/broker.xml b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/jms-context/src/main/resources/activemq/server0/broker.xml b/examples/jms/jms-context/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/jms-context/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/jms-context/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/broker.xml b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/broker.xml
index d397c74cb5..0ee3f9dc0c 100644
--- a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->
diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/broker.xml b/examples/jms/jmx/src/main/resources/activemq/server0/broker.xml
index c2c2c3af4f..b167295084 100644
--- a/examples/jms/jmx/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/jmx/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/large-message/src/main/resources/activemq/server0/broker.xml b/examples/jms/large-message/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/large-message/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/large-message/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/last-value-queue/src/main/resources/activemq/server0/broker.xml b/examples/jms/last-value-queue/src/main/resources/activemq/server0/broker.xml
index 10bd7ac8ea..470de98b31 100644
--- a/examples/jms/last-value-queue/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/last-value-queue/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/management-notifications/src/main/resources/activemq/server0/broker.xml b/examples/jms/management-notifications/src/main/resources/activemq/server0/broker.xml
index 451ea5add4..2c97901adc 100644
--- a/examples/jms/management-notifications/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/management-notifications/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq ../../../../src/schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq ../../../../src/schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/management/src/main/resources/activemq/server0/broker.xml b/examples/jms/management/src/main/resources/activemq/server0/broker.xml
index 37667b75d1..36eec300b0 100644
--- a/examples/jms/management/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/management/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/message-counters/src/main/resources/activemq/server0/broker.xml b/examples/jms/message-counters/src/main/resources/activemq/server0/broker.xml
index 04a7647f08..8d4ed29590 100644
--- a/examples/jms/message-counters/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/message-counters/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq ../../../../src/schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq ../../../../src/schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/message-group/src/main/resources/activemq/server0/broker.xml b/examples/jms/message-group/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/message-group/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/message-group/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/message-group2/src/main/resources/activemq/server0/broker.xml b/examples/jms/message-group2/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/message-group2/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/message-group2/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/message-priority/src/main/resources/activemq/server0/broker.xml b/examples/jms/message-priority/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/message-priority/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/message-priority/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/broker.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/broker.xml
index c660fcbc13..52eb917eda 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/broker.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/broker.xml
index 63413f68f2..eb70455fff 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/broker.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/broker.xml
index a0c551cfe5..dff08b3d9b 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/broker.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server0/broker.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server0/broker.xml
index 26ec8415a6..ca23965f0f 100644
--- a/examples/jms/multiple-failover/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server1/broker.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server1/broker.xml
index 63413f68f2..eb70455fff 100644
--- a/examples/jms/multiple-failover/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server2/broker.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server2/broker.xml
index 866807edc0..482b4ced72 100644
--- a/examples/jms/multiple-failover/src/main/resources/activemq/server2/broker.xml
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server2/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/broker.xml b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/broker.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/broker.xml
index 372045946e..1a5bc0b768 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/broker.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/broker.xml
index 3e9396e5b1..ecb5cdaabd 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/broker.xml b/examples/jms/openwire/src/main/resources/activemq/server0/broker.xml
index db48b82de9..73823a6550 100644
--- a/examples/jms/openwire/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/openwire/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/paging/src/main/resources/activemq/server0/broker.xml b/examples/jms/paging/src/main/resources/activemq/server0/broker.xml
index 4c17f4061b..a7a196963f 100644
--- a/examples/jms/paging/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/paging/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->
diff --git a/examples/jms/perf/src/main/resources/activemq/server0/broker.xml b/examples/jms/perf/src/main/resources/activemq/server0/broker.xml
index 38bed8c14e..a642ac5174 100644
--- a/examples/jms/perf/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/perf/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <queue name="perfQueue"/>
diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/broker.xml b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/broker.xml
index 5151c36ab8..f29acbc0ed 100644
--- a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/broker.xml b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/broker.xml b/examples/jms/proton-cpp/src/main/resources/activemq/server0/broker.xml
index 2a5ac6f135..eafc6c8f1d 100644
--- a/examples/jms/proton-cpp/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/proton-cpp/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/broker.xml b/examples/jms/proton-j/src/main/resources/activemq/server0/broker.xml
index 53ad18ce40..c27781de3d 100644
--- a/examples/jms/proton-j/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/proton-j/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/broker.xml b/examples/jms/proton-ruby/src/main/resources/activemq/server0/broker.xml
index 409118b073..81e0b07353 100644
--- a/examples/jms/proton-ruby/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/proton-ruby/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml
index 8d1d1896b2..e745c71664 100644
--- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml
index c6cfa5dfd5..7bb693f601 100644
--- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/broker.xml b/examples/jms/queue-requestor/src/main/resources/activemq/server0/broker.xml
index dda202b164..6c344c28f8 100644
--- a/examples/jms/queue-requestor/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/queue-requestor/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/broker.xml b/examples/jms/queue-selector/src/main/resources/activemq/server0/broker.xml
index ddb9d67073..78f96f3899 100644
--- a/examples/jms/queue-selector/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/queue-selector/src/main/resources/activemq/server0/broker.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/queue/src/main/resources/activemq/server0/broker.xml b/examples/jms/queue/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/queue/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/queue/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/broker.xml b/examples/jms/reattach-node/src/main/resources/activemq/server0/broker.xml
index 301581b389..0edc66a327 100644
--- a/examples/jms/reattach-node/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/reattach-node/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/broker.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/broker.xml
index 81a7633626..2bb35527e2 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/broker.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/broker.xml
index f7ecac73cb..71e2e4e774 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server0/broker.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server0/broker.xml
index cd267dc425..8a933506f2 100644
--- a/examples/jms/replicated-failback/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/replicated-failback/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server1/broker.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server1/broker.xml
index 6ed8c398f3..eec921f25c 100644
--- a/examples/jms/replicated-failback/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/replicated-failback/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml
index 29dcbb20c7..eb47eb2b34 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml
index 25d85b0c69..344bfbfd07 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml
index 6994070598..804f63f641 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml
index 9e90b2ce1b..597f828773 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml
index 8c7538db35..cdefc88f11 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/request-reply/src/main/resources/activemq/server0/broker.xml b/examples/jms/request-reply/src/main/resources/activemq/server0/broker.xml
index dda202b164..6c344c28f8 100644
--- a/examples/jms/request-reply/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/request-reply/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml b/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml
index 1a20ecbbdd..6fe4547dab 100644
--- a/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml
+++ b/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
    </jms>
diff --git a/examples/jms/rest/dup-send/src/main/resources/broker.xml b/examples/jms/rest/dup-send/src/main/resources/broker.xml
index 640bf6e475..8cc0fa654f 100644
--- a/examples/jms/rest/dup-send/src/main/resources/broker.xml
+++ b/examples/jms/rest/dup-send/src/main/resources/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/rest/javascript-chat/src/main/resources/broker.xml b/examples/jms/rest/javascript-chat/src/main/resources/broker.xml
index 01bb590e99..e5e1364023 100644
--- a/examples/jms/rest/javascript-chat/src/main/resources/broker.xml
+++ b/examples/jms/rest/javascript-chat/src/main/resources/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml
index 1a20ecbbdd..6fe4547dab 100644
--- a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml
+++ b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
    </jms>
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/broker.xml b/examples/jms/rest/jms-to-rest/src/main/resources/broker.xml
index 640bf6e475..8cc0fa654f 100644
--- a/examples/jms/rest/jms-to-rest/src/main/resources/broker.xml
+++ b/examples/jms/rest/jms-to-rest/src/main/resources/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/rest/push/src/main/resources/activemq-client.xml b/examples/jms/rest/push/src/main/resources/activemq-client.xml
index 1a20ecbbdd..6fe4547dab 100644
--- a/examples/jms/rest/push/src/main/resources/activemq-client.xml
+++ b/examples/jms/rest/push/src/main/resources/activemq-client.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
    </jms>
diff --git a/examples/jms/rest/push/src/main/resources/broker.xml b/examples/jms/rest/push/src/main/resources/broker.xml
index 19ab6b36c2..13f2f23732 100644
--- a/examples/jms/rest/push/src/main/resources/broker.xml
+++ b/examples/jms/rest/push/src/main/resources/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queues used by the example-->
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server0/broker.xml b/examples/jms/scale-down/src/main/resources/activemq/server0/broker.xml
index eded681c74..4a38a74593 100644
--- a/examples/jms/scale-down/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/scale-down/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server1/broker.xml b/examples/jms/scale-down/src/main/resources/activemq/server1/broker.xml
index e2959c29d2..57fa72d848 100644
--- a/examples/jms/scale-down/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/scale-down/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/scheduled-message/src/main/resources/activemq/server0/broker.xml b/examples/jms/scheduled-message/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/scheduled-message/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/scheduled-message/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/security/src/main/resources/activemq/server0/broker.xml b/examples/jms/security/src/main/resources/activemq/server0/broker.xml
index 8b964a3367..6a8b82bc75 100644
--- a/examples/jms/security/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/security/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <topic name="genericTopic"/>
diff --git a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/broker.xml b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/spring-integration/src/main/resources/broker.xml b/examples/jms/spring-integration/src/main/resources/broker.xml
index fdc8811736..29703295a6 100644
--- a/examples/jms/spring-integration/src/main/resources/broker.xml
+++ b/examples/jms/spring-integration/src/main/resources/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/broker.xml b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/broker.xml
index 3e28f6949a..f0de0fc2ad 100644
--- a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/broker.xml b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/broker.xml
index 556339473d..7442fac3fa 100644
--- a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/static-selector/src/main/resources/activemq/server0/broker.xml b/examples/jms/static-selector/src/main/resources/activemq/server0/broker.xml
index 64fa1d8095..ca09b3b974 100644
--- a/examples/jms/static-selector/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/static-selector/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/broker.xml b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/broker.xml
index 59ad29b6ca..ce256a9f7f 100644
--- a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->
diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/broker.xml b/examples/jms/stomp/src/main/resources/activemq/server0/broker.xml
index 5d43ce4bb7..b24f1da6bd 100644
--- a/examples/jms/stomp/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/stomp/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/stomp1.1/src/main/resources/activemq/server0/broker.xml b/examples/jms/stomp1.1/src/main/resources/activemq/server0/broker.xml
index 5d43ce4bb7..b24f1da6bd 100644
--- a/examples/jms/stomp1.1/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/stomp1.1/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/stomp1.2/src/main/resources/activemq/server0/broker.xml b/examples/jms/stomp1.2/src/main/resources/activemq/server0/broker.xml
index 5d43ce4bb7..b24f1da6bd 100644
--- a/examples/jms/stomp1.2/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/stomp1.2/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/broker.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/broker.xml
index ef63e109be..6ea24c1a8d 100644
--- a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/broker.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/broker.xml
index 0e3c7d8df4..da69fce8d3 100644
--- a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/broker.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/broker.xml
index 0f39cab22c..312d7a2b41 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <queue name="exampleQueue"/>
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/broker.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/broker.xml
index 10bd5a210c..f7c2569a7a 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <queue name="exampleQueue"/>
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/broker.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/broker.xml
index 9f0ed5a959..b87a19e7ac 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/broker.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <queue name="exampleQueue"/>
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/broker.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/broker.xml
index 2781eac93f..03748768e1 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/broker.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <queue name="exampleQueue"/>
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/broker.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/broker.xml
index 1c1fa816a9..25b099c97c 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/broker.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <queue name="exampleQueue"/>
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/broker.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/broker.xml
index e51abd27c5..8efb4aa83a 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/broker.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <queue name="exampleQueue"/>
diff --git a/examples/jms/temp-queue/src/main/resources/activemq/server0/broker.xml b/examples/jms/temp-queue/src/main/resources/activemq/server0/broker.xml
index e269320547..d5950867ff 100644
--- a/examples/jms/temp-queue/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/temp-queue/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/broker.xml b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/broker.xml
index 5e89f3efb4..1f94195d48 100644
--- a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topics used by the example-->
diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/broker.xml b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/broker.xml
index 212a1447d4..e7c1a14cbd 100644
--- a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->
diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/broker.xml b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/broker.xml
index 212a1447d4..e7c1a14cbd 100644
--- a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->
diff --git a/examples/jms/topic/src/main/resources/activemq/server0/broker.xml b/examples/jms/topic/src/main/resources/activemq/server0/broker.xml
index 212a1447d4..e7c1a14cbd 100644
--- a/examples/jms/topic/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/topic/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server0/broker.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server0/broker.xml
index 00a6a750a8..1041acadc2 100644
--- a/examples/jms/transaction-failover/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/transaction-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server1/broker.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server1/broker.xml
index f7cb5aec5a..27f33f6365 100644
--- a/examples/jms/transaction-failover/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/transaction-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/broker.xml b/examples/jms/transactional/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/transactional/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/transactional/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/broker.xml b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/broker.xml b/examples/jms/xa-receive/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/xa-receive/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/xa-receive/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/broker.xml b/examples/jms/xa-send/src/main/resources/activemq/server0/broker.xml
index e6fdb21b80..7690094861 100644
--- a/examples/jms/xa-send/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/xa-send/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/examples/soak/normal/server0/broker.xml b/examples/soak/normal/server0/broker.xml
index 8a168b3f63..7f1f435f86 100644
--- a/examples/soak/normal/server0/broker.xml
+++ b/examples/soak/normal/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <jms xmlns="urn:activemq:jms">
       <queue name="soakQueue"/>
    </jms>
diff --git a/tests/config/server-start-stop-backup-config1.xml b/tests/config/server-start-stop-backup-config1.xml
index 7996fdbc0c..47c114597b 100644
--- a/tests/config/server-start-stop-backup-config1.xml
+++ b/tests/config/server-start-stop-backup-config1.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+         xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    
    <core xmlns="urn:activemq:core">
 
diff --git a/tests/config/server-start-stop-backup-jms-config1.xml b/tests/config/server-start-stop-backup-jms-config1.xml
index b9044a8288..4dc3b12eaf 100644
--- a/tests/config/server-start-stop-backup-jms-config1.xml
+++ b/tests/config/server-start-stop-backup-jms-config1.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-jms.xsd">
    
    <queue name="myJMSQueue/>
 
diff --git a/tests/config/server-start-stop-live-config1.xml b/tests/config/server-start-stop-live-config1.xml
index 749d90210d..98cce9ef1c 100644
--- a/tests/config/server-start-stop-live-config1.xml
+++ b/tests/config/server-start-stop-live-config1.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+         xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <core xmlns="urn:activemq:core">
 
diff --git a/tests/config/server-start-stop-live-jms-config1.xml b/tests/config/server-start-stop-live-jms-config1.xml
index 7c84896260..055833cf9e 100644
--- a/tests/config/server-start-stop-live-jms-config1.xml
+++ b/tests/config/server-start-stop-live-jms-config1.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-jms.xsd">
    
    <queue name="myJMSQueue"/>
 
diff --git a/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml b/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml
index cff73314ae..1990d93cf6 100644
--- a/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml
+++ b/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq ../../src/schemas/activemq-server.xsd ">
+            xsi:schemaLocation="urn:activemq ../../src/schemas/artemis-server.xsd ">
    <jms xmlns="urn:activemq:jms">
       <queue name="fullConfigurationQueue"/>
 
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
index c04de3d9bc..f3380d0377 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
 
    <connectors>
       <connector name="netty-connector">tcp://localhost:61616</connector>
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
index 1e0b266a93..1cf81e51f2 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq schema/artemis-configuration.xsd">
 
    <connectors>
       <connector name="netty-connector">tcp://localhost:5645</connector>
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
index 4025851aa5..5e1d9a2e58 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-jms.xsd">
    
    <queue name="myJMSQueue"/>
 
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
index 4025851aa5..5e1d9a2e58 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-jms.xsd">
    
    <queue name="myJMSQueue"/>
 
diff --git a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
index 46142dda54..b85e5815c8 100644
--- a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
+++ b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <jms xmlns="urn:activemq:jms">
       <queue name="myJMSQueue"/>
    </jms>
diff --git a/tests/integration-tests/src/test/resources/spring-activemq-config.xml b/tests/integration-tests/src/test/resources/spring-activemq-config.xml
index e7dd1cc8ee..1e0d2c236b 100644
--- a/tests/integration-tests/src/test/resources/spring-activemq-config.xml
+++ b/tests/integration-tests/src/test/resources/spring-activemq-config.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->
diff --git a/tests/jms-tests/src/test/resources/broker.xml b/tests/jms-tests/src/test/resources/broker.xml
index 10f6a8d8bf..4a060124fe 100644
--- a/tests/jms-tests/src/test/resources/broker.xml
+++ b/tests/jms-tests/src/test/resources/broker.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq ../../../src/schema/activemq-server.xsd">
+            xsi:schemaLocation="urn:activemq ../../../src/schema/artemis-server.xsd">
    <jms xmlns="urn:activemq:jms">
 
    </jms>
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java
index 48f3f9d41f..5972d3dda5 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java
@@ -40,7 +40,7 @@ public class ConfigurationValidationTest extends UnitTestCase
    // Public --------------------------------------------------------
 
    /**
-    * test does not pass in eclipse (because it can not find activemq-configuration.xsd).
+    * test does not pass in eclipse (because it can not find artemis-configuration.xsd).
     * It runs fine on the CLI with the proper env setting.
     */
    @Test
@@ -49,7 +49,7 @@ public class ConfigurationValidationTest extends UnitTestCase
       String xml = "<core xmlns='urn:activemq:core'>" + "</core>";
       Element element = XMLUtil.stringToElement(xml);
       Assert.assertNotNull(element);
-      XMLUtil.validate(element, "schema/activemq-configuration.xsd");
+      XMLUtil.validate(element, "schema/artemis-configuration.xsd");
    }
 
    @Test