From ac5bb8fd6cd6f942653392586aaf9aa54b92b5d7 Mon Sep 17 00:00:00 2001
From: Andy Taylor <andytaylor@apache.org>
Date: Wed, 29 Apr 2015 10:30:31 +0100
Subject: [PATCH 1/4] renamed config to broker.xml

---
 .../activemq/artemis/cli/commands/Create.java    |  2 +-
 .../cli/commands/bin/activemq-service.xml        |  2 +-
 .../artemis/cli/commands/etc/activemq.profile    |  2 +-
 .../cli/commands/etc/activemq.profile.cmd        |  2 +-
 .../artemis/cli/commands/etc/bootstrap.xml       |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../activemq/artemis/test/FileBrokerTest.java    |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../activemq/artemis/api/core/Interceptor.java   |  2 +-
 .../core/impl/ActiveMQSessionContext.java        |  2 +-
 .../artemis/server/ActiveMQBootstrap.java        |  2 +-
 .../protocol/stomp/StompFrameInterceptor.java    |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../core/config/FileDeploymentManager.java       |  2 +-
 .../artemis/core/deployers/Deployable.java       |  2 +-
 .../core/server/embedded/EmbeddedActiveMQ.java   |  4 ++--
 docs/user-manual/en/clusters.md                  | 16 ++++++++--------
 docs/user-manual/en/configuration-index.md       |  2 +-
 docs/user-manual/en/configuring-transports.md    |  4 ++--
 docs/user-manual/en/connection-ttl.md            |  2 +-
 docs/user-manual/en/core-bridges.md              |  8 ++++----
 docs/user-manual/en/diverts.md                   |  2 +-
 docs/user-manual/en/duplicate-detection.md       |  8 ++++----
 docs/user-manual/en/embedding-activemq.md        |  4 ++--
 docs/user-manual/en/filter-expressions.md        |  2 +-
 docs/user-manual/en/ha.md                        | 14 +++++++-------
 docs/user-manual/en/intercepting-operations.md   |  2 +-
 docs/user-manual/en/management.md                | 14 +++++++-------
 docs/user-manual/en/message-expiry.md            |  2 +-
 docs/user-manual/en/message-grouping.md          |  2 +-
 docs/user-manual/en/paging.md                    |  4 ++--
 docs/user-manual/en/perf-tuning.md               | 10 +++++-----
 docs/user-manual/en/persistence.md               |  6 +++---
 docs/user-manual/en/queue-attributes.md          |  6 +++---
 docs/user-manual/en/rest.md                      |  2 +-
 docs/user-manual/en/security.md                  |  4 ++--
 docs/user-manual/en/send-guarantees.md           |  2 +-
 docs/user-manual/en/spring-integration.md        |  2 +-
 docs/user-manual/en/thread-pooling.md            |  4 ++--
 docs/user-manual/en/transaction-config.md        |  2 +-
 docs/user-manual/en/undelivered-messages.md      |  2 +-
 docs/user-manual/en/using-server.md              |  6 +++---
 docs/user-manual/en/wildcard-routing.md          |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 examples/jms/aerogear/readme.html                |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 examples/jms/bridge/readme.html                  |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../jms/client-side-load-balancing/readme.html   |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 examples/jms/dead-letter/readme.html             |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 examples/jms/delayed-redelivery/readme.html      |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 examples/jms/divert/readme.html                  |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 examples/jms/embedded-simple/readme.html         |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 examples/jms/expiry/readme.html                  |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 examples/jms/http-transport/readme.html          |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 examples/jms/interceptor/readme.html             |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 examples/jms/last-value-queue/readme.html        |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../jms/management-notifications/readme.html     |  4 ++--
 .../{activemq-configuration.xml => broker.xml}   |  0
 examples/jms/management/readme.html              |  4 ++--
 .../{activemq-configuration.xml => broker.xml}   |  0
 examples/jms/message-counters/readme.html        |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 examples/jms/paging/readme.html                  |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../jms/queue-message-redistribution/readme.html |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 examples/jms/security/readme.html                |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 examples/jms/static-selector/readme.html         |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 examples/jms/symmetric-cluster/readme.html       |  2 +-
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 examples/soak/normal/README                      |  4 ++--
 .../{activemq-configuration.xml => broker.xml}   |  0
 .../{activemq-configuration.xml => broker.xml}   |  0
 201 files changed, 104 insertions(+), 104 deletions(-)
 rename artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/{activemq-configuration.xml => broker.xml} (100%)
 rename artemis-bootstrap/src/test/resources/{activemq-configuration.xml => broker.xml} (100%)
 rename artemis-rest/src/test/resources/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/core/perf/src/main/resources/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/core/vertx-connector/src/main/resources/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/aerogear/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/application-layer-failover/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/application-layer-failover/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/bridge/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/bridge/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/browser/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/client-kickoff/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-grouping/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-grouping/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-grouping/src/main/resources/activemq/server2/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-jgroups/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-jgroups/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-queue/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-queue/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-standalone/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-standalone/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-standalone/src/main/resources/activemq/server2/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-topic/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/clustered-topic/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/colocated-failover/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/colocated-failover/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/dead-letter/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/delayed-redelivery/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/divert/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/divert/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/durable-subscription/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/embedded-simple/src/main/resources/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/expiry/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/http-transport/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/interceptor/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/jms-bridge/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/jms-bridge/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/jms-completion-listener/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/jms-context/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/jmx/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/large-message/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/last-value-queue/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/management-notifications/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/management/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/message-counters/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/message-group/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/message-group2/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/message-priority/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/multiple-failover/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/multiple-failover/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/multiple-failover/src/main/resources/activemq/server2/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/non-transaction-failover/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/non-transaction-failover/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/openwire/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/paging/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/perf/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/pre-acknowledge/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/producer-rate-limit/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/proton-cpp/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/proton-j/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/proton-ruby/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/queue-requestor/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/queue-selector/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/queue/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/reattach-node/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/replicated-failback-static/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/replicated-failback-static/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/replicated-failback/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/replicated-failback/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/request-reply/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/rest/dup-send/src/main/resources/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/rest/javascript-chat/src/main/resources/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/rest/jms-to-rest/src/main/resources/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/rest/push/src/main/resources/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/scale-down/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/scale-down/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/scheduled-message/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/security/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/send-acknowledgements/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/spring-integration/src/main/resources/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/ssl-enabled/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/static-selector-jms/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/static-selector/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/stomp-websockets/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/stomp/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/stomp1.1/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/stomp1.2/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/stop-server-failover/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/stop-server-failover/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/symmetric-cluster/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/symmetric-cluster/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/symmetric-cluster/src/main/resources/activemq/server2/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/symmetric-cluster/src/main/resources/activemq/server3/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/symmetric-cluster/src/main/resources/activemq/server4/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/symmetric-cluster/src/main/resources/activemq/server5/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/temp-queue/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/topic-hierarchies/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/topic-selector-example1/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/topic-selector-example2/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/topic/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/transaction-failover/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/transaction-failover/src/main/resources/activemq/server1/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/transactional/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/xa-heuristic/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/xa-receive/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/jms/xa-send/src/main/resources/activemq/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename examples/soak/normal/server0/{activemq-configuration.xml => broker.xml} (100%)
 rename tests/jms-tests/src/test/resources/{activemq-configuration.xml => broker.xml} (100%)

diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index 7618de50f5..22cc10edfe 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -159,7 +159,7 @@ public class Create implements Action
 
       write("etc/logging.properties", null, false);
       write("etc/bootstrap.xml", null, false);
-      write("etc/activemq-configuration.xml", filters, false);
+      write("etc/broker.xml", filters, false);
       write("etc/activemq-roles.properties", null, false);
       write("etc/activemq-users.properties", null, false);
 
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml
index 1a95c6842d..12dc6ce44b 100644
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml
@@ -32,7 +32,7 @@
    <argument>-Xms512M</argument>
    <argument>-Xmx1024M</argument>
 
-   <!-- Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in activemq-configuration.xml
+   <!-- Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml
    <argument>-Dactivemq.remoting.default.port=61617</argument>
    <argument>-Dactivemq.remoting.amqp.port=5673</argument>
    <argument>-Dactivemq.remoting.stomp.port=61614</argument>
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile
index 652ad115f1..755fec1055 100644
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile
@@ -17,7 +17,7 @@
 
 ACTIVEMQ_HOME='${activemq.home}'
 
-# Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in activemq-configuration.xml
+# Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml
 #ACTIVEMQ_CLUSTER_PROPS="-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446"
 
 # Java Opts
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile.cmd b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile.cmd
index 77800c87f6..3c2856493d 100644
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile.cmd
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile.cmd
@@ -17,7 +17,7 @@ rem under the License.
 
 set ACTIVEMQ_HOME=${activemq.home}
 
-rem Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in activemq-configuration.xml
+rem Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml
 rem set ACTIVEMQ_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446
 
 rem Java Opts
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml
index 1025f05dd6..530db62c3a 100644
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml
@@ -24,7 +24,7 @@
            default-user="guest"
            />
 
-   <server configuration="file:${activemq.instance}/etc/activemq-configuration.xml"/>
+   <server configuration="file:${activemq.instance}/etc/broker.xml"/>
 
    <web bind="http://localhost:8161" path="web">
        <app url="jolokia" war="jolokia-war-1.2.3.war"/>
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq-configuration.xml b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
similarity index 100%
rename from artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq-configuration.xml
rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
diff --git a/artemis-bootstrap/src/test/java/org/apache/activemq/artemis/test/FileBrokerTest.java b/artemis-bootstrap/src/test/java/org/apache/activemq/artemis/test/FileBrokerTest.java
index a177d65dca..89eccef6a7 100644
--- a/artemis-bootstrap/src/test/java/org/apache/activemq/artemis/test/FileBrokerTest.java
+++ b/artemis-bootstrap/src/test/java/org/apache/activemq/artemis/test/FileBrokerTest.java
@@ -30,7 +30,7 @@ public class FileBrokerTest
    public void startWithJMS() throws Exception
    {
       ServerDTO serverDTO = new ServerDTO();
-      serverDTO.configuration = "activemq-configuration.xml";
+      serverDTO.configuration = "broker.xml";
       FileBroker broker = null;
       try
       {
diff --git a/artemis-bootstrap/src/test/resources/activemq-configuration.xml b/artemis-bootstrap/src/test/resources/broker.xml
similarity index 100%
rename from artemis-bootstrap/src/test/resources/activemq-configuration.xml
rename to artemis-bootstrap/src/test/resources/broker.xml
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java
index adea81bfa5..2e1a9a3a88 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java
@@ -22,7 +22,7 @@ import org.apache.activemq.artemis.core.protocol.core.Packet;
  * This is class is a simple way to intercepting calls on ActiveMQ client and servers.
  * <p>
  * To add an interceptor to ActiveMQ server, you have to modify the server configuration file
- * {@literal activemq-configuration.xml}.<br>
+ * {@literal broker.xml}.<br>
  * To add it to a client, use {@link org.apache.activemq.artemis.api.core.client.ServerLocator#addIncomingInterceptor(Interceptor)}
  */
 public interface Interceptor extends BaseInterceptor<Packet>
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
index 42a3e84c9f..aad2ec6aa8 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
@@ -677,7 +677,7 @@ public class ActiveMQSessionContext extends SessionContext
       ClientSession.QueueQuery queueInfo = consumerInternal.getQueueInfo();
 
       // We try and recreate any non durable queues, since they probably won't be there unless
-      // they are defined in activemq-configuration.xml
+      // they are defined in broker.xml
       // This allows e.g. JMS non durable subs and temporary queues to continue to be used after failover
       if (!queueInfo.isDurable())
       {
diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java
index c872f51df1..c250966454 100644
--- a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java
+++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java
@@ -96,7 +96,7 @@ public class ActiveMQBootstrap
          {
             //extendPluginClasspath(configurationDir);
             configuration = new FileConfiguration();
-            File file = new File(new File(configurationDir), "activemq-configuration.xml");
+            File file = new File(new File(configurationDir), "broker.xml");
             jmsFileConfiguration = new FileJMSConfiguration();
             FileDeploymentManager deploymentManager = new FileDeploymentManager(file.toURI().toString());
             deploymentManager.addDeployable((FileConfiguration)configuration);
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java
index a807aee540..ee8755fcd6 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java
@@ -22,7 +22,7 @@ import org.apache.activemq.artemis.api.core.BaseInterceptor;
  * This class is a simple way to intercepting client calls on ActiveMQ using STOMP protocol.
  * <p>
  * To add an interceptor to ActiveMQ server, you have to modify the server configuration file
- * {@literal activemq-configuration.xml}.<br>
+ * {@literal broker.xml}.<br>
  */
 public interface StompFrameInterceptor extends BaseInterceptor<StompFrame>
 {
diff --git a/artemis-rest/src/test/resources/activemq-configuration.xml b/artemis-rest/src/test/resources/broker.xml
similarity index 100%
rename from artemis-rest/src/test/resources/activemq-configuration.xml
rename to artemis-rest/src/test/resources/broker.xml
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/FileDeploymentManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/FileDeploymentManager.java
index 77fa4fe4e6..2c9b06fdda 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/FileDeploymentManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/FileDeploymentManager.java
@@ -37,7 +37,7 @@ import org.w3c.dom.NodeList;
  */
 public class FileDeploymentManager
 {
-   private static final String DEFAULT_CONFIGURATION_URL = "activemq-configuration.xml";
+   private static final String DEFAULT_CONFIGURATION_URL = "broker.xml";
 
    private final String configurationUrl;
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/Deployable.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/Deployable.java
index 96ab8760e9..ebd945b244 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/Deployable.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/Deployable.java
@@ -24,7 +24,7 @@ import javax.management.MBeanServer;
 import java.util.Map;
 
 /**
- * A Deployable is an object that can be configured via an xml configuration element in the main configuration file "activemq-configuration.xml"
+ * A Deployable is an object that can be configured via an xml configuration element in the main configuration file "broker.xml"
  * It holds all the information needed by the FileDeploymentManager to parse the configuration and build the component
  */
 public interface Deployable
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java
index 8e618a3f51..c2b22b02f3 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java
@@ -38,7 +38,7 @@ public class EmbeddedActiveMQ
    protected MBeanServer mbeanServer;
 
    /**
-    * Classpath resource for activemq server config.  Defaults to 'activemq-configuration.xml'.
+    * Classpath resource for activemq server config.  Defaults to 'broker.xml'.
     *
     * @param filename
     */
@@ -94,7 +94,7 @@ public class EmbeddedActiveMQ
    {
       if (configuration == null)
       {
-         if (configResourcePath == null) configResourcePath = "activemq-configuration.xml";
+         if (configResourcePath == null) configResourcePath = "broker.xml";
          FileDeploymentManager deploymentManager = new FileDeploymentManager(configResourcePath);
          FileConfiguration config = new FileConfiguration();
          deploymentManager.addDeployable(config);
diff --git a/docs/user-manual/en/clusters.md b/docs/user-manual/en/clusters.md
index d9a128c2ea..747632af68 100644
--- a/docs/user-manual/en/clusters.md
+++ b/docs/user-manual/en/clusters.md
@@ -8,7 +8,7 @@ the cluster is an active Apache ActiveMQ Artemis server which manages its own me
 and handles its own connections.
 
 The cluster is formed by each node declaring *cluster connections* to
-other nodes in the core configuration file `activemq-configuration.xml`.
+other nodes in the core configuration file `broker.xml`.
 When a node forms a cluster connection to another node, internally it
 creates a *core bridge* (as described in [Core Bridges](core-bridges.md)) connection between it and
 the other node, this is done transparently behind the scenes - you don't
@@ -84,12 +84,12 @@ broadcasting technique you configure the cluster, it uses either UDP or
 JGroups to broadcast connector pairs information.
 
 Broadcast groups are defined in the server configuration file
-`activemq-configuration.xml`. There can be many broadcast groups per
+`broker.xml`. There can be many broadcast groups per
 Apache ActiveMQ Artemis server. All broadcast groups must be defined in a
 `broadcast-groups` element.
 
 Let's take a look at an example broadcast group from
-`activemq-configuration.xml` that defines a UDP broadcast group:
+`broker.xml` that defines a UDP broadcast group:
 
     <broadcast-groups>
        <broadcast-group name="my-broadcast-group">
@@ -272,7 +272,7 @@ normal Apache ActiveMQ Artemis connections.
 #### Defining Discovery Groups on the Server
 
 For cluster connections, discovery groups are defined in the server side
-configuration file `activemq-configuration.xml`. All discovery groups
+configuration file `broker.xml`. All discovery groups
 must be defined inside a `discovery-groups` element. There can be many
 discovery groups defined by Apache ActiveMQ Artemis server. Let's look at an example:
 
@@ -362,7 +362,7 @@ take a look at an example:
     connectionFactory.myConnectionFactory=udp://231.7.7.7:9876
 
 The element `discovery-group-ref` specifies the name of a discovery
-group defined in `activemq-configuration.xml`.
+group defined in `broker.xml`.
 
 When this connection factory is downloaded from JNDI by a client
 application and JMS connections are created from it, those connections
@@ -550,7 +550,7 @@ connections in general.
 Cluster connections group servers into clusters so that messages can be
 load balanced between the nodes of the cluster. Let's take a look at a
 typical cluster connection. Cluster connections are always defined in
-`activemq-configuration.xml` inside a `cluster-connection` element.
+`broker.xml` inside a `cluster-connection` element.
 There can be zero or more cluster connections defined per Apache ActiveMQ Artemis
 server.
 
@@ -775,7 +775,7 @@ connection has been made.
 
 When creating connections between nodes of a cluster to form a cluster
 connection, Apache ActiveMQ Artemis uses a cluster user and cluster password which is
-defined in `activemq-configuration.xml`:
+defined in `broker.xml`:
 
     <cluster-user>ACTIVEMQ.CLUSTER.ADMIN.USER</cluster-user>
     <cluster-password>CHANGE ME!!</cluster-password>
@@ -925,7 +925,7 @@ Message redistribution can be configured on a per address basis, by
 specifying the redistribution delay in the address settings, for more
 information on configuring address settings, please see [Queue Attributes](queue-attributes.md).
 
-Here's an address settings snippet from `activemq-configuration.xml`
+Here's an address settings snippet from `broker.xml`
 showing how message redistribution is enabled for a set of queues:
 
     <address-settings>
diff --git a/docs/user-manual/en/configuration-index.md b/docs/user-manual/en/configuration-index.md
index 21b8fe6463..ae10908a41 100644
--- a/docs/user-manual/en/configuration-index.md
+++ b/docs/user-manual/en/configuration-index.md
@@ -7,7 +7,7 @@ element name to go to the specific chapter.
 Server Configuration
 ====================
 
-activemq-configuration.xml
+broker.xml
 --------------------------
 
 This is the main core server configuration file which contains to elements
diff --git a/docs/user-manual/en/configuring-transports.md b/docs/user-manual/en/configuring-transports.md
index b85e4fe3cf..7dd7c23fb5 100644
--- a/docs/user-manual/en/configuring-transports.md
+++ b/docs/user-manual/en/configuring-transports.md
@@ -7,7 +7,7 @@ Apache ActiveMQ Artemis transports and where and how they're configured.
 
 One of the most important concepts in Apache ActiveMQ Artemis transports is the
 *acceptor*. Let's dive straight in and take a look at an acceptor
-defined in xml in the configuration file `activemq-configuration.xml`.
+defined in xml in the configuration file `broker.xml`.
 
     <acceptors>
        <acceptor name="netty">tcp://localhost:61617</acceptor>
@@ -45,7 +45,7 @@ Whereas acceptors are used on the server to define how we accept
 connections, connectors are used by a client to define how it connects
 to a server.
 
-Let's look at a connector defined in our `activemq-configuration.xml`
+Let's look at a connector defined in our `broker.xml`
 file:
 
     <connectors>
diff --git a/docs/user-manual/en/connection-ttl.md b/docs/user-manual/en/connection-ttl.md
index cd3c301454..545e816cff 100644
--- a/docs/user-manual/en/connection-ttl.md
+++ b/docs/user-manual/en/connection-ttl.md
@@ -190,5 +190,5 @@ thread adds a little more latency. These packets are:
 -   `org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXARollbackMessage`
 
 To disable asynchronous connection execution, set the parameter
-`async-connection-execution-enabled` in `activemq-configuration.xml` to
+`async-connection-execution-enabled` in `broker.xml` to
 `false` (default value is `true`).
diff --git a/docs/user-manual/en/core-bridges.md b/docs/user-manual/en/core-bridges.md
index d4b5b5e8b4..0b008b0fd6 100644
--- a/docs/user-manual/en/core-bridges.md
+++ b/docs/user-manual/en/core-bridges.md
@@ -38,7 +38,7 @@ server. They do this by using duplicate detection (described in [Duplicate Detec
 
 ## Configuring Bridges
 
-Bridges are configured in `activemq-configuration.xml`. Let's kick off
+Bridges are configured in `broker.xml`. Let's kick off
 with an example (this is actually from the bridge example):
 
     <bridge name="my-bridge">
@@ -84,7 +84,7 @@ Let's take a look at all the parameters in turn:
     >
     > If you're using JMS then normally the JMS configuration
     > `activemq-jms.xml` is loaded after the core configuration file
-    > `activemq-configuration.xml` is loaded. If your bridge is
+    > `broker.xml` is loaded. If your bridge is
     > consuming from a JMS queue then you'll need to make sure the JMS
     > queue is also deployed as a core queue in the core configuration.
     > Take a look at the bridge example for an example of how this is
@@ -204,12 +204,12 @@ Let's take a look at all the parameters in turn:
 -   `user`. This optional parameter determines the user name to use when
     creating the bridge connection to the remote server. If it is not
     specified the default cluster user specified by `cluster-user` in
-    `activemq-configuration.xml` will be used.
+    `broker.xml` will be used.
 
 -   `password`. This optional parameter determines the password to use
     when creating the bridge connection to the remote server. If it is
     not specified the default cluster password specified by
-    `cluster-password` in `activemq-configuration.xml` will be used.
+    `cluster-password` in `broker.xml` will be used.
 
 -   `static-connectors` or `discovery-group-ref`. Pick either of these
     options to connect the bridge to the target server.
diff --git a/docs/user-manual/en/diverts.md b/docs/user-manual/en/diverts.md
index c54b9b19a2..010b509a9a 100644
--- a/docs/user-manual/en/diverts.md
+++ b/docs/user-manual/en/diverts.md
@@ -34,7 +34,7 @@ for messages. Combining diverts with bridges allows you to create a
 distributed network of reliable routing connections between multiple
 geographically distributed servers, creating your global messaging mesh.
 
-Diverts are defined as xml in the `activemq-configuration.xml` file.
+Diverts are defined as xml in the `broker.xml` file.
 There can be zero or more diverts in the file.
 
 Please see the examples for a full working example showing you how to
diff --git a/docs/user-manual/en/duplicate-detection.md b/docs/user-manual/en/duplicate-detection.md
index 6d9efe49b4..e7b526ed98 100644
--- a/docs/user-manual/en/duplicate-detection.md
+++ b/docs/user-manual/en/duplicate-detection.md
@@ -109,12 +109,12 @@ size of `n` elements, then the `n + 1`th id stored will overwrite the
 `0`th element in the cache.
 
 The maximum size of the cache is configured by the parameter
-`id-cache-size` in `activemq-configuration.xml`, the default value is
+`id-cache-size` in `broker.xml`, the default value is
 `2000` elements.
 
 The caches can also be configured to persist to disk or not. This is
 configured by the parameter `persist-id-cache`, also in
-`activemq-configuration.xml`. If this is set to `true` then each id will
+`broker.xml`. If this is set to `true` then each id will
 be persisted to permanent storage as they are received. The default
 value for this parameter is `true`.
 
@@ -135,7 +135,7 @@ will be ignored.
 
 To configure a core bridge to add the duplicate id header, simply set
 the `use-duplicate-detection` to `true` when configuring a bridge in
-`activemq-configuration.xml`.
+`broker.xml`.
 
 The default value for this parameter is `true`.
 
@@ -151,7 +151,7 @@ using their internal bridges.
 
 To configure a cluster connection to add the duplicate id header, simply
 set the `use-duplicate-detection` to `true` when configuring a cluster
-connection in `activemq-configuration.xml`.
+connection in `broker.xml`.
 
 The default value for this parameter is `true`.
 
diff --git a/docs/user-manual/en/embedding-activemq.md b/docs/user-manual/en/embedding-activemq.md
index dced121907..84a078ab28 100644
--- a/docs/user-manual/en/embedding-activemq.md
+++ b/docs/user-manual/en/embedding-activemq.md
@@ -27,7 +27,7 @@ using the Apache ActiveMQ Artemis Core API or JMS.
 
 For instantiating a core Apache ActiveMQ Artemis Server only, the steps are pretty
 simple. The example requires that you have defined a configuration file
-`activemq-configuration.xml` in your classpath:
+`broker.xml` in your classpath:
 
 ``` java
 import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ;
@@ -72,7 +72,7 @@ properties. See the javadocs for this class for more details.
 ## JMS API
 
 JMS embedding is simple as well. This example requires that you have
-defined the config files `activemq-configuration.xml`,
+defined the config files `broker.xml`,
 `activemq-jms.xml`, and a `activemq-users.xml` if you have security
 enabled. Let's also assume that a queue and connection factory has been
 defined in the `activemq-jms.xml` config file.
diff --git a/docs/user-manual/en/filter-expressions.md b/docs/user-manual/en/filter-expressions.md
index a958a9dd65..ea7224ebb4 100644
--- a/docs/user-manual/en/filter-expressions.md
+++ b/docs/user-manual/en/filter-expressions.md
@@ -11,7 +11,7 @@ please the JMS javadoc for
 Filter expressions are used in several places in Apache ActiveMQ Artemis
 
 -   Predefined Queues. When pre-defining a queue, in
-    `activemq-configuration.xml` in either the core or jms configuration a filter
+    `broker.xml` in either the core or jms configuration a filter
     expression can be defined for a queue. Only messages that match the
     filter expression will enter the queue.
 
diff --git a/docs/user-manual/en/ha.md b/docs/user-manual/en/ha.md
index 2819006e55..572947b9f3 100644
--- a/docs/user-manual/en/ha.md
+++ b/docs/user-manual/en/ha.md
@@ -52,7 +52,7 @@ which we will cover in a later chapter.
 > **Note**
 >
 > The `ha-policy` configurations replaces any current HA configuration
-> in the root of the `activemq-configuration.xml` configuration. All old
+> in the root of the `broker.xml` configuration. All old
 > configuration is now deprecated altho best efforts will be made to
 > honour it if configured this way.
 
@@ -140,7 +140,7 @@ live server to replicate from, these are:
 -   `specifying a node group`. You can specify a group of live servers
     that a backup server can connect to. This is done by configuring
     `group-name` in either the `master` or the `slave` element of the
-    `activemq-configuration.xml`. A Backup server will only connect to a
+    `broker.xml`. A Backup server will only connect to a
     live server that shares the same node group name
 
 -   `connecting to any live`. This will be the behaviour if `group-name`
@@ -200,7 +200,7 @@ reconnecting with the live. This avoids a split brain situation.
 #### Configuration
 
 To configure the live and backup servers to be a replicating pair,
-configure the live server in ' `activemq-configuration.xml` to have:
+configure the live server in ' `broker.xml` to have:
 
     <ha-policy>
        <replication>
@@ -351,7 +351,7 @@ on amount of data).
 #### Configuration
 
 To configure the live and backup servers to share their store, configure
-id via the `ha-policy` configuration in `activemq-configuration.xml`:
+id via the `ha-policy` configuration in `broker.xml`:
 
     <ha-policy>
        <shared-store>
@@ -426,7 +426,7 @@ other server (which it assumes it is a back that has assumed its duties)
 to shutdown for it to take over. This is necessary because otherwise the
 live server has no means to know whether there was a fail-over or not,
 and if there was if the server that took its duties is still running or
-not. To configure this option at your `activemq-configuration.xml`
+not. To configure this option at your `broker.xml`
 configuration file as follows:
 
     <ha-policy>
@@ -464,7 +464,7 @@ you can do this by using the management API as explained at [Management](managem
 You can also force the running live server to shutdown when the old live
 server comes back up allowing the original live server to take over
 automatically by setting the following property in the
-`activemq-configuration.xml` configuration file as follows:
+`broker.xml` configuration file as follows:
 
     <ha-policy>
        <shared-store>
@@ -566,7 +566,7 @@ its Connectors and Acceptors which are discussed later on in this
 chapter. A live server can also be configured to allow requests from
 backups and also how many backups a live server can start. this way you
 can evenly distribute backups around the cluster. This is configured via
-the `ha-policy` element in the `activemq-configuration.xml` file like
+the `ha-policy` element in the `broker.xml` file like
 so:
 
     <ha-policy>
diff --git a/docs/user-manual/en/intercepting-operations.md b/docs/user-manual/en/intercepting-operations.md
index f33611bc67..3b11fe9a27 100644
--- a/docs/user-manual/en/intercepting-operations.md
+++ b/docs/user-manual/en/intercepting-operations.md
@@ -42,7 +42,7 @@ The returned boolean value is important:
 ## Configuring The Interceptors
 
 Both incoming and outgoing interceptors are configured in
-`activemq-configuration.xml`:
+`broker.xml`:
 
     <remoting-incoming-interceptors>
        <class-name>org.apache.activemq.jms.example.LoginInterceptor</class-name>
diff --git a/docs/user-manual/en/management.md b/docs/user-manual/en/management.md
index f44eff183b..1d1d8eade6 100644
--- a/docs/user-manual/en/management.md
+++ b/docs/user-manual/en/management.md
@@ -504,7 +504,7 @@ proxies of the MBeans.
 
 By default, JMX is enabled to manage Apache ActiveMQ Artemis. It can be disabled by
 setting `jmx-management-enabled` to `false` in
-`activemq-configuration.xml`:
+`broker.xml`:
 
     <!-- false to disable JMX management for Apache ActiveMQ Artemis -->
     <jmx-management-enabled>false</jmx-management-enabled>
@@ -522,7 +522,7 @@ If JMX is enabled, Apache ActiveMQ Artemis can be managed locally using `jconsol
 By default, Apache ActiveMQ Artemis server uses the JMX domain "org.apache.activemq".
 To manage several Apache ActiveMQ Artemis servers from the *same* MBeanServer, the JMX
 domain can be configured for each individual Apache ActiveMQ Artemis server by setting
-`jmx-domain` in `activemq-configuration.xml`:
+`jmx-domain` in `broker.xml`:
 
     <!-- use a specific JMX domain for ActiveMQ MBeans -->
     <jmx-domain>my.org.apache.activemq</jmx-domain>
@@ -623,7 +623,7 @@ straightforward (`core.queue.exampleQueue` for the Core Queue
 ### Configuring Core Management
 
 The management address to send management messages is configured in
-`activemq-configuration.xml`:
+`broker.xml`:
 
     <management-address>jms.queue.activemq.management</management-address>
 
@@ -633,7 +633,7 @@ messages).
 
 The management address requires a *special* user permission `manage` to
 be able to receive and handle management messages. This is also
-configured in activemq-configuration.xml:
+configured in broker.xml:
 
     <!-- users with the admin role will be allowed to manage -->
     <!-- Apache ActiveMQ Artemis using management messages        -->
@@ -741,7 +741,7 @@ of all the notifications emitted by the server.
 #### Configuring The Core Management Notification Address
 
 The management notification address to receive management notifications
-is configured in `activemq-configuration.xml`:
+is configured in `broker.xml`:
 
     <management-notification-address>activemq.notifications</management-notification-address>
 
@@ -948,7 +948,7 @@ By default, message counters are disabled as it might have a small
 negative effect on memory.
 
 To enable message counters, you can set it to `true` in
-`activemq-configuration.xml`:
+`broker.xml`:
 
     <message-counter-enabled>true</message-counter-enabled>
 
@@ -956,7 +956,7 @@ Message counters keeps a history of the queue metrics (10 days by
 default) and samples all the queues at regular interval (10 seconds by
 default). If message counters are enabled, these values should be
 configured to suit your messaging use case in
-`activemq-configuration.xml`:
+`broker.xml`:
 
     <!-- keep history for a week -->
     <message-counter-max-day-history>7</message-counter-max-day-history>
diff --git a/docs/user-manual/en/message-expiry.md b/docs/user-manual/en/message-expiry.md
index 61d3d94594..39a413405c 100644
--- a/docs/user-manual/en/message-expiry.md
+++ b/docs/user-manual/en/message-expiry.md
@@ -61,7 +61,7 @@ A reaper thread will periodically inspect the queues to check if
 messages have expired.
 
 The reaper thread can be configured with the following properties in
-`activemq-configuration.xml`
+`broker.xml`
 
 -   `message-expiry-scan-period`
 
diff --git a/docs/user-manual/en/message-grouping.md b/docs/user-manual/en/message-grouping.md
index cf520fb662..09d76d37dd 100644
--- a/docs/user-manual/en/message-grouping.md
+++ b/docs/user-manual/en/message-grouping.md
@@ -104,7 +104,7 @@ choose 1 node to have a local grouping handler and all the other nodes
 should have remote handlers- it's the local handler that actually makes
 the decision as to what route should be used, all the other remote
 handlers converse with this. Here is a sample config for both types of
-handler, this should be configured in the *activemq-configuration.xml*
+handler, this should be configured in the *broker.xml*
 file.
 
     <grouping-handler name="my-grouping-handler">
diff --git a/docs/user-manual/en/paging.md b/docs/user-manual/en/paging.md
index d6c5171c3b..f6b92cf383 100644
--- a/docs/user-manual/en/paging.md
+++ b/docs/user-manual/en/paging.md
@@ -41,7 +41,7 @@ Consumers with selectors will also navigate through the page-files and it will i
 You can configure the location of the paging folder
 
 Global paging parameters are specified on the main configuration file
-(`activemq-configuration.xml`).
+(`broker.xml`).
 
     <configuration xmlns="urn:activemq"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -72,7 +72,7 @@ that address alone goes into page mode.
 ## Configuration
 
 Configuration is done at the address settings, done at the main
-configuration file (`activemq-configuration.xml`).
+configuration file (`broker.xml`).
 
     <address-settings>
        <address-setting match="jms.someaddress">
diff --git a/docs/user-manual/en/perf-tuning.md b/docs/user-manual/en/perf-tuning.md
index 14d1960587..b9de0829f5 100644
--- a/docs/user-manual/en/perf-tuning.md
+++ b/docs/user-manual/en/perf-tuning.md
@@ -95,21 +95,21 @@ tuning:
 
 -   Disable security. You may get a small performance boost by disabling
     security by setting the `security-enabled` parameter to `false` in
-    `activemq-configuration.xml`.
+    `broker.xml`.
 
 -   Disable persistence. If you don't need message persistence, turn it
     off altogether by setting `persistence-enabled` to false in
-    `activemq-configuration.xml`.
+    `broker.xml`.
 
 -   Sync transactions lazily. Setting `journal-sync-transactional` to
-    `false` in `activemq-configuration.xml` can give you better
+    `false` in `broker.xml` can give you better
     transactional persistent performance at the expense of some
     possibility of loss of transactions on failure. See  [Guarantees of sends and commits](send-guarantees.md)
     for more information.
 
 -   Sync non transactional lazily. Setting
     `journal-sync-non-transactional` to `false` in
-    `activemq-configuration.xml` can give you better non-transactional
+    `broker.xml` can give you better non-transactional
     persistent performance at the expense of some possibility of loss of
     durable messages on failure. See  [Guarantees of sends and commits](send-guarantees.md)
     for more information.
@@ -176,7 +176,7 @@ tuning:
 -   Use `batch-delay` and set `direct-deliver` to false for the best
     throughput for very small messages. Apache ActiveMQ Artemis comes with a
     preconfigured connector/acceptor pair (`netty-throughput`) in
-    `activemq-configuration.xml` and JMS connection factory
+    `broker.xml` and JMS connection factory
     (`ThroughputConnectionFactory`) in `activemq-jms.xml`which can be
     used to give the very best throughput, especially for small
     messages. See the [Configuring the Transport](configuring-transports.md)
diff --git a/docs/user-manual/en/persistence.md b/docs/user-manual/en/persistence.md
index e6f59f5da2..c5f0862904 100644
--- a/docs/user-manual/en/persistence.md
+++ b/docs/user-manual/en/persistence.md
@@ -129,7 +129,7 @@ the broker for Zero Persistence section.
 ## Configuring the bindings journal
 
 The bindings journal is configured using the following attributes in
-`activemq-configuration.xml`
+`broker.xml`
 
 -   `bindings-directory`
 
@@ -150,7 +150,7 @@ The jms config shares its configuration with the bindings journal.
 ## Configuring the message journal
 
 The message journal is configured using the following attributes in
-`activemq-configuration.xml`
+`broker.xml`
 
 -   `journal-directory`
 
@@ -349,7 +349,7 @@ Using aptitude, (e.g. on Ubuntu or Debian system):
 In some situations, zero persistence is sometimes required for a
 messaging system. Configuring Apache ActiveMQ Artemis to perform zero persistence is
 straightforward. Simply set the parameter `persistence-enabled` in
-`activemq-configuration.xml` to `false`.
+`broker.xml` to `false`.
 
 Please note that if you set this parameter to false, then *zero*
 persistence will occur. That means no bindings data, message data, large
diff --git a/docs/user-manual/en/queue-attributes.md b/docs/user-manual/en/queue-attributes.md
index e515d06176..a49d06a96b 100644
--- a/docs/user-manual/en/queue-attributes.md
+++ b/docs/user-manual/en/queue-attributes.md
@@ -10,7 +10,7 @@ attribute has.
 Queues can be predefined via configuration at a core level or at a JMS
 level. Firstly let's look at a JMS level.
 
-The following shows a queue predefined in the jms element of the `activemq-configuration.xml`
+The following shows a queue predefined in the jms element of the `broker.xml`
 configuration file.
 
     <queue name="selectorQueue">
@@ -36,7 +36,7 @@ The durable element specifies whether the queue will be persisted. This
 again is optional and defaults to true if omitted.
 
 Secondly a queue can be predefined at a core level in the
-`activemq-configuration.xml` file. The following is an example.
+`broker.xml` file. The following is an example.
 
     <queues>
        <queue name="jms.queue.selectorQueue">
@@ -78,7 +78,7 @@ queues.
 
 There are some attributes that are defined against an address wildcard
 rather than a specific queue. Here an example of an `address-setting`
-entry that would be found in the `activemq-configuration.xml` file.
+entry that would be found in the `broker.xml` file.
 
     <address-settings>
        <address-setting match="jms.queue.exampleQueue">
diff --git a/docs/user-manual/en/rest.md b/docs/user-manual/en/rest.md
index a8a990d571..ff4147991c 100644
--- a/docs/user-manual/en/rest.md
+++ b/docs/user-manual/en/rest.md
@@ -190,7 +190,7 @@ The project structure should look this like:
     `-- src
        `-- main
            `-- resources
-               `-- activemq-configuration.xml
+               `-- broker.xml
            `-- webapp
                `-- WEB-INF
                    `-- web.xml
diff --git a/docs/user-manual/en/security.md b/docs/user-manual/en/security.md
index 4fffa5d111..d7b4aba100 100644
--- a/docs/user-manual/en/security.md
+++ b/docs/user-manual/en/security.md
@@ -2,7 +2,7 @@
 
 This chapter describes how security works with Apache ActiveMQ Artemis and how you can
 configure it. To disable security completely simply set the
-`security-enabled` property to false in the `activemq-configuration.xml`
+`security-enabled` property to false in the `broker.xml`
 file.
 
 For performance reasons security is cached and invalidated every so
@@ -54,7 +54,7 @@ specified. If the user has any of those roles, he/she will be granted
 that permission for that set of addresses.
 
 Let's take a simple example, here's a security block from
-`activemq-configuration.xml` file:
+`broker.xml` file:
 
     <security-setting match="globalqueues.europe.#">
        <permission type="createDurableQueue" roles="admin"/>
diff --git a/docs/user-manual/en/send-guarantees.md b/docs/user-manual/en/send-guarantees.md
index d65bf67c8d..5fec99153a 100644
--- a/docs/user-manual/en/send-guarantees.md
+++ b/docs/user-manual/en/send-guarantees.md
@@ -22,7 +22,7 @@ storage by the time the call to commit or rollback returns.
 Setting this parameter to `false` can improve performance at the expense
 of some loss of transaction durability.
 
-This parameter is set in `activemq-configuration.xml`
+This parameter is set in `broker.xml`
 
 ## Guarantees of Non Transactional Message Sends
 
diff --git a/docs/user-manual/en/spring-integration.md b/docs/user-manual/en/spring-integration.md
index 21d112ea91..6806912060 100644
--- a/docs/user-manual/en/spring-integration.md
+++ b/docs/user-manual/en/spring-integration.md
@@ -4,7 +4,7 @@ Apache ActiveMQ Artemis provides a simple bootstrap class,
 `org.apache.activemq.integration.spring.SpringJmsBootstrap`, for
 integration with Spring. To use it, you configure Apache ActiveMQ Artemis as you always
 would, through its various configuration files like
-`activemq-configuration.xml`, `activemq-jms.xml`, and
+`broker.xml`, `activemq-jms.xml`, and
 `activemq-users.xml`. The Spring helper class starts the Apache ActiveMQ Artemis server
 and adds any factories or destinations configured within
 `activemq-jms.xml` directly into the namespace of the Spring context.
diff --git a/docs/user-manual/en/thread-pooling.md b/docs/user-manual/en/thread-pooling.md
index 59500e779e..9c24bb7561 100644
--- a/docs/user-manual/en/thread-pooling.md
+++ b/docs/user-manual/en/thread-pooling.md
@@ -52,7 +52,7 @@ internally to a `java.util.concurrent.ScheduledThreadPoolExecutor`
 instance.
 
 The maximum number of thread used by this pool is configure in
-`activemq-configuration.xml` with the `scheduled-thread-pool-max-size`
+`broker.xml` with the `scheduled-thread-pool-max-size`
 parameter. The default value is `5` threads. A small number of threads
 is usually sufficient for this pool.
 
@@ -63,7 +63,7 @@ on the server side. It maps internally to a
 `java.util.concurrent.ThreadPoolExecutor` instance.
 
 The maximum number of thread used by this pool is configure in
-`activemq-configuration.xml` with the `thread-pool-max-size` parameter.
+`broker.xml` with the `thread-pool-max-size` parameter.
 
 If a value of `-1` is used this signifies that the thread pool has no
 upper bound and new threads will be created on demand if there are not
diff --git a/docs/user-manual/en/transaction-config.md b/docs/user-manual/en/transaction-config.md
index 5a98d75b96..498f008115 100644
--- a/docs/user-manual/en/transaction-config.md
+++ b/docs/user-manual/en/transaction-config.md
@@ -11,7 +11,7 @@ To cope with this Apache ActiveMQ Artemis can, if configured, scan for old trans
 and rollback any it finds. The default for this is 3000000 milliseconds
 (5 minutes), i.e. any transactions older than 5 minutes are removed.
 This timeout can be changed by editing the `transaction-timeout`
-property in `activemq-configuration.xml` (value must be in
+property in `broker.xml` (value must be in
 milliseconds). The property `transaction-timeout-scan-period` configures
 how often, in milliseconds, to scan for old transactions.
 
diff --git a/docs/user-manual/en/undelivered-messages.md b/docs/user-manual/en/undelivered-messages.md
index 724103106f..67b3a85fae 100644
--- a/docs/user-manual/en/undelivered-messages.md
+++ b/docs/user-manual/en/undelivered-messages.md
@@ -165,6 +165,6 @@ delivery count before message delivery but this feature is disabled by default
 due to performance implications.
 
 To enable it, set `persist-delivery-count-before-delivery` to `true` in
-`activemq-configuration.xml`:
+`broker.xml`:
 
     <persist-delivery-count-before-delivery>true</persist-delivery-count-before-delivery>
diff --git a/docs/user-manual/en/using-server.md b/docs/user-manual/en/using-server.md
index 87972592d2..9f7a37bca3 100644
--- a/docs/user-manual/en/using-server.md
+++ b/docs/user-manual/en/using-server.md
@@ -115,7 +115,7 @@ The configuration file used to bootstrap the server (e.g.
 `bootstrap.xml` by default) references the specific broker configuration
 files.
 
--   `activemq-configuration.xml`. This is the main ActiveMQ
+-   `broker.xml`. This is the main ActiveMQ
     configuration file. All the parameters in this file are
     described [here](configuration-index.md)
 
@@ -142,7 +142,7 @@ The bootstrap file is very simple. Let's take a look at an example:
 
     <broker xmlns="http://activemq.org/schema">
 
-       <file:core configuration="${activemq.home}/config/stand-alone/non-clustered/activemq-configuration.xml"></core>
+       <file:core configuration="${activemq.home}/config/stand-alone/non-clustered/broker.xml"></core>
 
        <basic-security/>
 
@@ -156,7 +156,7 @@ The bootstrap file is very simple. Let's take a look at an example:
 ## The main configuration file.
 
 The configuration for the Apache ActiveMQ Artemis core server is contained in
-`activemq-configuration.xml`. This is what the FileConfiguration bean
+`broker.xml`. This is what the FileConfiguration bean
 uses to configure the messaging server.
 
 There are many attributes which you can configure Apache ActiveMQ Artemis. In most
diff --git a/docs/user-manual/en/wildcard-routing.md b/docs/user-manual/en/wildcard-routing.md
index ee37877ee2..149ffd7e3e 100644
--- a/docs/user-manual/en/wildcard-routing.md
+++ b/docs/user-manual/en/wildcard-routing.md
@@ -13,7 +13,7 @@ messages which are sent to a *hierarchy* of addresses.
 > In JMS terminology this allows "topic hierarchies" to be created.
 
 To enable this functionality set the property
-`wild-card-routing-enabled` in the `activemq-configuration.xml` file to
+`wild-card-routing-enabled` in the `broker.xml` file to
 `true`. This is `true` by default.
 
 For more information on the wild card syntax take a look at [wildcard syntax](wildcard-syntax.md) chapter,
diff --git a/examples/core/perf/src/main/resources/server0/activemq-configuration.xml b/examples/core/perf/src/main/resources/server0/broker.xml
similarity index 100%
rename from examples/core/perf/src/main/resources/server0/activemq-configuration.xml
rename to examples/core/perf/src/main/resources/server0/broker.xml
diff --git a/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml b/examples/core/vertx-connector/src/main/resources/server0/broker.xml
similarity index 100%
rename from examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml
rename to examples/core/vertx-connector/src/main/resources/server0/broker.xml
diff --git a/examples/jms/aerogear/readme.html b/examples/jms/aerogear/readme.html
index 6ae17e1c59..781de3dbd9 100644
--- a/examples/jms/aerogear/readme.html
+++ b/examples/jms/aerogear/readme.html
@@ -79,7 +79,7 @@ under the License.
      </ol>
    <p>And on your mobile app you should see a message from ActiveMQ</p>
 
-  <p>Now lets look a bit more closely at the configuration in activemq-configuration.xml</p>
+  <p>Now lets look a bit more closely at the configuration in broker.xml</p>
      <ol>
         <pre class="prettyprint">
            <code>
diff --git a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/aerogear/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/aerogear/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/application-layer-failover/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/application-layer-failover/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/bridge/readme.html b/examples/jms/bridge/readme.html
index 9879dbb5d8..96b6c7f467 100644
--- a/examples/jms/bridge/readme.html
+++ b/examples/jms/bridge/readme.html
@@ -54,7 +54,7 @@ under the License.
      want to reject those.</p>
      <p>Moreover it is known that Aardvarks normally wear blue hats, and it's important that we only make sausages using
      Aardvarks with green hats, so on the way we are going transform the property "hat" from "green" to "blue".</p>  
-     <p>Here's a snippet from <code>activemq-configuration.xml</code> showing the bridge configuration</p>
+     <p>Here's a snippet from <code>broker.xml</code> showing the bridge configuration</p>
      <pre class="prettyprint">
      <code>
      &lt;bridge name="my-bridge"&gt;
diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/bridge/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/bridge/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/bridge/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/bridge/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/browser/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/browser/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-kickoff/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/client-kickoff/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/client-side-load-balancing/readme.html b/examples/jms/client-side-load-balancing/readme.html
index da543875eb..4ca46211a5 100644
--- a/examples/jms/client-side-load-balancing/readme.html
+++ b/examples/jms/client-side-load-balancing/readme.html
@@ -38,7 +38,7 @@ under the License.
      to use UDP discovery to discover the list of servers over which to round-robin. This example will use UDP
      discovery to obtain the list.</p>
      <p>This example starts three servers which all broadcast their location using UDP discovery. The UDP broadcast configuration
-     can be seen in the <code>activemq-configuration.xml</code> file.</p>
+     can be seen in the <code>broker.xml</code> file.</p>
      <p>A JMS ConnectionFactory is deployed on each server specifying the discovery group that will be used by that
      connection factory.</p>      
      <p>For more information on ActiveMQ load balancing, and clustering in general, please see the clustering
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/broker.xml
similarity index 100%
rename from examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
rename to examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/broker.xml
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/clustered-grouping/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/clustered-grouping/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/broker.xml
similarity index 100%
rename from examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml
rename to examples/jms/clustered-grouping/src/main/resources/activemq/server2/broker.xml
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/clustered-jgroups/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/clustered-jgroups/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/clustered-queue/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/clustered-queue/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/clustered-standalone/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/clustered-standalone/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/broker.xml
similarity index 100%
rename from examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml
rename to examples/jms/clustered-standalone/src/main/resources/activemq/server2/broker.xml
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml
similarity index 100%
rename from examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml
rename to examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/clustered-topic/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/clustered-topic/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/dead-letter/readme.html b/examples/jms/dead-letter/readme.html
index 435b71db8d..e91061ff35 100644
--- a/examples/jms/dead-letter/readme.html
+++ b/examples/jms/dead-letter/readme.html
@@ -40,7 +40,7 @@ under the License.
          We will then consume this dead letter message.
      </p>
      <h2>Example setup</h2>
-     <p><em>Dead letter addresses</em> and <em>maximum delivery attempts</em> are defined in the configuration file <a href="src/main/resources/activemq/server0/activemq-configuration.xml">activemq-configuration.xml</a>:</p>
+     <p><em>Dead letter addresses</em> and <em>maximum delivery attempts</em> are defined in the configuration file <a href="src/main/resources/activemq/server0/broker.xml">broker.xml</a>:</p>
      <pre class="prettyprint">
          <code>&lt;address-setting match="jms.queue.exampleQueue"&gt;
             &lt;dead-letter-address&gt;jms.queue.deadLetterQueue&lt;/dead-letter-address&gt;
diff --git a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/dead-letter/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/dead-letter/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/delayed-redelivery/readme.html b/examples/jms/delayed-redelivery/readme.html
index d349421d84..81fb6edfb3 100644
--- a/examples/jms/delayed-redelivery/readme.html
+++ b/examples/jms/delayed-redelivery/readme.html
@@ -39,7 +39,7 @@ under the License.
      matching on the address settings.</p>
 
      <h2>Example setup</h2>
-     <p>Redelivery delay is specified in the configuration file <a href="src/main/resources/activemq/server0/activemq-configuration.xml">activemq-configuration.xml</a>:</p>
+     <p>Redelivery delay is specified in the configuration file <a href="src/main/resources/activemq/server0/broker.xml">broker.xml</a>:</p>
      <p>In this example we set the redelivery delay to 5 seconds for the specific example queue. We could set redelivery delay on
      on multiple queues by specifying a wild-card in the match, e.g. <code>match="jms.#"</code> would apply the settings
      to all JMS queues and topics.</p>
diff --git a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/delayed-redelivery/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/divert/readme.html b/examples/jms/divert/readme.html
index 759cce6d47..adcf0cae20 100644
--- a/examples/jms/divert/readme.html
+++ b/examples/jms/divert/readme.html
@@ -54,7 +54,7 @@ under the License.
      <p>We will create a topic, <code>spyTopic</code> on the London server, and there will be two subscribers both in London.</p>
      <p>We will create a <i>non-exclusive</i> divert on the London server which will siphon off a copy of each order
      received to the topic <code>spyTopic</code>.</p>
-     <p>Here's the xml config for that divert, from <code>activemq-configuration.xml</code></p>
+     <p>Here's the xml config for that divert, from <code>broker.xml</code></p>
      <pre class="prettyprint">
         <code>
      &lt;divert name="order-divert"&gt;                 
diff --git a/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/divert/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/divert/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/divert/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/divert/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/durable-subscription/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/durable-subscription/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/embedded-simple/readme.html b/examples/jms/embedded-simple/readme.html
index bf412588d6..9b165f57b1 100644
--- a/examples/jms/embedded-simple/readme.html
+++ b/examples/jms/embedded-simple/readme.html
@@ -34,7 +34,7 @@ under the License.
 
       <ol>
          <li>Create ActiveMQ core configuration files and make sure they are within your classpath.  By default, ActiveMQ
-             expects the configuration file name to be "activemq-configuration.xml".</li>
+             expects the configuration file name to be "broker.xml".</li>
          <li>Create an embedded ActiveMQ JMS server</li>
          <pre class="prettyprint">
             <code>EmbeddedJMS jmsServer = new EmbeddedJMS();</code>
diff --git a/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml b/examples/jms/embedded-simple/src/main/resources/broker.xml
similarity index 100%
rename from examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml
rename to examples/jms/embedded-simple/src/main/resources/broker.xml
diff --git a/examples/jms/expiry/readme.html b/examples/jms/expiry/readme.html
index ea2e38a790..534acfc4d2 100644
--- a/examples/jms/expiry/readme.html
+++ b/examples/jms/expiry/readme.html
@@ -38,7 +38,7 @@ under the License.
          We will instead consume it from an <em>expiry queue</em> where it was moved when it expired.
      </p>
      <h2>Example setup</h2>
-     <p>Expiry destinations are defined in the configuration file <a href="server0/activemq-configuration.xml">activemq-configuration.xml</a>:</p>
+     <p>Expiry destinations are defined in the configuration file <a href="server0/broker.xml">broker.xml</a>:</p>
      <pre class="prettyprint">
          <code>&lt;address-setting match="jms.queue.exampleQueue"&gt;
             &lt;expiry-address&gt;jms.queue.expiryQueue&lt;/expiry-address&gt;
diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/expiry/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/expiry/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/http-transport/readme.html b/examples/jms/http-transport/readme.html
index a159deb8d0..0cf324dc02 100644
--- a/examples/jms/http-transport/readme.html
+++ b/examples/jms/http-transport/readme.html
@@ -32,7 +32,7 @@ under the License.
      <p>ActiveMQ supports a variety of network protocols to be its underlying transport without any specific code change.</p>
      
      <p>This example is taken from the queue example without any code change. By changing the configuration file, one can get ActiveMQ working with HTTP transport.</p>
-     <p>All you need to do is open the server0/activemq-configuration.xml and enable HTTP like the following</p>
+     <p>All you need to do is open the server0/broker.xml and enable HTTP like the following</p>
  
  
       <pre class="prettyprint">
diff --git a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/http-transport/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/http-transport/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/interceptor/readme.html b/examples/jms/interceptor/readme.html
index 737d5219bd..8f4e188688 100644
--- a/examples/jms/interceptor/readme.html
+++ b/examples/jms/interceptor/readme.html
@@ -39,7 +39,7 @@ under the License.
          }
      </code>
      </pre>
-     <p>Once you have your own interceptor class, add it to the activemq-configuration.xml, as follows:</p>
+     <p>Once you have your own interceptor class, add it to the broker.xml, as follows:</p>
      <pre class="prettyprint">
      <code>
         &lt;configuration&gt;
diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/interceptor/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/interceptor/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/jms-bridge/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/jms-bridge/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/jms-completion-listener/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-context/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/jms-context/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jmx/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/jmx/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/large-message/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/large-message/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/large-message/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/last-value-queue/readme.html b/examples/jms/last-value-queue/readme.html
index b5b5903ad4..260ef8a412 100644
--- a/examples/jms/last-value-queue/readme.html
+++ b/examples/jms/last-value-queue/readme.html
@@ -37,7 +37,7 @@ under the License.
         We will then consume from the queue the <em>last</em> message.</p>
         
      <h2>Example setup</h2>
-     <p>Last-Value queues are defined in the configuration file <a href="server0/activemq-configuration.xml">activemq-configuration.xml</a>:</p>
+     <p>Last-Value queues are defined in the configuration file <a href="server0/broker.xml">broker.xml</a>:</p>
      <pre class="prettyprint">
          <code>&lt;address-setting match="jms.queue.lastValueQueue"&gt;
                 &lt;last-value-queue&gt;true&lt;/last-value-queue&gt;
diff --git a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/last-value-queue/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/last-value-queue/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/management-notifications/readme.html b/examples/jms/management-notifications/readme.html
index 4c8d7fe876..5075360c35 100644
--- a/examples/jms/management-notifications/readme.html
+++ b/examples/jms/management-notifications/readme.html
@@ -37,7 +37,7 @@ under the License.
      <h2>Example configuration</h2>
 
      <p>ActiveMQ can configured to send JMS messages when management notifications are emitted on the server.</p>
-     <p>By default, the management name is called <code>activemq.notifications</code> but this can be configured in <a href="server0/activemq-configuration.xml">activemq-configuration.xml</a>.
+     <p>By default, the management name is called <code>activemq.notifications</code> but this can be configured in <a href="server0/broker.xml">broker.xml</a>.
         For this example, we will set it to <code>jms.topic.notificationsTopic</code> to be able to receive notifications from a JMS Topic.</p>
       <pre class="prettyprint">
          <code>&lt;management-notification-address&gt;jms.topic.notificationsTopic&lt;/management-notification-address&gt;</code>
@@ -50,7 +50,7 @@ under the License.
          &lt;/topic&gt;</code>
      </pre>
      <p>The notification queue requires permission to create/delete temporary queues and consume messages.
-         This is also configured in <a href="server0/activemq-configuration.xml">activemq-configuration.xml</a></p>
+         This is also configured in <a href="server0/broker.xml">broker.xml</a></p>
      <pre class="prettyprint">
          <code><!--security for notification topic-->
          &lt;security-setting match="jms.topic.notificationsTopic"&gt;
diff --git a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/management-notifications/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/management-notifications/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/management/readme.html b/examples/jms/management/readme.html
index e905ad8bd8..b7ec5cf486 100644
--- a/examples/jms/management/readme.html
+++ b/examples/jms/management/readme.html
@@ -32,13 +32,13 @@ under the License.
      <h2>Example configuration</h2>
 
      <p>ActiveMQ can be managed by sending JMS messages with specific properties to its <em>management</em> queue.</p>
-     </p>By default, the management name is called <code>activemq.management</code> but this can be configured in <a href="server0/activemq-configuration.xml">activemq-configuration.xml</a>
+     </p>By default, the management name is called <code>activemq.management</code> but this can be configured in <a href="server0/broker.xml">broker.xml</a>
      <pre class="prettyprint">
          <code>&lt;management-address&gt;activemq.management&lt;/management-address&gt;</code>
      </pre>
      
      <p>The management queue requires a "special" user permission <code>manage</code> to be able to receive management messages.
-         This is also configured in <a href="server0/activemq-configuration.xml">activemq-configuration.xml</a></p>
+         This is also configured in <a href="server0/broker.xml">broker.xml</a></p>
      <pre class="prettyprint">
          <code>&lt;security-setting match="activemq.management"&gt;
             &lt;permission type="manage" roles="guest" /&gt;
diff --git a/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/management/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/management/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/message-counters/readme.html b/examples/jms/message-counters/readme.html
index 5e816ad3d0..e4b2fb497e 100644
--- a/examples/jms/message-counters/readme.html
+++ b/examples/jms/message-counters/readme.html
@@ -33,7 +33,7 @@ under the License.
          at different times to display the metrics on the queue.
      </p>
      <h2>Example setup</h2>
-     <p>Message counter is configured in the server configuration file <a href="server0/activemq-configuration.xml">activemq-configuration.xml</a>:</p>
+     <p>Message counter is configured in the server configuration file <a href="server0/broker.xml">broker.xml</a>:</p>
      <pre class="prettyprint">
          <code>&lt;message-counter-enabled&gt;true&lt;/message-counter-enabled&gt;
          &lt;message-counter-sample-period&gt;2000&lt;/message-counter-sample-period&gt;
diff --git a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-counters/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/message-counters/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-group/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/message-group/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/message-group/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-group2/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/message-group2/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/message-group2/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-priority/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/message-priority/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/message-priority/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/broker.xml
similarity index 100%
rename from examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml
rename to examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/broker.xml
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/multiple-failover/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/multiple-failover/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server2/broker.xml
similarity index 100%
rename from examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
rename to examples/jms/multiple-failover/src/main/resources/activemq/server2/broker.xml
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/non-transaction-failover/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/non-transaction-failover/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/openwire/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/openwire/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/paging/readme.html b/examples/jms/paging/readme.html
index 6813b043b4..841d5174d7 100644
--- a/examples/jms/paging/readme.html
+++ b/examples/jms/paging/readme.html
@@ -28,7 +28,7 @@ under the License.
      <h1>Paging Example</h1>
 
      <p>This example shows how ActiveMQ would avoid running out of memory resources by paging messages.</p>
-     <p>A maxSize can be specified per Destination via the destinations settings configuration file (activemq-configuration.xml).</p>
+     <p>A maxSize can be specified per Destination via the destinations settings configuration file (broker.xml).</p>
      <p>When messages routed to an address exceed the specified maxSize the server will begin to write messages to the file
      system, this is called paging. This will continue to occur until messages have been delivered to consumers and subsequently
      acknowledged freeing up memory. Messages will then be read from the file system , i.e. depaged, and routed as normal. </p>
diff --git a/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/paging/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/paging/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/perf/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/perf/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/pre-acknowledge/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/producer-rate-limit/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/proton-cpp/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/proton-cpp/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/proton-j/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/proton-j/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/proton-ruby/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/proton-ruby/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/queue-message-redistribution/readme.html b/examples/jms/queue-message-redistribution/readme.html
index 86b40e34a9..7fc43fb75d 100644
--- a/examples/jms/queue-message-redistribution/readme.html
+++ b/examples/jms/queue-message-redistribution/readme.html
@@ -37,7 +37,7 @@ under the License.
      with no consumers, to nodes where there are consumers. If the consumers have JMS selectors set on them, then they
      will only be redistributed to nodes with consumers whose selectors match.</p>
      <p>By default, message redistribution is disabled, but can be enabled by specifying some AddressSettings configuration
-     in either <code>activemq-queues.xml</code> or <code>activemq-configuration.xml</code></p>
+     in either <code>activemq-queues.xml</code> or <code>broker.xml</code></p>
      <p>Setting <code>redistribution-delay</code> to <code>0</code> will cause redistribution to occur immediately
      once there are no more matching consumers on a particular queue instance. Setting it to a positive value > 0 specifies
      a delay in milliseconds before attempting to redistribute. The delay is useful in the case that another consumer is
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-requestor/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/queue-requestor/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-selector/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/queue-selector/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/queue/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/reattach-node/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/reattach-node/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/replicated-failback-static/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/replicated-failback-static/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/replicated-failback/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/replicated-failback/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml
similarity index 100%
rename from examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
rename to examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/request-reply/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/request-reply/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-configuration.xml b/examples/jms/rest/dup-send/src/main/resources/broker.xml
similarity index 100%
rename from examples/jms/rest/dup-send/src/main/resources/activemq-configuration.xml
rename to examples/jms/rest/dup-send/src/main/resources/broker.xml
diff --git a/examples/jms/rest/javascript-chat/src/main/resources/activemq-configuration.xml b/examples/jms/rest/javascript-chat/src/main/resources/broker.xml
similarity index 100%
rename from examples/jms/rest/javascript-chat/src/main/resources/activemq-configuration.xml
rename to examples/jms/rest/javascript-chat/src/main/resources/broker.xml
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-configuration.xml b/examples/jms/rest/jms-to-rest/src/main/resources/broker.xml
similarity index 100%
rename from examples/jms/rest/jms-to-rest/src/main/resources/activemq-configuration.xml
rename to examples/jms/rest/jms-to-rest/src/main/resources/broker.xml
diff --git a/examples/jms/rest/push/src/main/resources/activemq-configuration.xml b/examples/jms/rest/push/src/main/resources/broker.xml
similarity index 100%
rename from examples/jms/rest/push/src/main/resources/activemq-configuration.xml
rename to examples/jms/rest/push/src/main/resources/broker.xml
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/scale-down/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/scale-down/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/scale-down/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/scale-down/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/scheduled-message/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/scheduled-message/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/security/readme.html b/examples/jms/security/readme.html
index ef6321dbed..5bcd22033e 100644
--- a/examples/jms/security/readme.html
+++ b/examples/jms/security/readme.html
@@ -77,7 +77,7 @@ under the License.
      <p>
      User name and password consists of a valid account that can be used to establish connections to a ActiveMQ server, while 
      roles are used in controlling the access privileges against ActiveMQ topics and queues. You can achieve this control by
-     configuring proper permissions in <code>activemq-configuration.xml</code>, like the following
+     configuring proper permissions in <code>broker.xml</code>, like the following
      </p>
      <pre class="prettyprint"><code>
       &lt;security-settings&gt;
diff --git a/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/security/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/security/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/send-acknowledgements/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/spring-integration/src/main/resources/activemq-configuration.xml b/examples/jms/spring-integration/src/main/resources/broker.xml
similarity index 100%
rename from examples/jms/spring-integration/src/main/resources/activemq-configuration.xml
rename to examples/jms/spring-integration/src/main/resources/broker.xml
diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/ssl-enabled/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/static-selector-jms/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/static-selector/readme.html b/examples/jms/static-selector/readme.html
index 36ebb244cc..834d8061a4 100644
--- a/examples/jms/static-selector/readme.html
+++ b/examples/jms/static-selector/readme.html
@@ -33,7 +33,7 @@ under the License.
      
      <p>Static message selectors are ActiveMQ's extension to message selectors as defined in JMS spec 1.1.
      Rather than specifying the selector in the application code, static message selectors are defined in one of 
-     ActiveMQ's configuration files, activemq-configuration.xml, as an element called 'filter' inside each queue
+     ActiveMQ's configuration files, broker.xml, as an element called 'filter' inside each queue
      definition, like</p>
      
      <pre class="prettyprint"><code>
diff --git a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/static-selector/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/static-selector/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/stomp-websockets/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/stomp/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp1.1/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/stomp1.1/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp1.2/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/stomp1.2/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/stop-server-failover/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/stop-server-failover/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/symmetric-cluster/readme.html b/examples/jms/symmetric-cluster/readme.html
index 59acd5847e..35e0ce485c 100644
--- a/examples/jms/symmetric-cluster/readme.html
+++ b/examples/jms/symmetric-cluster/readme.html
@@ -39,7 +39,7 @@ under the License.
      <p>The configuration used in this example is very similar to the configuration used by ActiveMQ
      when installed as a clustered profile in JBoss Application Server.</p>
      <p>To set up ActiveMQ to form a symmetric cluster we simply need to mark each server as <code>clustered</code>
-     and we need to define a <code>cluster-connection</code> in <code>activemq-configuration.xml</code>.</p>
+     and we need to define a <code>cluster-connection</code> in <code>broker.xml</code>.</p>
      <p>The <code>cluster-connection</code> tells the nodes what other nodes to make connections to.
      With a <code>cluster-connection</code> each node that we connect to can either be specified
      indivually, or we can use UDP discovery to find out what other nodes are in the cluster.</p>
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/broker.xml
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server2/broker.xml
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/broker.xml
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server3/broker.xml
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/broker.xml
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server4/broker.xml
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/broker.xml
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server5/broker.xml
diff --git a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/temp-queue/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/temp-queue/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/topic-hierarchies/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/topic-selector-example1/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/topic-selector-example2/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/topic/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/transaction-failover/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server1/broker.xml
similarity index 100%
rename from examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
rename to examples/jms/transaction-failover/src/main/resources/activemq/server1/broker.xml
diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/transactional/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/transactional/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/xa-heuristic/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-receive/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/xa-receive/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-send/src/main/resources/activemq/server0/broker.xml
similarity index 100%
rename from examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml
rename to examples/jms/xa-send/src/main/resources/activemq/server0/broker.xml
diff --git a/examples/soak/normal/README b/examples/soak/normal/README
index acbd2f7a57..b422dd5892 100644
--- a/examples/soak/normal/README
+++ b/examples/soak/normal/README
@@ -27,7 +27,7 @@ settings.
 
 To run a server with the same configuration but on a different host.  Check out this source on the host machine and
 change:
-* activemq.remoting.netty.host property in activemq-configuration.xml
+* activemq.remoting.netty.host property in broker.xml
 * bindAddress and rmiBindAddress properties in activemq-beans.xml
 
   $ mvn verify -P server
@@ -35,7 +35,7 @@ change:
 Configure Server Dump
 =====================
 
-The server can "dump" info at regular interval. In activemq-configuration.xml, set
+The server can "dump" info at regular interval. In broker.xml, set
 
    <server-dump-interval>10000</server-dump-interval>
 
diff --git a/examples/soak/normal/server0/activemq-configuration.xml b/examples/soak/normal/server0/broker.xml
similarity index 100%
rename from examples/soak/normal/server0/activemq-configuration.xml
rename to examples/soak/normal/server0/broker.xml
diff --git a/tests/jms-tests/src/test/resources/activemq-configuration.xml b/tests/jms-tests/src/test/resources/broker.xml
similarity index 100%
rename from tests/jms-tests/src/test/resources/activemq-configuration.xml
rename to tests/jms-tests/src/test/resources/broker.xml

From 24a4c63458e737169613df826fa3e6879e87b20b Mon Sep 17 00:00:00 2001
From: Andy Taylor <andytaylor@apache.org>
Date: Wed, 29 Apr 2015 10:49:43 +0100
Subject: [PATCH 2/4] renamed schemas

---
 .../org/apache/activemq/artemis/cli/commands/etc/broker.xml   | 2 +-
 .../artemis/jms/server/config/impl/FileJMSConfiguration.java  | 2 +-
 .../resources/schema/{activemq-jms.xsd => artemis-jms.xsd}    | 0
 .../resources/schema/{activemq-rest.xsd => artemis-rest.xsd}  | 0
 artemis-rest/src/test/resources/broker.xml                    | 2 +-
 .../activemq/artemis/core/config/impl/FileConfiguration.java  | 2 +-
 .../artemis/core/deployers/impl/FileConfigurationParser.java  | 2 +-
 .../{activemq-configuration.xsd => artemis-configuration.xsd} | 0
 .../schema/{activemq-server.xsd => artemis-server.xsd}        | 0
 .../config/impl/WrongRoleFileConfigurationParserTest.java     | 2 +-
 .../src/test/resources/ConfigurationTest-defaults.xml         | 2 +-
 .../src/test/resources/ConfigurationTest-full-config.xml      | 2 +-
 .../src/test/resources/InvalidConfigurationTest0.xml          | 2 +-
 .../src/test/resources/InvalidConfigurationTest1.xml          | 2 +-
 .../src/test/resources/InvalidConfigurationTest2.xml          | 2 +-
 .../src/test/resources/InvalidConfigurationTest3.xml          | 2 +-
 .../src/test/resources/InvalidConfigurationTest4.xml          | 2 +-
 .../src/test/resources/InvalidConfigurationTest5.xml          | 2 +-
 .../src/test/resources/colocated-hapolicy-config.xml          | 2 +-
 .../src/test/resources/colocated-hapolicy-config2.xml         | 2 +-
 .../src/test/resources/divertRoutingNameNotRequired.xml       | 2 +-
 .../src/test/resources/live-only-hapolicy-config.xml          | 2 +-
 .../src/test/resources/live-only-hapolicy-config2.xml         | 2 +-
 .../src/test/resources/live-only-hapolicy-config3.xml         | 2 +-
 .../src/test/resources/live-only-hapolicy-config4.xml         | 2 +-
 .../src/test/resources/live-only-hapolicy-config5.xml         | 2 +-
 artemis-server/src/test/resources/replica-hapolicy-config.xml | 2 +-
 .../src/test/resources/replica-hapolicy-config2.xml           | 2 +-
 .../src/test/resources/replica-hapolicy-config3.xml           | 2 +-
 .../src/test/resources/replicated-hapolicy-config.xml         | 2 +-
 .../test/resources/shared-store-master-hapolicy-config.xml    | 2 +-
 .../src/test/resources/shared-store-slave-hapolicy-config.xml | 2 +-
 .../test/resources/shared-store-slave-hapolicy-config2.xml    | 2 +-
 .../test/resources/shared-store-slave-hapolicy-config3.xml    | 2 +-
 docs/user-manual/en/large-messages.md                         | 2 +-
 docs/user-manual/en/paging.md                                 | 2 +-
 docs/user-manual/en/spring-integration.md                     | 2 +-
 examples/core/perf/src/main/resources/server0/broker.xml      | 2 +-
 .../resources/server0/hornetq-configuration-messaging-lab.xml | 2 +-
 .../vertx-connector/src/main/resources/server0/broker.xml     | 2 +-
 .../aerogear/src/main/resources/activemq/server0/broker.xml   | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../jms/bridge/src/main/resources/activemq/server0/broker.xml | 2 +-
 .../jms/bridge/src/main/resources/activemq/server1/broker.xml | 2 +-
 .../browser/src/main/resources/activemq/server0/broker.xml    | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server2/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server2/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server2/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server2/broker.xml            | 2 +-
 .../src/main/resources/activemq/server3/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server2/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../jms/divert/src/main/resources/activemq/server0/broker.xml | 2 +-
 .../jms/divert/src/main/resources/activemq/server1/broker.xml | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 examples/jms/embedded-simple/src/main/resources/broker.xml    | 2 +-
 .../jms/expiry/src/main/resources/activemq/server0/broker.xml | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../jms-bridge/src/main/resources/activemq/server0/broker.xml | 2 +-
 .../jms-bridge/src/main/resources/activemq/server1/broker.xml | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../jms/jmx/src/main/resources/activemq/server0/broker.xml    | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../management/src/main/resources/activemq/server0/broker.xml | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server2/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server2/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../openwire/src/main/resources/activemq/server0/broker.xml   | 2 +-
 .../jms/paging/src/main/resources/activemq/server0/broker.xml | 2 +-
 .../jms/perf/src/main/resources/activemq/server0/broker.xml   | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../proton-cpp/src/main/resources/activemq/server0/broker.xml | 2 +-
 .../proton-j/src/main/resources/activemq/server0/broker.xml   | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../jms/queue/src/main/resources/activemq/server0/broker.xml  | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server2/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../jms/rest/dup-send/src/main/resources/activemq-client.xml  | 2 +-
 examples/jms/rest/dup-send/src/main/resources/broker.xml      | 2 +-
 .../jms/rest/javascript-chat/src/main/resources/broker.xml    | 2 +-
 .../rest/jms-to-rest/src/main/resources/activemq-client.xml   | 2 +-
 examples/jms/rest/jms-to-rest/src/main/resources/broker.xml   | 2 +-
 examples/jms/rest/push/src/main/resources/activemq-client.xml | 2 +-
 examples/jms/rest/push/src/main/resources/broker.xml          | 2 +-
 .../scale-down/src/main/resources/activemq/server0/broker.xml | 2 +-
 .../scale-down/src/main/resources/activemq/server1/broker.xml | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../security/src/main/resources/activemq/server0/broker.xml   | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 examples/jms/spring-integration/src/main/resources/broker.xml | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../jms/stomp/src/main/resources/activemq/server0/broker.xml  | 2 +-
 .../stomp1.1/src/main/resources/activemq/server0/broker.xml   | 2 +-
 .../stomp1.2/src/main/resources/activemq/server0/broker.xml   | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server2/broker.xml            | 2 +-
 .../src/main/resources/activemq/server3/broker.xml            | 2 +-
 .../src/main/resources/activemq/server4/broker.xml            | 2 +-
 .../src/main/resources/activemq/server5/broker.xml            | 2 +-
 .../temp-queue/src/main/resources/activemq/server0/broker.xml | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../jms/topic/src/main/resources/activemq/server0/broker.xml  | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server1/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../src/main/resources/activemq/server0/broker.xml            | 2 +-
 .../xa-receive/src/main/resources/activemq/server0/broker.xml | 2 +-
 .../xa-send/src/main/resources/activemq/server0/broker.xml    | 2 +-
 examples/soak/normal/server0/broker.xml                       | 2 +-
 tests/config/server-start-stop-backup-config1.xml             | 2 +-
 tests/config/server-start-stop-backup-jms-config1.xml         | 2 +-
 tests/config/server-start-stop-live-config1.xml               | 2 +-
 tests/config/server-start-stop-live-jms-config1.xml           | 2 +-
 .../test/resources/activemq-jms-for-JMSServerDeployerTest.xml | 2 +-
 .../test/resources/colocated-server-start-stop-config1.xml    | 2 +-
 .../test/resources/colocated-server-start-stop-config2.xml    | 2 +-
 .../resources/colocated-server-start-stop-jms-config1.xml     | 2 +-
 .../resources/colocated-server-start-stop-jms-config2.xml     | 2 +-
 .../src/test/resources/server-start-stop-config1.xml          | 2 +-
 .../src/test/resources/spring-activemq-config.xml             | 2 +-
 tests/jms-tests/src/test/resources/broker.xml                 | 2 +-
 .../unit/core/config/impl/ConfigurationValidationTest.java    | 4 ++--
 191 files changed, 188 insertions(+), 188 deletions(-)
 rename artemis-jms-server/src/main/resources/schema/{activemq-jms.xsd => artemis-jms.xsd} (100%)
 rename artemis-rest/src/main/resources/schema/{activemq-rest.xsd => artemis-rest.xsd} (100%)
 rename artemis-server/src/main/resources/schema/{activemq-configuration.xsd => artemis-configuration.xsd} (100%)
 rename artemis-server/src/main/resources/schema/{activemq-server.xsd => artemis-server.xsd} (100%)

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

From 34f8e5383da582bc70c1f425f093928a5b1694f6 Mon Sep 17 00:00:00 2001
From: Andy Taylor <andytaylor@apache.org>
Date: Wed, 29 Apr 2015 14:28:11 +0100
Subject: [PATCH 3/4] renamed startup scripts

---
 .../boot/{ActiveMQ.java => Artemis.java}      |  8 ++--
 .../cli/{ActiveMQ.java => Artemis.java}       | 12 +++---
 .../activemq/artemis/cli/commands/Create.java | 34 ++++++++--------
 .../activemq/artemis/cli/commands/Run.java    | 18 ++++-----
 .../activemq/artemis/cli/commands/Stop.java   | 12 +++---
 .../cli/commands/bin/{activemq => artemis}    | 40 +++++++++----------
 .../bin/{activemq-service => artemis-service} | 18 ++++-----
 ...tivemq-service.xml => artemis-service.xml} | 26 ++++++------
 .../bin/{activemq.cmd => artemis.cmd}         | 34 ++++++++--------
 .../etc/{activemq.profile => artemis.profile} |  4 +-
 ...tivemq.profile.cmd => artemis.profile.cmd} |  4 +-
 .../artemis/cli/commands/etc/bootstrap.xml    |  6 +--
 .../cli/commands/etc/logging.properties       |  2 +-
 .../xa/ActiveMQXAResourceWrapperImplTest.java |  2 +-
 .../src/main/resources/examples/index.html    |  2 +-
 .../main/resources/bin/{activemq => artemis}  | 22 +++++-----
 .../bin/{activemq.cmd => artemis.cmd}         | 18 ++++-----
 docs/quickstart-guide/en/running.md           |  4 +-
 docs/user-manual/en/using-server.md           |  6 +--
 19 files changed, 136 insertions(+), 136 deletions(-)
 rename artemis-boot/src/main/java/org/apache/activemq/artemis/boot/{ActiveMQ.java => Artemis.java} (95%)
 rename artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/{ActiveMQ.java => Artemis.java} (87%)
 rename artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/{activemq => artemis} (71%)
 rename artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/{activemq-service => artemis-service} (86%)
 rename artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/{activemq-service.xml => artemis-service.xml} (68%)
 rename artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/{activemq.cmd => artemis.cmd} (58%)
 rename artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/{activemq.profile => artemis.profile} (84%)
 rename artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/{activemq.profile.cmd => artemis.profile.cmd} (84%)
 rename distribution/artemis/src/main/resources/bin/{activemq => artemis} (82%)
 rename distribution/artemis/src/main/resources/bin/{activemq.cmd => artemis.cmd} (73%)

diff --git a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/ActiveMQ.java b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
similarity index 95%
rename from artemis-boot/src/main/java/org/apache/activemq/artemis/boot/ActiveMQ.java
rename to artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
index 5182c54b34..bf83100f15 100644
--- a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/ActiveMQ.java
+++ b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
@@ -32,19 +32,19 @@ import java.util.Comparator;
  * execution off to the ActiveMQ cli main.
  * </p>
  */
-public class ActiveMQ
+public class Artemis
 {
 
    public static void main(String[] args) throws Throwable
    {
       ArrayList<File> dirs = new ArrayList<File>();
-      String instance = System.getProperty("activemq.instance");
+      String instance = System.getProperty("artemis.instance");
       if (instance != null)
       {
          dirs.add(new File(new File(instance), "lib"));
       }
 
-      String home = System.getProperty("activemq.home");
+      String home = System.getProperty("artemis.home");
       if (home != null)
       {
          dirs.add(new File(new File(home), "lib"));
@@ -98,7 +98,7 @@ public class ActiveMQ
       // Now setup our classloader..
       URLClassLoader loader = new URLClassLoader(urls.toArray(new URL[urls.size()]));
       Thread.currentThread().setContextClassLoader(loader);
-      Class<?> clazz = loader.loadClass("org.apache.activemq.artemis.cli.ActiveMQ");
+      Class<?> clazz = loader.loadClass("org.apache.activemq.artemis.cli.Artemis");
       Method method = clazz.getMethod("main", args.getClass());
       try
       {
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ActiveMQ.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
similarity index 87%
rename from artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ActiveMQ.java
rename to artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
index 194ad44c96..1b747c5183 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ActiveMQ.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
@@ -28,14 +28,14 @@ import org.apache.activemq.artemis.cli.commands.Stop;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-public class ActiveMQ
+public class Artemis
 {
 
    public static void main(String[] args) throws Exception
    {
-      String instance = System.getProperty("activemq.instance");
-      Cli.CliBuilder<Action> builder = Cli.<Action>builder("activemq")
-         .withDescription("ActiveMQ Command Line")
+      String instance = System.getProperty("artemis.instance");
+      Cli.CliBuilder<Action> builder = Cli.<Action>builder("artemis")
+         .withDescription("ActiveMQ Artemis Command Line")
          .withCommand(HelpAction.class)
          .withDefaultCommand(HelpAction.class);
 
@@ -67,14 +67,14 @@ public class ActiveMQ
       {
          System.err.println(configException.getMessage());
          System.out.println();
-         System.out.println("Configuration should be specified as 'scheme:location'. Default configuration is 'xml:${ACTIVEMQ_INSTANCE}/etc/bootstrap.xml'");
+         System.out.println("Configuration should be specified as 'scheme:location'. Default configuration is 'xml:${ARTEMIS_INSTANCE}/etc/bootstrap.xml'");
       }
 
    }
 
    public static void printBanner() throws Exception
    {
-      copy(ActiveMQ.class.getResourceAsStream("banner.txt"), System.out);
+      copy(Artemis.class.getResourceAsStream("banner.txt"), System.out);
    }
 
    private static long copy(InputStream in, OutputStream out) throws Exception
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index 22cc10edfe..8131668159 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -44,7 +44,7 @@ public class Create implements Action
    @Option(name = "--force", description = "Overwrite configuration at destination directory")
    boolean force;
 
-   @Option(name = "--home", description = "Directory where ActiveMQ is installed")
+   @Option(name = "--home", description = "Directory where ActiveMQ Artemis is installed")
    File home;
 
    @Option(name = "--with-ssl", description = "Generate an SSL enabled configuration")
@@ -91,7 +91,7 @@ public class Create implements Action
 
       }
 
-      context.out.println(String.format("Creating ActiveMQ instance at: %s", directory.getCanonicalPath()));
+      context.out.println(String.format("Creating ActiveMQ Artemis instance at: %s", directory.getCanonicalPath()));
       if (host == null)
       {
          host = directory.getName();
@@ -128,8 +128,8 @@ public class Create implements Action
       {
          filters.put("${home}", path(home, false));
       }
-      filters.put("${activemq.home}", path(System.getProperty("activemq.home"), false));
-      filters.put("${activemq.instance}", path(directory, false));
+      filters.put("${artemis.home}", path(System.getProperty("artemis.home"), false));
+      filters.put("${artemis.instance}", path(directory, false));
       filters.put("${java.home}", path(System.getProperty("java.home"), false));
 
       new File(directory, "bin").mkdirs();
@@ -141,20 +141,20 @@ public class Create implements Action
 
       if (IS_WINDOWS)
       {
-         write("bin/activemq.cmd", null, false);
-         write("bin/activemq-service.exe");
-         write("bin/activemq-service.xml", filters, false);
-         write("etc/activemq.profile.cmd", filters, false);
+         write("bin/artemis.cmd", null, false);
+         write("bin/artemis-service.exe");
+         write("bin/artemis-service.xml", filters, false);
+         write("etc/artemis.profile.cmd", filters, false);
       }
 
       if (!IS_WINDOWS || IS_CYGWIN)
       {
-         write("bin/activemq", null, true);
-         makeExec("bin/activemq");
-         write("bin/activemq-service", null, true);
-         makeExec("bin/activemq-service");
-         write("etc/activemq.profile", filters, true);
-         makeExec("etc/activemq.profile");
+         write("bin/artemis", null, true);
+         makeExec("bin/artemis");
+         write("bin/artemis-service", null, true);
+         makeExec("bin/artemis-service");
+         write("etc/artemis.profile", filters, true);
+         makeExec("etc/artemis.profile");
       }
 
       write("etc/logging.properties", null, false);
@@ -166,9 +166,9 @@ public class Create implements Action
       context.out.println("");
       context.out.println("You can now start the broker by executing:  ");
       context.out.println("");
-      context.out.println(String.format("   \"%s\" run", path(new File(directory, "bin/activemq"), true)));
+      context.out.println(String.format("   \"%s\" run", path(new File(directory, "bin/artemis"), true)));
 
-      File service = new File(directory, "bin/activemq-service");
+      File service = new File(directory, "bin/artemis-service");
       context.out.println("");
 
       if (!IS_WINDOWS || IS_CYGWIN)
@@ -180,7 +180,7 @@ public class Create implements Action
             context.out.println("Or you can setup the broker as system service and run it in the background:");
             context.out.println("");
             context.out.println("   sudo ln -s \"%s\" /etc/init.d/".format(service.getCanonicalPath()));
-            context.out.println("   /etc/init.d/activemq-service start");
+            context.out.println("   /etc/init.d/artemis-service start");
             context.out.println("");
 
          }
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
index a8e505c6ff..360ed3b975 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
@@ -19,7 +19,7 @@ package org.apache.activemq.artemis.cli.commands;
 import io.airlift.command.Arguments;
 import io.airlift.command.Command;
 
-import org.apache.activemq.artemis.cli.ActiveMQ;
+import org.apache.activemq.artemis.cli.Artemis;
 import org.apache.activemq.artemis.components.ExternalComponent;
 import org.apache.activemq.artemis.core.server.ActiveMQComponent;
 import org.apache.activemq.artemis.dto.BrokerDTO;
@@ -40,7 +40,7 @@ import java.util.TimerTask;
 public class Run implements Action
 {
 
-   @Arguments(description = "Broker Configuration URI, default 'xml:${ACTIVEMQ_INSTANCE}/etc/bootstrap.xml'")
+   @Arguments(description = "Broker Configuration URI, default 'xml:${ARTEMIS_INSTANCE}/etc/bootstrap.xml'")
    String configuration;
    private ArrayList<ActiveMQComponent> components = new ArrayList<>();
 
@@ -60,13 +60,13 @@ public class Run implements Action
    public Object execute(ActionContext context) throws Exception
    {
 
-      ActiveMQ.printBanner();
+      Artemis.printBanner();
 
-      /* We use File URI for locating files.  The ACTIVEMQ_HOME variable is used to determine file paths.  For Windows
-      the ACTIVEMQ_HOME variable will include back slashes (An invalid file URI character path separator).  For this
-      reason we overwrite the ACTIVEMQ_HOME variable with backslashes replaced with forward slashes. */
-      String activemqInstance = System.getProperty("activemq.instance").replace("\\", "/");
-      System.setProperty("activemq.instance", activemqInstance);
+      /* We use File URI for locating files.  The ARTEMIS_HOME variable is used to determine file paths.  For Windows
+      the ARTEMIS_HOME variable will include back slashes (An invalid file URI character path separator).  For this
+      reason we overwrite the ARTEMIS_HOME variable with backslashes replaced with forward slashes. */
+      String activemqInstance = System.getProperty("artemis.instance").replace("\\", "/");
+      System.setProperty("artemis.instance", activemqInstance);
 
       if (configuration == null)
       {
@@ -120,7 +120,7 @@ public class Run implements Action
             ActiveMQBootstrapLogger.LOGGER.errorDeletingFile(file.getAbsolutePath());
          }
       }
-      final Timer timer = new Timer("ActiveMQ Server Shutdown Timer", true);
+      final Timer timer = new Timer("ActiveMQ Artemis Server Shutdown Timer", true);
       timer.scheduleAtFixedRate(new TimerTask()
       {
          @Override
diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Stop.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Stop.java
index 0c4028c00c..90cddb37cb 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Stop.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Stop.java
@@ -27,17 +27,17 @@ import java.net.URI;
 @Command(name = "stop", description = "stops the broker instance")
 public class Stop implements Action
 {
-   @Arguments(description = "Broker Configuration URI, default 'xml:${ACTIVEMQ_INSTANCE}/etc/bootstrap.xml'")
+   @Arguments(description = "Broker Configuration URI, default 'xml:${ARTEMIS_INSTANCE}/etc/bootstrap.xml'")
    String configuration;
 
    @Override
    public Object execute(ActionContext context) throws Exception
    {
-      /* We use File URI for locating files.  The ACTIVEMQ_HOME variable is used to determine file paths.  For Windows
-      the ACTIVEMQ_HOME variable will include back slashes (An invalid file URI character path separator).  For this
-      reason we overwrite the ACTIVEMQ_HOME variable with backslashes replaced with forward slashes. */
-      String activemqHome = System.getProperty("activemq.instance").replace("\\", "/");
-      System.setProperty("activemq.instance", activemqHome);
+      /* We use File URI for locating files.  The ARTEMIS_HOME variable is used to determine file paths.  For Windows
+      the ARTEMIS_HOME variable will include back slashes (An invalid file URI character path separator).  For this
+      reason we overwrite the ARTEMIS_HOME variable with backslashes replaced with forward slashes. */
+      String activemqHome = System.getProperty("artemis.instance").replace("\\", "/");
+      System.setProperty("artemis.instance", activemqHome);
 
       if (configuration == null)
       {
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
similarity index 71%
rename from artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq
rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
index c72af5b41b..7b6dfcd0a6 100755
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-if [ -z "$ACTIVEMQ_INSTANCE" ] ; then
+if [ -z "$ARTEMIS_INSTANCE" ] ; then
 
   ## resolve links - $0 may be a link to ActiveMQ's home
   PRG="$0"
@@ -37,23 +37,23 @@ if [ -z "$ACTIVEMQ_INSTANCE" ] ; then
     fi
   done
 
-  ACTIVEMQ_INSTANCE=`dirname "$PRG"`
+  ARTEMIS_INSTANCE=`dirname "$PRG"`
   cd "$saveddir"
 
   # make it fully qualified
-  ACTIVEMQ_INSTANCE=`cd "$ACTIVEMQ_INSTANCE/.." && pwd`
+  ARTEMIS_INSTANCE=`cd "$ARTEMIS_INSTANCE/.." && pwd`
 fi
 
 # Set Defaults Properties
-ACTIVEMQ_LOGGING_CONF="file:$ACTIVEMQ_INSTANCE/etc/logging.properties"
-ACTIVEMQ_DATA_DIR="$ACTIVEMQ_INSTANCE/data"
-ACTIVEMQ_LOG_MANAGER=org.jboss.logmanager.LogManager
+ARTEMIS_LOGGING_CONF="file:$ARTEMIS_INSTANCE/etc/logging.properties"
+ARTEMIS_DATA_DIR="$ARTEMIS_INSTANCE/data"
+ARTEMIS_LOG_MANAGER=org.jboss.logmanager.LogManager
 JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M"
 
 # Load Profile Data
-. "$ACTIVEMQ_INSTANCE/etc/activemq.profile"
+. "$ARTEMIS_INSTANCE/etc/artemis.profile"
 
-CLASSPATH="$ACTIVEMQ_HOME/lib/artemis-boot.jar"
+CLASSPATH="$ARTEMIS_HOME/lib/artemis-boot.jar"
 
 # OS specific support.
 cygwin=false;
@@ -72,8 +72,8 @@ esac
 
 # For Cygwin, ensure paths are in UNIX format before anything is touched
 if $cygwin ; then
-  [ -n "$ACTIVEMQ_INSTANCE" ] &&
-    ACTIVEMQ_INSTANCE=`cygpath --unix "$ACTIVEMQ_INSTANCE"`
+  [ -n "$ARTEMIS_INSTANCE" ] &&
+    ARTEMIS_INSTANCE=`cygpath --unix "$ARTEMIS_INSTANCE"`
   [ -n "$JAVA_HOME" ] &&
     JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
 fi
@@ -102,18 +102,18 @@ fi
 
 if $cygwin ; then
   JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
-  ACTIVEMQ_HOME=`cygpath --windows "$ACTIVEMQ_HOME"`
+  ARTEMIS_HOME=`cygpath --windows "$ARTEMIS_HOME"`
   CLASSPATH=`cygpath --windows "$CLASSPATH"`
 fi
 
-exec "$JAVACMD" $JAVA_ARGS $ACTIVEMQ_CLUSTER_PROPS \
+exec "$JAVACMD" $JAVA_ARGS $ARTEMIS_CLUSTER_PROPS \
     -classpath "$CLASSPATH" \
-    -Dactivemq.home="$ACTIVEMQ_HOME" \
-    -Dactivemq.instance="$ACTIVEMQ_INSTANCE" \
-    -Djava.library.path="$ACTIVEMQ_HOME/bin/lib/linux-i686:$ACTIVEMQ_INSTANCE/bin/lib/linux-x86_64" \
-    -Djava.io.tmpdir="$ACTIVEMQ_INSTANCE/tmp" \
-    -Ddata.dir="$ACTIVEMQ_DATA_DIR" \
-    -Djava.util.logging.manager="$ACTIVEMQ_LOG_MANAGER" \
-    -Dlogging.configuration="$ACTIVEMQ_LOGGING_CONF" \
+    -Dartemis.home="$ARTEMIS_HOME" \
+    -Dartemis.instance="$ARTEMIS_INSTANCE" \
+    -Djava.library.path="$ARTEMIS_HOME/bin/lib/linux-i686:$ARTEMIS_INSTANCE/bin/lib/linux-x86_64" \
+    -Djava.io.tmpdir="$ARTEMIS_INSTANCE/tmp" \
+    -Ddata.dir="$ARTEMIS_DATA_DIR" \
+    -Djava.util.logging.manager="$ARTEMIS_LOG_MANAGER" \
+    -Dlogging.configuration="$ARTEMIS_LOGGING_CONF" \
     $DEBUG_ARGS \
-    org.apache.activemq.artemis.boot.ActiveMQ $@
+    org.apache.activemq.artemis.boot.Artemis $@
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
similarity index 86%
rename from artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service
rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
index 84235c95c0..7a53901ae8 100755
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
@@ -19,9 +19,9 @@
 service=`basename "$0"`
 
 #
-# Discover the ACTIVEMQ_INSTANCE from the location of this script.
+# Discover the ARTEMIS_INSTANCE from the location of this script.
 #
-if [ -z "$ACTIVEMQ_INSTANCE" ] ; then
+if [ -z "$ARTEMIS_INSTANCE" ] ; then
 
   ## resolve links - $0 may be a link to ActiveMQ's home
   PRG="$0"
@@ -41,19 +41,19 @@ if [ -z "$ACTIVEMQ_INSTANCE" ] ; then
     fi
   done
 
-  ACTIVEMQ_INSTANCE=`dirname "$PRG"`
+  ARTEMIS_INSTANCE=`dirname "$PRG"`
   cd "$saveddir"
 
   # make it fully qualified
-  ACTIVEMQ_INSTANCE=`cd "$ACTIVEMQ_INSTANCE/.." && pwd`
-  export ACTIVEMQ_INSTANCE
+  ARTEMIS_INSTANCE=`cd "$ARTEMIS_INSTANCE/.." && pwd`
+  export ARTEMIS_INSTANCE
 
 fi
 
-PID_FILE="${ACTIVEMQ_INSTANCE}/data/activemq.pid"
+PID_FILE="${ARTEMIS_INSTANCE}/data/artemis.pid"
 
-if [ ! -d "${ACTIVEMQ_INSTANCE}/data/" ]; then
-    mkdir "${ACTIVEMQ_INSTANCE}/data/"
+if [ ! -d "${ARTEMIS_INSTANCE}/data/" ]; then
+    mkdir "${ARTEMIS_INSTANCE}/data/"
 fi
 
 status() {
@@ -95,7 +95,7 @@ start() {
     return 1
   fi
 
-  nohup ${ACTIVEMQ_INSTANCE}/bin/activemq run > /dev/null 2> /dev/null &
+  nohup ${ARTEMIS_INSTANCE}/bin/artemis run > /dev/null 2> /dev/null &
 
   echo $! > "${PID_FILE}"
 
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
similarity index 68%
rename from artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml
rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
index 12dc6ce44b..a39d16f943 100644
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
@@ -18,11 +18,11 @@
 -->
 
 <service>
-   <id>activemq-${host}</id>
-   <name>ActiveMQ: ${host}</name>
+   <id>armetis-${host}</id>
+   <name>ActiveMQ Artemis: ${host}</name>
    <description>Apache ActiveMQ Artemis is a reliable messaging broker</description>
 
-   <logpath>${activemq.instance}\log</logpath>
+   <logpath>${artemis.instance}\log</logpath>
    <logmode>roll</logmode>
 
    <executable>"${java.home}\bin\java.exe"</executable>
@@ -33,26 +33,26 @@
    <argument>-Xmx1024M</argument>
 
    <!-- Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml
-   <argument>-Dactivemq.remoting.default.port=61617</argument>
-   <argument>-Dactivemq.remoting.amqp.port=5673</argument>
-   <argument>-Dactivemq.remoting.stomp.port=61614</argument>
-   <argument>-Dactivemq.remoting.hornetq.port=5446</argument>
+   <argument>-Dartemis.remoting.default.port=61617</argument>
+   <argument>-Dartemis.remoting.amqp.port=5673</argument>
+   <argument>-Dartemis.remoting.stomp.port=61614</argument>
+   <argument>-Dartemis.remoting.hornetq.port=5446</argument>
    -->
 
    <argument>-classpath</argument>
-   <argument>"${activemq.home}\lib\artemis-boot.jar"</argument>
-   <argument>"-Dactivemq.home=${activemq.home}"</argument>
-   <argument>"-Dactivemq.instance=${activemq.instance}"</argument>
-   <argument>"-Ddata.dir=${activemq.instance}/data"</argument>
+   <argument>"${artemis.home}\lib\artemis-boot.jar"</argument>
+   <argument>"-artemis.home=${artemis.home}"</argument>
+   <argument>"-artemis.instance=${artemis.instance}"</argument>
+   <argument>"-Ddata.dir=${artemis.instance}/data"</argument>
    <argument>-Djava.util.logging.manager=org.jboss.logmanager.LogManager</argument>
-   <argument>"-Dlogging.configuration=file:${activemq.instance}\etc\logging.properties"</argument>
+   <argument>"-Dlogging.configuration=file:${artemis.instance}\etc\logging.properties"</argument>
 
 
    <!-- Debug args: Uncomment to enable debug
    <argument>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005</argument>
    -->
 
-   <argument>ActiveMQ</argument>
+   <argument>Armetis</argument>
 
    <argument>run</argument>
 
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq.cmd b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
similarity index 58%
rename from artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq.cmd
rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
index fd56f09ae4..5e8f5000cc 100755
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq.cmd
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
@@ -18,17 +18,17 @@ rem under the License.
 
 setlocal
 
-if NOT "%ACTIVEMQ_INSTANCE%"=="" goto CHECK_ACTIVEMQ_INSTANCE
+if NOT "%ARTEMIS_INSTANCE%"=="" goto CHECK_ARTEMIS_INSTANCE
 PUSHD .
 CD %~dp0..
-set ACTIVEMQ_INSTANCE=%CD%
+set ARTEMIS_INSTANCE=%CD%
 POPD
 
-:CHECK_ACTIVEMQ_INSTANCE
-if exist "%ACTIVEMQ_INSTANCE%\bin\activemq.cmd" goto CHECK_JAVA
+:CHECK_ARTEMIS_INSTANCE
+if exist "%ARTEMIS_INSTANCE%\bin\activemq.cmd" goto CHECK_JAVA
 
 :NO_HOME
-echo ACTIVEMQ_INSTANCE environment variable is set incorrectly. Please set ACTIVEMQ_INSTANCE.
+echo ARTEMIS_INSTANCE environment variable is set incorrectly. Please set ARTEMIS_INSTANCE.
 goto END
 
 :CHECK_JAVA
@@ -49,25 +49,25 @@ echo.
 
 rem "Set Defaults."
 set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M
-set ACTIVEMQ_LOGGING_CONF=file:%ACTIVEMQ_INSTANCE%\etc\logging.properties
-set ACTIVEMQ_DATA_DIR=%ACTIVEMQ_INSTANCE%\data
-set ACTIVEMQ_LOG_MANAGER=org.jboss.logmanager.LogManager
+set ARTEMIS_LOGGING_CONF=file:%ARTEMIS_INSTANCE%\etc\logging.properties
+set ARTEMIS_DATA_DIR=%ARTEMIS_INSTANCE%\data
+set ARTEMIS_LOG_MANAGER=org.jboss.logmanager.LogManager
 
 rem "Load Profile Config"
-call "%ACTIVEMQ_INSTANCE%\etc\activemq.profile.cmd" %*
+call "%ARTEMIS_INSTANCE%\etc\artemis.profile.cmd" %*
 
 rem "Create full JVM Args"
 set JVM_ARGS=%JAVA_ARGS%
-if not "%ACTIVEMQ_CLUSTER_PROPS%"=="" set JVM_ARGS=%JVM_ARGS% %ACTIVEMQ_CLUSTER_PROPS%
-set JVM_ARGS=%JVM_ARGS% -classpath "%ACTIVEMQ_HOME%\lib\artemis-boot.jar"
-set JVM_ARGS=%JVM_ARGS% -Dactivemq.home="%ACTIVEMQ_HOME%"
-set JVM_ARGS=%JVM_ARGS% -Dactivemq.instance="%ACTIVEMQ_INSTANCE%"
-set JVM_ARGS=%JVM_ARGS% -Ddata.dir="%ACTIVEMQ_DATA_DIR%"
-set JVM_ARGS=%JVM_ARGS% -Djava.util.logging.manager="%ACTIVEMQ_LOG_MANAGER%"
-set JVM_ARGS=%JVM_ARGS% -Dlogging.configuration="%ACTIVEMQ_LOGGING_CONF%"
+if not "%ARTEMIS_CLUSTER_PROPS%"=="" set JVM_ARGS=%JVM_ARGS% %ARTEMIS_CLUSTER_PROPS%
+set JVM_ARGS=%JVM_ARGS% -classpath "%ARTEMIS_HOME%\lib\artemis-boot.jar"
+set JVM_ARGS=%JVM_ARGS% -Dartemis.home="%ARTEMIS_HOME%"
+set JVM_ARGS=%JVM_ARGS% -Dartemis.instance="%ARTEMIS_INSTANCE%"
+set JVM_ARGS=%JVM_ARGS% -Ddata.dir="%ARTEMIS_DATA_DIR%"
+set JVM_ARGS=%JVM_ARGS% -Djava.util.logging.manager="%ARTEMIS_LOG_MANAGER%"
+set JVM_ARGS=%JVM_ARGS% -Dlogging.configuration="%ARTEMIS_LOGGING_CONF%"
 if not "%DEBUG_ARGS%"=="" set JVM_ARGS=%JVM_ARGS% %DEBUG_ARGS%
 
-"%_JAVACMD%" %JVM_ARGS% org.apache.activemq.artemis.boot.ActiveMQ %*
+"%_JAVACMD%" %JVM_ARGS% org.apache.activemq.artemis.boot.Artemis %*
 
 :END
 endlocal
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
similarity index 84%
rename from artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile
rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
index 755fec1055..889a0a9eec 100644
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
@@ -15,10 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-ACTIVEMQ_HOME='${activemq.home}'
+ARTEMIS_HOME='${artemis.home}'
 
 # Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml
-#ACTIVEMQ_CLUSTER_PROPS="-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446"
+#ARTEMIS_CLUSTER_PROPS="-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446"
 
 # Java Opts
 #JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M"
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile.cmd b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
similarity index 84%
rename from artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile.cmd
rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
index 3c2856493d..450ba792dc 100644
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile.cmd
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
@@ -15,10 +15,10 @@ rem KIND, either express or implied.  See the License for the
 rem specific language governing permissions and limitations
 rem under the License.
 
-set ACTIVEMQ_HOME=${activemq.home}
+set ARTEMIS_HOME=${artemis.home}
 
 rem Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml
-rem set ACTIVEMQ_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446
+rem set ARTEMIS_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446
 
 rem Java Opts
 rem set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml
index 530db62c3a..14924250de 100644
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml
@@ -19,12 +19,12 @@
 <broker xmlns="http://activemq.org/schema">
 
    <basic-security
-           users="file:${activemq.instance}/etc/activemq-users.properties"
-           roles="file:${activemq.instance}/etc/activemq-roles.properties"
+           users="file:${artemis.instance}/etc/activemq-users.properties"
+           roles="file:${artemis.instance}/etc/activemq-roles.properties"
            default-user="guest"
            />
 
-   <server configuration="file:${activemq.instance}/etc/broker.xml"/>
+   <server configuration="file:${artemis.instance}/etc/broker.xml"/>
 
    <web bind="http://localhost:8161" path="web">
        <app url="jolokia" war="jolokia-war-1.2.3.war"/>
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
index f4f4a814d7..084b74c2ad 100644
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
@@ -42,7 +42,7 @@ handler.FILE=org.jboss.logmanager.handlers.FileHandler
 handler.FILE.level=DEBUG
 handler.FILE.properties=autoFlush,fileName
 handler.FILE.autoFlush=true
-handler.FILE.fileName=${activemq.instance}/log/activemq.log
+handler.FILE.fileName=${artemis.instance}/log/activemq.log
 handler.FILE.formatter=PATTERN
 
 # Formatter pattern configuration
diff --git a/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/xa/ActiveMQXAResourceWrapperImplTest.java b/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/xa/ActiveMQXAResourceWrapperImplTest.java
index 32cd969249..7b2f7e8d47 100644
--- a/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/xa/ActiveMQXAResourceWrapperImplTest.java
+++ b/artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/xa/ActiveMQXAResourceWrapperImplTest.java
@@ -40,7 +40,7 @@ public class ActiveMQXAResourceWrapperImplTest
       xaResourceWrapperProperties.put(ActiveMQXAResourceWrapper.ACTIVEMQ_JNDI_NAME, jndiName);
       xaResourceWrapperProperties.put(ActiveMQXAResourceWrapper.ACTIVEMQ_NODE_ID, nodeId);
       xaResourceWrapperProperties.put(ActiveMQXAResourceWrapper.ACTIVEMQ_PRODUCT_VERSION, "6");
-      xaResourceWrapperProperties.put(ActiveMQXAResourceWrapper.ACTIVEMQ_PRODUCT_NAME, "ActiveMQ");
+      xaResourceWrapperProperties.put(ActiveMQXAResourceWrapper.ACTIVEMQ_PRODUCT_NAME, "ActiveMQ Artemis");
       ActiveMQXAResourceWrapperImpl xaResourceWrapper = new ActiveMQXAResourceWrapperImpl(xaResource, xaResourceWrapperProperties);
 
       String expectedJndiNodeId = jndiName + " NodeId:" + nodeId;
diff --git a/artemis-website/src/main/resources/examples/index.html b/artemis-website/src/main/resources/examples/index.html
index 2c2a7469fd..f9875a35de 100644
--- a/artemis-website/src/main/resources/examples/index.html
+++ b/artemis-website/src/main/resources/examples/index.html
@@ -60,7 +60,7 @@
         to run a different example simply edit the <code>config/examples/bootstrap.xml</code> aand change the paths to point
         the correct configuration (this will be found in the directory of the example you wish to run). By default the broker
         will use the <code>data/server0</code> directory for the journal, to avoid problems it is best to delete this
-        directory between running different examples or set the <code>ACTIVEMQ_DATA_DIR</code> environment property in
+        directory between running different examples or set the <code>ARTEMIS_DATA_DIR</code> environment property in
         <code>activemq.conf</code>to use a different location</p>
 
             <div></div>
diff --git a/distribution/artemis/src/main/resources/bin/activemq b/distribution/artemis/src/main/resources/bin/artemis
similarity index 82%
rename from distribution/artemis/src/main/resources/bin/activemq
rename to distribution/artemis/src/main/resources/bin/artemis
index ab76baca67..f31e35163a 100755
--- a/distribution/artemis/src/main/resources/bin/activemq
+++ b/distribution/artemis/src/main/resources/bin/artemis
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-if [ -z "$ACTIVEMQ_HOME" ] ; then
+if [ -z "$ARTEMIS_HOME" ] ; then
 
   ## resolve links - $0 may be a link to ActiveMQ's home
   PRG="$0"
@@ -37,16 +37,16 @@ if [ -z "$ACTIVEMQ_HOME" ] ; then
     fi
   done
 
-  ACTIVEMQ_HOME=`dirname "$PRG"`
+  ARTEMIS_HOME=`dirname "$PRG"`
   cd "$saveddir"
 
   # make it fully qualified
-  ACTIVEMQ_HOME=`cd "$ACTIVEMQ_HOME/.." && pwd`
+  ARTEMIS_HOME=`cd "$ARTEMIS_HOME/.." && pwd`
 fi
 
 # Set Defaults Properties
 JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M"
-CLASSPATH="$ACTIVEMQ_HOME/lib/artemis-boot.jar"
+CLASSPATH="$ARTEMIS_HOME/lib/artemis-boot.jar"
 
 # OS specific support.
 cygwin=false;
@@ -65,8 +65,8 @@ esac
 
 # For Cygwin, ensure paths are in UNIX format before anything is touched
 if $cygwin ; then
-  [ -n "$ACTIVEMQ_HOME" ] &&
-    ACTIVEMQ_HOME=`cygpath --unix "$ACTIVEMQ_HOME"`
+  [ -n "$ARTEMIS_HOME" ] &&
+    ARTEMIS_HOME=`cygpath --unix "$ARTEMIS_HOME"`
   [ -n "$JAVA_HOME" ] &&
     JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
 fi
@@ -96,13 +96,13 @@ fi
 
 if $cygwin ; then
   JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
-  ACTIVEMQ_HOME=`cygpath --windows "$ACTIVEMQ_HOME"`
+  ARTEMIS_HOME=`cygpath --windows "$ARTEMIS_HOME"`
   CLASSPATH=`cygpath --windows "$CLASSPATH"`
 fi
 
-exec "$JAVACMD" $JAVA_ARGS $ACTIVEMQ_CLUSTER_PROPS \
+exec "$JAVACMD" $JAVA_ARGS $ARTEMIS_CLUSTER_PROPS \
     -classpath "$CLASSPATH" \
-    -Dactivemq.home="$ACTIVEMQ_HOME" \
-    -Djava.library.path="$ACTIVEMQ_HOME/bin/lib/linux-i686:$ACTIVEMQ_INSTANCE/bin/lib/linux-x86_64" \
+    -Dartemis.home="$ARTEMIS_HOME" \
+    -Djava.library.path="$ARTEMIS_HOME/bin/lib/linux-i686:$ARTEMIS_INSTANCE/bin/lib/linux-x86_64" \
     $DEBUG_ARGS \
-    org.apache.activemq.artemis.boot.ActiveMQ $@
+    org.apache.activemq.artemis.boot.Artemis $@
diff --git a/distribution/artemis/src/main/resources/bin/activemq.cmd b/distribution/artemis/src/main/resources/bin/artemis.cmd
similarity index 73%
rename from distribution/artemis/src/main/resources/bin/activemq.cmd
rename to distribution/artemis/src/main/resources/bin/artemis.cmd
index 344c9df4a9..4132fb630a 100755
--- a/distribution/artemis/src/main/resources/bin/activemq.cmd
+++ b/distribution/artemis/src/main/resources/bin/artemis.cmd
@@ -18,17 +18,17 @@ rem under the License.
 
 setlocal
 
-if NOT "%ACTIVEMQ_HOME%"=="" goto CHECK_ACTIVEMQ_HOME
+if NOT "%ARTEMIS_HOME%"=="" goto CHECK_ARTEMIS_HOME
 PUSHD .
 CD %~dp0..
-set ACTIVEMQ_HOME=%CD%
+set ARTEMIS_HOME=%CD%
 POPD
 
-:CHECK_ACTIVEMQ_HOME
-if exist "%ACTIVEMQ_HOME%\bin\activemq.cmd" goto CHECK_JAVA
+:CHECK_ARTEMIS_HOME
+if exist "%ARTEMIS_HOME%\bin\artemis.cmd" goto CHECK_JAVA
 
 :NO_HOME
-echo ACTIVEMQ_HOME environment variable is set incorrectly. Please set ACTIVEMQ_HOME.
+echo ARTEMIS_HOME environment variable is set incorrectly. Please set ARTEMIS_HOME.
 goto END
 
 :CHECK_JAVA
@@ -52,12 +52,12 @@ set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods
 
 rem "Create full JVM Args"
 set JVM_ARGS=%JAVA_ARGS%
-if not "%ACTIVEMQ_CLUSTER_PROPS%"=="" set JVM_ARGS=%JVM_ARGS% %ACTIVEMQ_CLUSTER_PROPS%
-set JVM_ARGS=%JVM_ARGS% -classpath "%ACTIVEMQ_HOME%\lib\artemis-boot.jar"
-set JVM_ARGS=%JVM_ARGS% -Dactivemq.home="%ACTIVEMQ_HOME%"
+if not "%ARTEMIS_CLUSTER_PROPS%"=="" set JVM_ARGS=%JVM_ARGS% %ARTEMIS_CLUSTER_PROPS%
+set JVM_ARGS=%JVM_ARGS% -classpath "%ARTEMIS_HOME%\lib\artemis-boot.jar"
+set JVM_ARGS=%JVM_ARGS% -Dartemis.home="%ARTEMIS_HOME%"
 if not "%DEBUG_ARGS%"=="" set JVM_ARGS=%JVM_ARGS% %DEBUG_ARGS%
 
-"%_JAVACMD%" %JVM_ARGS% org.apache.activemq.artemis.boot.ActiveMQ %*
+"%_JAVACMD%" %JVM_ARGS% org.apache.activemq.artemis.boot.Artemis %*
 
 :END
 endlocal
diff --git a/docs/quickstart-guide/en/running.md b/docs/quickstart-guide/en/running.md
index 0a9a0d9bdd..5bd483af6b 100644
--- a/docs/quickstart-guide/en/running.md
+++ b/docs/quickstart-guide/en/running.md
@@ -4,7 +4,7 @@ Creating a Broker Instance
 
 A broker instance is the directory containing all the configuration and runtime
 data, such as logs and data files, associated with a broker process.  It is recommended that
-you do *not* create the instance directory under `${ACTIVEMQ_HOME}`.  This separation is
+you do *not* create the instance directory under `${ARTEMIS_HOME}`.  This separation is
 encouraged so that you can more easily upgrade when the next version of ActiveMQ is released.
 
 On Unix systems, it is a common convention to store this kind of runtime data under 
@@ -12,7 +12,7 @@ the `/var/lib` directory.  For example, to create an instance at '/var/lib/mybro
 the following commands in your command line shell:
 
     cd /var/lib
-    ${ACTIVEMQ_HOME}/bin/activemq create mybroker
+    ${ARTEMIS_HOME}/bin/activemq create mybroker
 
 A broker instance directory will contain the following sub directories:
 
diff --git a/docs/user-manual/en/using-server.md b/docs/user-manual/en/using-server.md
index 9f7a37bca3..cbae852546 100644
--- a/docs/user-manual/en/using-server.md
+++ b/docs/user-manual/en/using-server.md
@@ -10,13 +10,13 @@ we mean the Apache ActiveMQ Artemis standalone server, in its default configurat
 with a JMS Service enabled.
 
 This document will refer to the full path of the directory where the ActiveMQ
-distribution has been extracted to as `${ACTIVEMQ_HOME}` directory.
+distribution has been extracted to as `${ARTEMIS_HOME}` directory.
 
 ## Creating a Broker Instance
 
 A broker instance is the directory containing all the configuration and runtime
 data, such as logs and data files, associated with a broker process.  It is recommended that
-you do *not* create the instance directory under `${ACTIVEMQ_HOME}`.  This separation is
+you do *not* create the instance directory under `${ARTEMIS_HOME}`.  This separation is
 encouraged so that you can more easily upgrade when the next version of ActiveMQ is released.
 
 On Unix systems, it is a common convention to store this kind of runtime data under 
@@ -24,7 +24,7 @@ the `/var/lib` directory.  For example, to create an instance at '/var/lib/mybro
 the following commands in your command line shell:
 
     cd /var/lib
-    ${ACTIVEMQ_HOME}/bin/activemq create mybroker
+    ${ARTEMIS_HOME}/bin/activemq create mybroker
 
 A broker instance directory will contain the following sub directories:
 

From e60d2ae2ae00e20384409f26378611f14fb6e1ab Mon Sep 17 00:00:00 2001
From: Andy Taylor <andytaylor@apache.org>
Date: Wed, 29 Apr 2015 16:07:52 +0100
Subject: [PATCH 4/4] rename users and roles properties files

---
 .../apache/activemq/artemis/cli/commands/Create.java |  4 ++--
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 .../activemq/artemis/cli/commands/etc/bootstrap.xml  |  4 ++--
 .../activemq/artemis/server/ActiveMQBootstrap.java   |  4 ++--
 .../activemq/artemis/rest/test/EmbeddedTest.java     |  4 ++--
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 docs/user-manual/en/configuration-index.md           |  2 +-
 docs/user-manual/en/security.md                      | 12 ++++++------
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 ...emq-roles.properties => artemis-roles.properties} |  0
 ...emq-users.properties => artemis-users.properties} |  0
 276 files changed, 15 insertions(+), 15 deletions(-)
 rename artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/{activemq-users.properties => artemis-users.properties} (100%)
 rename artemis-rest/src/test/resources/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename artemis-rest/src/test/resources/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/core/vertx-connector/src/main/resources/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/core/vertx-connector/src/main/resources/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/aerogear/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/aerogear/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/application-layer-failover/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/application-layer-failover/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/application-layer-failover/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/application-layer-failover/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/bridge/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/bridge/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/bridge/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/bridge/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/browser/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/browser/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/client-kickoff/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/client-kickoff/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-grouping/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-grouping/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-grouping/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-grouping/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-grouping/src/main/resources/activemq/server2/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-grouping/src/main/resources/activemq/server2/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-jgroups/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-jgroups/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-jgroups/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-jgroups/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-queue/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-queue/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-queue/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-queue/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-standalone/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-standalone/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-standalone/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-standalone/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-standalone/src/main/resources/activemq/server2/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-standalone/src/main/resources/activemq/server2/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-topic/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-topic/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/clustered-topic/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/clustered-topic/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/colocated-failover/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/colocated-failover/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/colocated-failover/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/colocated-failover/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/dead-letter/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/dead-letter/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/delayed-redelivery/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/delayed-redelivery/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/divert/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/divert/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/divert/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/divert/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/durable-subscription/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/durable-subscription/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/expiry/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/expiry/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/http-transport/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/http-transport/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/interceptor/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/interceptor/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/jms-bridge/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/jms-bridge/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/jms-bridge/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/jms-bridge/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/jms-completion-listener/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/jms-completion-listener/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/jms-context/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/jms-context/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/jmx/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/jmx/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/large-message/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/large-message/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/last-value-queue/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/last-value-queue/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/management-notifications/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/management-notifications/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/management/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/management/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/message-counters/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/message-counters/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/message-group/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/message-group/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/message-group2/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/message-group2/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/message-priority/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/message-priority/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/multiple-failover/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/multiple-failover/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/multiple-failover/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/multiple-failover/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/multiple-failover/src/main/resources/activemq/server2/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/multiple-failover/src/main/resources/activemq/server2/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/non-transaction-failover/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/non-transaction-failover/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/non-transaction-failover/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/non-transaction-failover/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/openwire/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/openwire/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/paging/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/paging/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/pre-acknowledge/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/pre-acknowledge/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/producer-rate-limit/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/producer-rate-limit/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/proton-cpp/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/proton-cpp/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/proton-j/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/proton-j/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/proton-ruby/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/proton-ruby/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/queue-requestor/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/queue-requestor/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/queue-selector/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/queue-selector/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/queue/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/queue/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/reattach-node/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/reattach-node/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/replicated-failback-static/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/replicated-failback-static/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/replicated-failback-static/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/replicated-failback-static/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/replicated-failback/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/replicated-failback/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/replicated-failback/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/replicated-failback/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/request-reply/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/request-reply/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/rest/dup-send/src/main/resources/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/rest/dup-send/src/main/resources/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/rest/javascript-chat/src/main/resources/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/rest/javascript-chat/src/main/resources/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/rest/jms-to-rest/src/main/resources/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/rest/jms-to-rest/src/main/resources/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/rest/push/src/main/resources/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/rest/push/src/main/resources/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/scale-down/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/scale-down/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/scale-down/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/scale-down/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/scheduled-message/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/scheduled-message/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/security/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/security/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/send-acknowledgements/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/send-acknowledgements/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/spring-integration/src/main/resources/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/spring-integration/src/main/resources/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/ssl-enabled/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/ssl-enabled/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/static-selector-jms/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/static-selector-jms/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/static-selector/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/static-selector/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/stomp-websockets/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/stomp-websockets/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/stomp/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/stomp/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/stomp1.1/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/stomp1.1/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/stomp1.2/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/stomp1.2/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/stop-server-failover/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/stop-server-failover/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/stop-server-failover/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/stop-server-failover/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/symmetric-cluster/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/symmetric-cluster/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/symmetric-cluster/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/symmetric-cluster/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/symmetric-cluster/src/main/resources/activemq/server2/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/symmetric-cluster/src/main/resources/activemq/server2/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/symmetric-cluster/src/main/resources/activemq/server3/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/symmetric-cluster/src/main/resources/activemq/server3/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/symmetric-cluster/src/main/resources/activemq/server4/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/symmetric-cluster/src/main/resources/activemq/server4/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/symmetric-cluster/src/main/resources/activemq/server5/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/symmetric-cluster/src/main/resources/activemq/server5/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/temp-queue/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/temp-queue/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/topic-hierarchies/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/topic-hierarchies/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/topic-selector-example1/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/topic-selector-example1/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/topic-selector-example2/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/topic-selector-example2/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/topic/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/topic/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/transaction-failover/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/transaction-failover/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/transaction-failover/src/main/resources/activemq/server1/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/transaction-failover/src/main/resources/activemq/server1/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/transactional/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/transactional/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/xa-heuristic/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/xa-heuristic/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/xa-receive/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/xa-receive/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)
 rename examples/jms/xa-send/src/main/resources/activemq/server0/{activemq-roles.properties => artemis-roles.properties} (100%)
 rename examples/jms/xa-send/src/main/resources/activemq/server0/{activemq-users.properties => artemis-users.properties} (100%)

diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index 8131668159..be1d03a615 100644
--- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -160,8 +160,8 @@ public class Create implements Action
       write("etc/logging.properties", null, false);
       write("etc/bootstrap.xml", null, false);
       write("etc/broker.xml", filters, false);
-      write("etc/activemq-roles.properties", null, false);
-      write("etc/activemq-users.properties", null, false);
+      write("etc/artemis-roles.properties", null, false);
+      write("etc/artemis-users.properties", null, false);
 
       context.out.println("");
       context.out.println("You can now start the broker by executing:  ");
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq-roles.properties b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis-roles.properties
similarity index 100%
rename from artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq-roles.properties
rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis-roles.properties
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq-users.properties b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis-users.properties
similarity index 100%
rename from artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq-users.properties
rename to artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis-users.properties
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml
index 14924250de..21d174f171 100644
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml
@@ -19,8 +19,8 @@
 <broker xmlns="http://activemq.org/schema">
 
    <basic-security
-           users="file:${artemis.instance}/etc/activemq-users.properties"
-           roles="file:${artemis.instance}/etc/activemq-roles.properties"
+           users="file:${artemis.instance}/etc/artemis-users.properties"
+           roles="file:${artemis.instance}/etc/artemis-roles.properties"
            default-user="guest"
            />
 
diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java
index c250966454..d83dd49441 100644
--- a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java
+++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java
@@ -102,8 +102,8 @@ public class ActiveMQBootstrap
             deploymentManager.addDeployable((FileConfiguration)configuration);
             deploymentManager.addDeployable((FileJMSConfiguration) jmsFileConfiguration);
 
-            securityConfiguration = new FileSecurityConfiguration(new File(configurationDir, "activemq-users.properties").toURI().toString(),
-                                                                  new File(configurationDir, "activemq-roles.properties").toURI().toString(),
+            securityConfiguration = new FileSecurityConfiguration(new File(configurationDir, "artemis-users.properties").toURI().toString(),
+                                                                  new File(configurationDir, "artemis-roles.properties").toURI().toString(),
                                                                   "guest",
                                                                   false,
                                                                   null);
diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/EmbeddedTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/EmbeddedTest.java
index 68bbdf5d5d..f1ba31953d 100644
--- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/EmbeddedTest.java
+++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/EmbeddedTest.java
@@ -50,8 +50,8 @@ public class EmbeddedTest
    {
       server = new EmbeddedRestActiveMQJMS();
       server.getManager().setConfigResourcePath("activemq-rest.xml");
-      FileSecurityConfiguration securityConfiguration = new FileSecurityConfiguration("activemq-users.properties",
-                                                                                      "activemq-roles.properties",
+      FileSecurityConfiguration securityConfiguration = new FileSecurityConfiguration("artemis-users.properties",
+                                                                                      "artemis-roles.properties",
                                                                                       "guest",
                                                                                       false,
                                                                                       null);
diff --git a/artemis-rest/src/test/resources/activemq-roles.properties b/artemis-rest/src/test/resources/artemis-roles.properties
similarity index 100%
rename from artemis-rest/src/test/resources/activemq-roles.properties
rename to artemis-rest/src/test/resources/artemis-roles.properties
diff --git a/artemis-rest/src/test/resources/activemq-users.properties b/artemis-rest/src/test/resources/artemis-users.properties
similarity index 100%
rename from artemis-rest/src/test/resources/activemq-users.properties
rename to artemis-rest/src/test/resources/artemis-users.properties
diff --git a/docs/user-manual/en/configuration-index.md b/docs/user-manual/en/configuration-index.md
index ae10908a41..ad674b5099 100644
--- a/docs/user-manual/en/configuration-index.md
+++ b/docs/user-manual/en/configuration-index.md
@@ -385,7 +385,7 @@ Bridges. Example:
 With this configuration, both passwords in ra.xml and all of its MDBs
 will have to be in masked form.
 
-### Masking passwords in activemq-users.properties
+### Masking passwords in artemis-users.properties
 
 Apache ActiveMQ Artemis's built-in security manager uses plain properties files
 where the user passwords are specified in plaintext forms by default. To
diff --git a/docs/user-manual/en/security.md b/docs/user-manual/en/security.md
index d7b4aba100..5a49342747 100644
--- a/docs/user-manual/en/security.md
+++ b/docs/user-manual/en/security.md
@@ -133,7 +133,7 @@ For more information on configuring the SSL transport, please see [Configuring t
 
 Apache ActiveMQ Artemis ships with a security manager implementation that reads user
 credentials, i.e. user names, passwords and role information from properties
-files on the classpath called `activemq-users.properties` and `activemq-roles.properties`. This is the default security manager.
+files on the classpath called `artemis-users.properties` and `artemis-roles.properties`. This is the default security manager.
 
 If you wish to use this security manager, then users, passwords and
 roles can easily be added into these files.
@@ -142,8 +142,8 @@ To configure this manager then it needs to be added to the `bootstrap.xml` confi
 Lets take a look at what this might look like:
 
     <basic-security>
-      <users>file:${activemq.home}/config/non-clustered/activemq-users.properties</users>
-      <roles>file:${activemq.home}/config/non-clustered/activemq-roles.properties</roles>
+      <users>file:${activemq.home}/config/non-clustered/artemis-users.properties</users>
+      <roles>file:${activemq.home}/config/non-clustered/artemis-roles.properties</roles>
       <default-user>guest</default-user>
     </basic-security>
 
@@ -153,9 +153,9 @@ The next thing to note is the element `defaultuser`. This defines what
 user will be assumed when the client does not specify a
 username/password when creating a session. In this case they will be the
 user `guest`. Multiple roles can be specified for a default user in the
-`activemq-roles.properties`.
+`artemis-roles.properties`.
 
-Lets now take alook at the `activemq-users.properties` file, this is basically
+Lets now take alook at the `artemis-users.properties` file, this is basically
 just a set of key value pairs that define the users and their password, like so:
 
     bill=activemq
@@ -163,7 +163,7 @@ just a set of key value pairs that define the users and their password, like so:
     frank=activemq2
     sam=activemq3
 
-The `activemq-roles.properties` defines what groups these users belong too
+The `artemis-roles.properties` defines what groups these users belong too
 where the key is the user and the value is a comma seperated list of the groups
 the user belongs to, like so:
 
diff --git a/examples/core/vertx-connector/src/main/resources/server0/activemq-roles.properties b/examples/core/vertx-connector/src/main/resources/server0/artemis-roles.properties
similarity index 100%
rename from examples/core/vertx-connector/src/main/resources/server0/activemq-roles.properties
rename to examples/core/vertx-connector/src/main/resources/server0/artemis-roles.properties
diff --git a/examples/core/vertx-connector/src/main/resources/server0/activemq-users.properties b/examples/core/vertx-connector/src/main/resources/server0/artemis-users.properties
similarity index 100%
rename from examples/core/vertx-connector/src/main/resources/server0/activemq-users.properties
rename to examples/core/vertx-connector/src/main/resources/server0/artemis-users.properties
diff --git a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/aerogear/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/aerogear/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/aerogear/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/aerogear/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/aerogear/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/aerogear/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/application-layer-failover/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/application-layer-failover/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/application-layer-failover/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/application-layer-failover/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/bridge/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/bridge/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/bridge/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/bridge/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/bridge/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/bridge/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/bridge/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/bridge/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/bridge/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/bridge/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/bridge/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/bridge/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/browser/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/browser/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/browser/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/browser/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/browser/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/browser/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/client-kickoff/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/client-kickoff/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/client-kickoff/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/client-kickoff/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/artemis-roles.properties
similarity index 100%
rename from examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-roles.properties
rename to examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/artemis-roles.properties
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/artemis-users.properties
similarity index 100%
rename from examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.properties
rename to examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/artemis-users.properties
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/clustered-grouping/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/clustered-grouping/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/clustered-grouping/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/clustered-grouping/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-roles.properties
rename to examples/jms/clustered-grouping/src/main/resources/activemq/server2/artemis-roles.properties
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-users.properties
rename to examples/jms/clustered-grouping/src/main/resources/activemq/server2/artemis-users.properties
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/clustered-jgroups/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/clustered-jgroups/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/clustered-jgroups/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/clustered-jgroups/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-queue/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/clustered-queue/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-queue/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/clustered-queue/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-queue/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/clustered-queue/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-queue/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/clustered-queue/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/clustered-standalone/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/clustered-standalone/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/clustered-standalone/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/clustered-standalone/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-roles.properties
rename to examples/jms/clustered-standalone/src/main/resources/activemq/server2/artemis-roles.properties
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.properties
rename to examples/jms/clustered-standalone/src/main/resources/activemq/server2/artemis-users.properties
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-roles.properties
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/artemis-roles.properties
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-users.properties
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/artemis-users.properties
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-roles.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-roles.properties
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/artemis-roles.properties
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-users.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-users.properties
rename to examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/artemis-users.properties
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-roles.properties
rename to examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/artemis-roles.properties
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-users.properties
rename to examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/artemis-users.properties
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-topic/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/clustered-topic/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-topic/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/clustered-topic/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-topic/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/clustered-topic/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-topic/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/clustered-topic/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/colocated-failover/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/colocated-failover/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/colocated-failover/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/colocated-failover/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/colocated-failover/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/colocated-failover/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/colocated-failover/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/colocated-failover/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/dead-letter/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/dead-letter/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/dead-letter/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/dead-letter/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/delayed-redelivery/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/delayed-redelivery/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/divert/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/divert/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/divert/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/divert/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/divert/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/divert/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/divert/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/divert/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/divert/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/divert/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/divert/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/divert/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/divert/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/divert/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/divert/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/divert/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/durable-subscription/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/durable-subscription/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/durable-subscription/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/durable-subscription/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/expiry/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/expiry/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/expiry/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/expiry/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/expiry/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/expiry/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/http-transport/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/http-transport/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/http-transport/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/http-transport/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/http-transport/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/http-transport/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/interceptor/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/interceptor/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/interceptor/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/interceptor/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/interceptor/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/interceptor/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/jms-bridge/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/jms-bridge/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/jms-bridge/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/jms-bridge/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/jms-bridge/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/jms-bridge/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/jms-bridge/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/jms-bridge/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/jms-completion-listener/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/jms-completion-listener/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/jms-context/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/jms-context/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/jms-context/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/jms-context/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/jms-context/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/jms-context/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/jmx/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/jmx/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/jmx/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/jmx/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/jmx/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/jmx/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/large-message/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/large-message/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/large-message/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/large-message/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/large-message/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/large-message/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/last-value-queue/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/last-value-queue/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/last-value-queue/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/last-value-queue/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/management-notifications/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/management-notifications/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/management-notifications/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/management-notifications/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/management/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/management/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/management/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/management/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/management/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/management/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/management/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/management/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/message-counters/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/message-counters/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/message-counters/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/message-counters/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/message-counters/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/message-counters/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/message-group/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/message-group/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/message-group/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/message-group/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/message-group/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/message-group/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/message-group2/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/message-group2/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/message-group2/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/message-group2/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/message-group2/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/message-group2/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/message-priority/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/message-priority/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/message-priority/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/message-priority/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/message-priority/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/message-priority/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/artemis-roles.properties
similarity index 100%
rename from examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-roles.properties
rename to examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/artemis-roles.properties
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/artemis-users.properties
similarity index 100%
rename from examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-users.properties
rename to examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/artemis-users.properties
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/multiple-failover/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/multiple-failover/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/multiple-failover/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/multiple-failover/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/multiple-failover/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/multiple-failover/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/multiple-failover/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/multiple-failover/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/multiple-failover/src/main/resources/activemq/server2/artemis-roles.properties
similarity index 100%
rename from examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-roles.properties
rename to examples/jms/multiple-failover/src/main/resources/activemq/server2/artemis-roles.properties
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/multiple-failover/src/main/resources/activemq/server2/artemis-users.properties
similarity index 100%
rename from examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-users.properties
rename to examples/jms/multiple-failover/src/main/resources/activemq/server2/artemis-users.properties
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/non-transaction-failover/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/non-transaction-failover/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/non-transaction-failover/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/non-transaction-failover/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/openwire/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/openwire/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/openwire/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/openwire/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/openwire/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/openwire/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/paging/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/paging/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/paging/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/paging/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/paging/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/paging/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/paging/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/paging/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/pre-acknowledge/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/pre-acknowledge/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/producer-rate-limit/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/producer-rate-limit/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/proton-cpp/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/proton-cpp/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/proton-cpp/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/proton-cpp/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/proton-j/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/proton-j/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/proton-j/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/proton-j/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/proton-j/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/proton-ruby/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/proton-ruby/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/proton-ruby/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/proton-ruby/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/queue-requestor/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/queue-requestor/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/queue-requestor/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/queue-requestor/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/queue-selector/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/queue-selector/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/queue-selector/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/queue-selector/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/queue/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/queue/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/queue/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/queue/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/queue/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/queue/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/queue/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/queue/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/reattach-node/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/reattach-node/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/reattach-node/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/reattach-node/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/replicated-failback-static/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/replicated-failback-static/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/replicated-failback-static/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/replicated-failback-static/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/replicated-failback/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/replicated-failback/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/replicated-failback/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/replicated-failback/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/replicated-failback/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/replicated-failback/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/replicated-failback/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/replicated-failback/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/artemis-roles.properties
similarity index 100%
rename from examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-roles.properties
rename to examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/artemis-roles.properties
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/artemis-users.properties
similarity index 100%
rename from examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-users.properties
rename to examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/artemis-users.properties
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/request-reply/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/request-reply/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/request-reply/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/request-reply/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/request-reply/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/request-reply/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-roles.properties b/examples/jms/rest/dup-send/src/main/resources/artemis-roles.properties
similarity index 100%
rename from examples/jms/rest/dup-send/src/main/resources/activemq-roles.properties
rename to examples/jms/rest/dup-send/src/main/resources/artemis-roles.properties
diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-users.properties b/examples/jms/rest/dup-send/src/main/resources/artemis-users.properties
similarity index 100%
rename from examples/jms/rest/dup-send/src/main/resources/activemq-users.properties
rename to examples/jms/rest/dup-send/src/main/resources/artemis-users.properties
diff --git a/examples/jms/rest/javascript-chat/src/main/resources/activemq-roles.properties b/examples/jms/rest/javascript-chat/src/main/resources/artemis-roles.properties
similarity index 100%
rename from examples/jms/rest/javascript-chat/src/main/resources/activemq-roles.properties
rename to examples/jms/rest/javascript-chat/src/main/resources/artemis-roles.properties
diff --git a/examples/jms/rest/javascript-chat/src/main/resources/activemq-users.properties b/examples/jms/rest/javascript-chat/src/main/resources/artemis-users.properties
similarity index 100%
rename from examples/jms/rest/javascript-chat/src/main/resources/activemq-users.properties
rename to examples/jms/rest/javascript-chat/src/main/resources/artemis-users.properties
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-roles.properties b/examples/jms/rest/jms-to-rest/src/main/resources/artemis-roles.properties
similarity index 100%
rename from examples/jms/rest/jms-to-rest/src/main/resources/activemq-roles.properties
rename to examples/jms/rest/jms-to-rest/src/main/resources/artemis-roles.properties
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-users.properties b/examples/jms/rest/jms-to-rest/src/main/resources/artemis-users.properties
similarity index 100%
rename from examples/jms/rest/jms-to-rest/src/main/resources/activemq-users.properties
rename to examples/jms/rest/jms-to-rest/src/main/resources/artemis-users.properties
diff --git a/examples/jms/rest/push/src/main/resources/activemq-roles.properties b/examples/jms/rest/push/src/main/resources/artemis-roles.properties
similarity index 100%
rename from examples/jms/rest/push/src/main/resources/activemq-roles.properties
rename to examples/jms/rest/push/src/main/resources/artemis-roles.properties
diff --git a/examples/jms/rest/push/src/main/resources/activemq-users.properties b/examples/jms/rest/push/src/main/resources/artemis-users.properties
similarity index 100%
rename from examples/jms/rest/push/src/main/resources/activemq-users.properties
rename to examples/jms/rest/push/src/main/resources/artemis-users.properties
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/scale-down/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/scale-down/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/scale-down/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/scale-down/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/scale-down/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/scale-down/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/scale-down/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/scale-down/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/scale-down/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/scale-down/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/scale-down/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/scale-down/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/scheduled-message/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/scheduled-message/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/scheduled-message/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/scheduled-message/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/security/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/security/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/security/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/security/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/security/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/security/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/security/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/security/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/send-acknowledgements/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/send-acknowledgements/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/spring-integration/src/main/resources/activemq-roles.properties b/examples/jms/spring-integration/src/main/resources/artemis-roles.properties
similarity index 100%
rename from examples/jms/spring-integration/src/main/resources/activemq-roles.properties
rename to examples/jms/spring-integration/src/main/resources/artemis-roles.properties
diff --git a/examples/jms/spring-integration/src/main/resources/activemq-users.properties b/examples/jms/spring-integration/src/main/resources/artemis-users.properties
similarity index 100%
rename from examples/jms/spring-integration/src/main/resources/activemq-users.properties
rename to examples/jms/spring-integration/src/main/resources/artemis-users.properties
diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/ssl-enabled/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/ssl-enabled/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/static-selector-jms/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/static-selector-jms/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/static-selector/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/static-selector/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/static-selector/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/static-selector/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/static-selector/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/static-selector/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/stomp-websockets/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/stomp-websockets/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/stomp/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/stomp/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/stomp/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/stomp/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/stomp/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/stomp/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/stomp1.1/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/stomp1.1/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/stomp1.1/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/stomp1.1/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/stomp1.2/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/stomp1.2/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/stomp1.2/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/stomp1.2/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/stop-server-failover/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/stop-server-failover/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/stop-server-failover/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/stop-server-failover/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/artemis-roles.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-roles.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server2/artemis-roles.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/artemis-users.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-users.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server2/artemis-users.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-roles.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/artemis-roles.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-roles.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server3/artemis-roles.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-users.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/artemis-users.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-users.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server3/artemis-users.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-roles.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/artemis-roles.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-roles.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server4/artemis-roles.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-users.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/artemis-users.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-users.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server4/artemis-users.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-roles.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/artemis-roles.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-roles.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server5/artemis-roles.properties
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-users.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/artemis-users.properties
similarity index 100%
rename from examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-users.properties
rename to examples/jms/symmetric-cluster/src/main/resources/activemq/server5/artemis-users.properties
diff --git a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/temp-queue/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/temp-queue/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/temp-queue/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/temp-queue/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/topic-hierarchies/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/topic-hierarchies/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/topic-selector-example1/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/topic-selector-example1/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/topic-selector-example2/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/topic-selector-example2/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/topic/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/topic/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/topic/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/topic/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/topic/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/topic/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/topic/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/topic/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/transaction-failover/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/transaction-failover/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/transaction-failover/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/transaction-failover/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/transaction-failover/src/main/resources/activemq/server1/artemis-roles.properties
similarity index 100%
rename from examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties
rename to examples/jms/transaction-failover/src/main/resources/activemq/server1/artemis-roles.properties
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/transaction-failover/src/main/resources/activemq/server1/artemis-users.properties
similarity index 100%
rename from examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-users.properties
rename to examples/jms/transaction-failover/src/main/resources/activemq/server1/artemis-users.properties
diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/transactional/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/transactional/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/transactional/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/transactional/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/transactional/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/transactional/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/xa-heuristic/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/xa-heuristic/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/xa-receive/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/xa-receive/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/xa-receive/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/xa-receive/src/main/resources/activemq/server0/artemis-users.properties
diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/xa-send/src/main/resources/activemq/server0/artemis-roles.properties
similarity index 100%
rename from examples/jms/xa-send/src/main/resources/activemq/server0/activemq-roles.properties
rename to examples/jms/xa-send/src/main/resources/activemq/server0/artemis-roles.properties
diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/xa-send/src/main/resources/activemq/server0/artemis-users.properties
similarity index 100%
rename from examples/jms/xa-send/src/main/resources/activemq/server0/activemq-users.properties
rename to examples/jms/xa-send/src/main/resources/activemq/server0/artemis-users.properties