This is an automated email from the ASF dual-hosted git repository.

robbie pushed a commit to branch development
in repository https://gitbox.apache.org/repos/asf/artemis-examples.git

commit 2c3f32ef6e65cdb45a0a3d3ed9821602e276195d
Author: Robbie Gemmell <[email protected]>
AuthorDate: Fri Dec 19 14:25:28 2025 +0000

    ARTEMIS-5807: update names in readme files
---
 artemis-distribution/README.md                                 |  6 +++---
 .../features/clustered/client-side-load-balancing/readme.md    |  6 +++---
 .../clustered/clustered-durable-subscription/readme.md         |  4 ++--
 examples/features/clustered/clustered-grouping/readme.md       |  2 +-
 examples/features/clustered/clustered-jgroups/readme.md        |  6 +++---
 examples/features/clustered/clustered-queue/readme.md          |  4 ++--
 .../clustered/clustered-static-discovery-uri/readme.md         |  4 ++--
 .../features/clustered/clustered-static-discovery/readme.md    |  4 ++--
 examples/features/clustered/clustered-static-oneway/readme.md  |  4 ++--
 examples/features/clustered/clustered-topic-uri/readme.md      |  2 +-
 examples/features/clustered/clustered-topic/readme.md          |  2 +-
 .../features/clustered/queue-message-redistribution/readme.md  |  6 +++---
 examples/features/clustered/symmetric-cluster/readme.md        |  8 ++++----
 .../features/federation/federated-address-divert/readme.md     |  2 +-
 .../federation/federated-address-downstream-upstream/readme.md |  4 ++--
 .../features/federation/federated-address-downstream/readme.md |  4 ++--
 examples/features/federation/federated-address/readme.md       |  4 ++--
 .../federation/federated-queue-downstream-upstream/readme.md   |  4 ++--
 .../features/federation/federated-queue-downstream/readme.md   |  4 ++--
 examples/features/federation/federated-queue/readme.md         |  4 ++--
 examples/features/ha/application-layer-failover/readme.md      |  8 ++++----
 examples/features/ha/non-transaction-failover/readme.md        |  2 +-
 examples/features/ha/replicated-failback-static/readme.md      |  2 +-
 examples/features/ha/replicated-failback/readme.md             |  2 +-
 examples/features/ha/replicated-multiple-failover/readme.md    |  2 +-
 examples/features/standard/browser/readme.md                   |  2 +-
 examples/features/standard/cdi/readme.md                       |  2 +-
 examples/features/standard/client-kickoff/readme.md            |  2 +-
 examples/features/standard/completion-listener/readme.md       |  2 +-
 examples/features/standard/consumer-rate-limit/readme.md       |  4 ++--
 examples/features/standard/context/readme.md                   |  2 +-
 examples/features/standard/core-bridge/readme.md               |  6 +++---
 examples/features/standard/database/readme.md                  |  2 +-
 examples/features/standard/dead-letter/readme.md               |  4 ++--
 examples/features/standard/delayed-redelivery/readme.md        |  2 +-
 examples/features/standard/divert/readme.md                    |  2 +-
 examples/features/standard/durable-subscription/readme.md      |  2 +-
 examples/features/standard/embedded-simple/readme.md           |  4 ++--
 examples/features/standard/embedded/readme.md                  |  4 ++--
 examples/features/standard/exclusive-queue/readme.md           |  2 +-
 examples/features/standard/expiry/readme.md                    |  4 ++--
 examples/features/standard/http-transport/readme.md            |  6 +++---
 examples/features/standard/interceptor-amqp/readme.md          |  4 ++--
 examples/features/standard/interceptor-client/readme.md        |  4 ++--
 examples/features/standard/interceptor-mqtt/readme.md          |  4 ++--
 examples/features/standard/interceptor/readme.md               |  4 ++--
 examples/features/standard/jms-bridge/readme.md                |  4 ++--
 examples/features/standard/jmx-ssl/readme.md                   |  8 ++++----
 examples/features/standard/jmx/readme.md                       |  2 +-
 examples/features/standard/large-message/readme.md             | 10 +++++-----
 examples/features/standard/management-notifications/readme.md  |  6 +++---
 examples/features/standard/management/readme.md                |  6 +++---
 examples/features/standard/message-counters/readme.md          |  4 ++--
 examples/features/standard/message-group/readme.md             |  2 +-
 examples/features/standard/message-group2/readme.md            |  2 +-
 examples/features/standard/netty-openssl/readme.md             |  4 ++--
 examples/features/standard/no-consumer-buffering/readme.md     |  8 ++++----
 examples/features/standard/paging/readme.md                    |  2 +-
 examples/features/standard/pre-acknowledge/readme.md           |  2 +-
 examples/features/standard/producer-rate-limit/readme.md       |  4 ++--
 examples/features/standard/queue-jakarta/readme.md             |  2 +-
 examples/features/standard/queue-requestor/readme.md           |  2 +-
 examples/features/standard/queue/readme.md                     |  2 +-
 examples/features/standard/reattach-node/readme.md             |  4 ++--
 examples/features/standard/scheduled-message/readme.md         |  2 +-
 examples/features/standard/security-ldap/readme.md             | 10 +++++-----
 examples/features/standard/security/readme.md                  | 10 +++++-----
 examples/features/standard/send-acknowledgements/readme.md     |  2 +-
 examples/features/standard/spring-boot-integration/readme.md   |  2 +-
 examples/features/standard/spring-integration/readme.md        |  4 ++--
 examples/features/standard/ssl-enabled-crl-mqtt/readme.md      |  4 ++--
 .../standard/ssl-enabled-dual-authentication/readme.md         |  2 +-
 examples/features/standard/ssl-enabled/readme.md               |  4 ++--
 examples/features/standard/static-selector/readme.md           |  2 +-
 examples/features/standard/temp-queue/readme.md                |  2 +-
 examples/features/standard/topic-hierarchies/readme.md         |  4 ++--
 examples/features/standard/topic/readme.md                     |  2 +-
 examples/features/standard/transactional/readme.md             |  2 +-
 examples/features/standard/xa-heuristic/readme.md              |  4 ++--
 examples/features/standard/xa-receive/readme.md                |  2 +-
 examples/features/standard/xa-send/readme.md                   |  4 ++--
 .../inter-broker-bridge/artemis-jms-bridge/readme.md           |  6 +++---
 examples/features/sub-modules/tomcat/readme.md                 |  6 +++---
 examples/perf/jmeter/readme.md                                 |  2 +-
 examples/protocols/amqp/proton-clustered-cpp/readme.md         |  6 +++---
 examples/protocols/amqp/proton-cpp/readme.md                   |  6 +++---
 examples/protocols/amqp/proton-ruby/readme.md                  |  4 ++--
 examples/protocols/amqp/sasl-scram/readme.md                   |  2 +-
 examples/protocols/mqtt/clustered-queue-mqtt/readme.md         |  2 +-
 examples/protocols/openwire/queue/readme.md                    |  2 +-
 examples/protocols/stomp/stomp-dual-authentication/readme.md   |  2 +-
 examples/protocols/stomp/stomp-embedded-interceptor/readme.md  |  2 +-
 examples/protocols/stomp/stomp-jms/readme.md                   |  2 +-
 examples/protocols/stomp/stomp-websockets/readme.md            |  6 +++---
 examples/protocols/stomp/stomp/readme.md                       |  2 +-
 examples/protocols/stomp/stomp1.1/readme.md                    |  2 +-
 examples/protocols/stomp/stomp1.2/readme.md                    |  2 +-
 97 files changed, 179 insertions(+), 179 deletions(-)

diff --git a/artemis-distribution/README.md b/artemis-distribution/README.md
index 3bbdf960..f9a3422a 100644
--- a/artemis-distribution/README.md
+++ b/artemis-distribution/README.md
@@ -1,6 +1,6 @@
-## ActiveMQ Artemis Distribution for Examples
+## Apache Artemis Distribution for Examples
 
-This is a helper module which prepares an extracted ActiveMQ Artemis 
distribution for use by the various example modules as they are run.
+This is a helper module which prepares an extracted Apache Artemis 
distribution for use by the various example modules as they are run.
 
 Use it by executing a command such as:
 
@@ -8,4 +8,4 @@ Use it by executing a command such as:
 mvn clean package
 ```
 
-This will result in Maven unpacking the ActiveMQ Artemis binary archive in 
directory `./target/apache-artemis-<version>-bin`, from where individual 
examples will then reference it when creating their broker instances as they 
are being run.
+This will result in Maven unpacking the Apache Artemis binary archive in 
directory `./target/apache-artemis-<version>-bin`, from where individual 
examples will then reference it when creating their broker instances as they 
are being run.
diff --git a/examples/features/clustered/client-side-load-balancing/readme.md 
b/examples/features/clustered/client-side-load-balancing/readme.md
index 756dbc4b..f8c1427d 100644
--- a/examples/features/clustered/client-side-load-balancing/readme.md
+++ b/examples/features/clustered/client-side-load-balancing/readme.md
@@ -4,14 +4,14 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to create and start the broker manually.
 
-This example demonstrates how connections created from a single JMS Connection 
factory can be created to different nodes of the cluster. In other words it 
demonstrates how ActiveMQ Artemis does **client side load balancing** of 
connections across the cluster.
+This example demonstrates how connections created from a single JMS Connection 
factory can be created to different nodes of the cluster. In other words it 
demonstrates how Apache Artemis does **client side load balancing** of 
connections across the cluster.
 
 The particular load-balancing policy can be chosen to be random, round-robin 
or user-defined. Please see the user guide for more details of how to configure 
the specific load-balancing policy. In this example we will use the default 
round-robin load balancing policy.
 
-The list of servers over which ActiveMQ Artemis will round-robin the 
connections can either be specified explicitly in the connection factory when 
instantiating it directly, when configuring it on the broker or configured 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.
+The list of servers over which Apache Artemis will round-robin the connections 
can either be specified explicitly in the connection factory when instantiating 
it directly, when configuring it on the broker or configured 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.
 
 This example starts three servers which all broadcast their location using UDP 
discovery. The UDP broadcast configuration can be seen in the `broker.xml` file.
 
 A JMS ConnectionFactory is deployed on each broker specifying the discovery 
group that will be used by that connection factory.
 
-For more information on ActiveMQ Artemis load balancing, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
+For more information on Apache Artemis load balancing, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
diff --git 
a/examples/features/clustered/clustered-durable-subscription/readme.md 
b/examples/features/clustered/clustered-durable-subscription/readme.md
index 29ddc14a..4404cdd2 100644
--- a/examples/features/clustered/clustered-durable-subscription/readme.md
+++ b/examples/features/clustered/clustered-durable-subscription/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example demonstrates a clustered JMS durable subscription. Normally 
durable subscriptions exist on a single node and can only have one subscriber 
at any one time, however, with ActiveMQ Artemis it's possible to create durable 
subscription instances with the same name and client-id on different nodes of 
the cluster, and consume from them simultaneously. This allows the work of 
processing messages from a durable subscription to be spread across the cluster 
in a similar way to how JMS  [...]
+This example demonstrates a clustered JMS durable subscription. Normally 
durable subscriptions exist on a single node and can only have one subscriber 
at any one time, however, with Apache Artemis it's possible to create durable 
subscription instances with the same name and client-id on different nodes of 
the cluster, and consume from them simultaneously. This allows the work of 
processing messages from a durable subscription to be spread across the cluster 
in a similar way to how JMS Qu [...]
 
 In this example we first configure the two nodes to form a cluster, then we 
then create a durable subscriber with the same name and client-id on both 
nodes, and we create a producer on only one of the nodes.
 
@@ -24,4 +24,4 @@ The cli create method will define a similar section by 
default if you use `--clu
         <discovery-group-ref discovery-group-name="my-discovery-group"/>
     </cluster-connection>
 
-For more information on ActiveMQ Artemis load balancing, and clustering in 
general, please see the "Clusters" chapter of the user manual.
\ No newline at end of file
+For more information on Apache Artemis load balancing, and clustering in 
general, please see the "Clusters" chapter of the user manual.
\ No newline at end of file
diff --git a/examples/features/clustered/clustered-grouping/readme.md 
b/examples/features/clustered/clustered-grouping/readme.md
index 890c5087..084cbfaf 100644
--- a/examples/features/clustered/clustered-grouping/readme.md
+++ b/examples/features/clustered/clustered-grouping/readme.md
@@ -1,6 +1,6 @@
 # JMS Clustered Grouping Example
 
-Before continuing please **read the caveats about clustered grouping** in the 
"Message Grouping" chapter of ActiveMQ Artemis User Guide. In short, 
**clustered grouping is not recommended**.
+Before continuing please **read the caveats about clustered grouping** in the 
"Message Grouping" chapter of Apache Artemis User Guide. In short, **clustered 
grouping is not recommended**.
 
 If you have not already done so, [prepare the broker 
distribution](../../../../README.md#getting-started) before running the example.
 
diff --git a/examples/features/clustered/clustered-jgroups/readme.md 
b/examples/features/clustered/clustered-jgroups/readme.md
index be02dc7e..e2ce733b 100644
--- a/examples/features/clustered/clustered-jgroups/readme.md
+++ b/examples/features/clustered/clustered-jgroups/readme.md
@@ -1,4 +1,4 @@
-# ActiveMQ Artemis Clustering with JGroups Example
+# Apache Artemis Clustering with JGroups Example
 
 If you have not already done so, [prepare the broker 
distribution](../../../../README.md#getting-started) before running the example.
 
@@ -12,7 +12,7 @@ We then send some messages via the producer, and we verify 
that **both** consume
 
 This example uses JNDI to lookup the JMS Queue and ConnectionFactory objects. 
If you prefer not to use JNDI, these could be instantiated directly.
 
-To enable ActiveMQ Artemis to use JGroups you need to configure JGroups 
configuration file and make sure it is on the classpath by placing in the 
configuration directory, the file test-jgroups-file_ping.xml is the 
configuration used in this exaample
+To enable Apache Artemis to use JGroups you need to configure JGroups 
configuration file and make sure it is on the classpath by placing in the 
configuration directory, the file test-jgroups-file_ping.xml is the 
configuration used in this exaample
 
 You then configure the jgroups file used by the broadcast and discovery groups 
in the configuration along with the channel name which you want this cluster to 
share.
 
@@ -33,4 +33,4 @@ You then configure the jgroups file used by the broadcast and 
discovery groups i
        </discovery-group>
     </discovery-groups>
 
-For more information on ActiveMQ Artemis clustering in general, please see the 
"Clusters" chapter of the user manual.
\ No newline at end of file
+For more information on Apache Artemis clustering in general, please see the 
"Clusters" chapter of the user manual.
\ No newline at end of file
diff --git a/examples/features/clustered/clustered-queue/readme.md 
b/examples/features/clustered/clustered-queue/readme.md
index 7970ab61..6ba7ec78 100644
--- a/examples/features/clustered/clustered-queue/readme.md
+++ b/examples/features/clustered/clustered-queue/readme.md
@@ -10,7 +10,7 @@ We then create a consumer on the queue on each node, and we 
create a producer on
 
 We then send some messages via the producer, and we verify that **both** 
consumers receive the sent messages in a round-robin fashion.
 
-In other words, ActiveMQ Artemis **load balances** the sent messages across 
all consumers on the cluster
+In other words, Apache Artemis **load balances** the sent messages across all 
consumers on the cluster
 
 This example uses JNDI to lookup the JMS Queue and ConnectionFactory objects. 
If you prefer not to use JNDI, these could be instantiated directly.
 
@@ -25,4 +25,4 @@ Here's the relevant snippet from the broker configuration, 
which tells the broke
        <discovery-group-ref discovery-group-name="my-discovery-group"/>
     </cluster-connection>
 
-For more information on ActiveMQ Artemis load balancing, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
+For more information on Apache Artemis load balancing, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
diff --git 
a/examples/features/clustered/clustered-static-discovery-uri/readme.md 
b/examples/features/clustered/clustered-static-discovery-uri/readme.md
index 5c019c2e..5a726dc3 100644
--- a/examples/features/clustered/clustered-static-discovery-uri/readme.md
+++ b/examples/features/clustered/clustered-static-discovery-uri/readme.md
@@ -10,7 +10,7 @@ We then create a consumer on the queue on each node, and we 
create a producer on
 
 We then send some messages via the producer, and we verify that **both** 
consumers receive the sent messages in a round-robin fashion.
 
-In other words, ActiveMQ Artemis **load balances** the sent messages across 
all consumers on the cluster
+In other words, Apache Artemis **load balances** the sent messages across all 
consumers on the cluster
 
 This example uses JNDI to lookup the JMS Queue and ConnectionFactory objects. 
If you prefer not to use JNDI, these could be instantiated directly.
 
@@ -27,4 +27,4 @@ Here's the relevant snippet from the broker configuration, 
which tells the broke
        </static-connectors>
     </cluster-connection>
 
-For more information on ActiveMQ Artemis load balancing, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
+For more information on Apache Artemis load balancing, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
diff --git a/examples/features/clustered/clustered-static-discovery/readme.md 
b/examples/features/clustered/clustered-static-discovery/readme.md
index 5c019c2e..5a726dc3 100644
--- a/examples/features/clustered/clustered-static-discovery/readme.md
+++ b/examples/features/clustered/clustered-static-discovery/readme.md
@@ -10,7 +10,7 @@ We then create a consumer on the queue on each node, and we 
create a producer on
 
 We then send some messages via the producer, and we verify that **both** 
consumers receive the sent messages in a round-robin fashion.
 
-In other words, ActiveMQ Artemis **load balances** the sent messages across 
all consumers on the cluster
+In other words, Apache Artemis **load balances** the sent messages across all 
consumers on the cluster
 
 This example uses JNDI to lookup the JMS Queue and ConnectionFactory objects. 
If you prefer not to use JNDI, these could be instantiated directly.
 
@@ -27,4 +27,4 @@ Here's the relevant snippet from the broker configuration, 
which tells the broke
        </static-connectors>
     </cluster-connection>
 
-For more information on ActiveMQ Artemis load balancing, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
+For more information on Apache Artemis load balancing, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
diff --git a/examples/features/clustered/clustered-static-oneway/readme.md 
b/examples/features/clustered/clustered-static-oneway/readme.md
index faf05ce5..365f5c23 100644
--- a/examples/features/clustered/clustered-static-oneway/readme.md
+++ b/examples/features/clustered/clustered-static-oneway/readme.md
@@ -12,7 +12,7 @@ We then create a consumer on the queue on each node, and we 
create a producer on
 
 We then send some messages via the producer, and we verify that **all** 
consumers receive the sent messages in a round-robin fashion.
 
-In other words, ActiveMQ Artemis **load balances** the sent messages across 
all consumers on the cluster
+In other words, Apache Artemis **load balances** the sent messages across all 
consumers on the cluster
 
 This example uses JNDI to lookup the JMS Queue and ConnectionFactory objects. 
If you prefer not to use JNDI, these could be instantiated directly.
 
@@ -29,4 +29,4 @@ Here's the relevant snippet from the broker configuration, 
which tells the broke
         </static-connectors>
     </cluster-connection>
 
-For more information on ActiveMQ Artemis load balancing, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
+For more information on Apache Artemis load balancing, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
diff --git a/examples/features/clustered/clustered-topic-uri/readme.md 
b/examples/features/clustered/clustered-topic-uri/readme.md
index c961c643..717ee575 100644
--- a/examples/features/clustered/clustered-topic-uri/readme.md
+++ b/examples/features/clustered/clustered-topic-uri/readme.md
@@ -20,4 +20,4 @@ This example differs from different-topic as it will use an 
URI to define the cl
 
     <cluster-connection-uri name="my-cluster" 
address="uri="multicast://my-discovery-group?messageLoadBalancingType=STRICT;retryInterval=500;connectorName=netty-connector;maxHops=1"/>
 
-For more information on ActiveMQ Artemis load balancing, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
+For more information on Apache Artemis load balancing, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
diff --git a/examples/features/clustered/clustered-topic/readme.md 
b/examples/features/clustered/clustered-topic/readme.md
index d7e15537..56925a14 100644
--- a/examples/features/clustered/clustered-topic/readme.md
+++ b/examples/features/clustered/clustered-topic/readme.md
@@ -24,4 +24,4 @@ Here's the relevant snippet from the broker configuration, 
which tells the broke
        <discovery-group-ref discovery-group-name="my-discovery-group"/>
     </cluster-connection>
 
-For more information on ActiveMQ Artemis load balancing, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
+For more information on Apache Artemis load balancing, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
diff --git a/examples/features/clustered/queue-message-redistribution/readme.md 
b/examples/features/clustered/queue-message-redistribution/readme.md
index f8f160e4..423bd998 100644
--- a/examples/features/clustered/queue-message-redistribution/readme.md
+++ b/examples/features/clustered/queue-message-redistribution/readme.md
@@ -6,11 +6,11 @@ To run the example, simply type **mvn verify** from this 
directory, or **mvn -Pn
 
 This example demonstrates message redistribution between queues with the same 
name deployed in different nodes of a cluster.
 
-As demontrated in the clustered queue example, if queues with the same name 
are deployed on different nodes of a cluster, ActiveMQ Artemis can be 
configured to load balance messages between the nodes on the broker side.
+As demontrated in the clustered queue example, if queues with the same name 
are deployed on different nodes of a cluster, Apache Artemis can be configured 
to load balance messages between the nodes on the broker side.
 
 However, if the consumer(s) on a particular node are closed, then messages in 
the queue at that node can appear to be stranded, since they have no local 
consumers.
 
-If this is undesirable, ActiveMQ Artemis can be configured to **redistribute** 
messages from the node 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.
+If this is undesirable, Apache Artemis can be configured to **redistribute** 
messages from the node 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.
 
 By default, message redistribution is disabled, but can be enabled by 
specifying some AddressSettings configuration in either `activemq-queues.xml` 
or `broker.xml`
 
@@ -22,4 +22,4 @@ Here's the relevant snippet from the `activemq-queues.xml` 
configuration, which
        <redistribution-delay>0</redistribution-delay>
     </address-setting>
 
-For more information on ActiveMQ Artemis load balancing, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
+For more information on Apache Artemis load balancing, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
diff --git a/examples/features/clustered/symmetric-cluster/readme.md 
b/examples/features/clustered/symmetric-cluster/readme.md
index cc271dc2..cb65f581 100644
--- a/examples/features/clustered/symmetric-cluster/readme.md
+++ b/examples/features/clustered/symmetric-cluster/readme.md
@@ -4,9 +4,9 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This examples demonstrates a **symmetric cluster** set-up with ActiveMQ 
Artemis.
+This examples demonstrates a **symmetric cluster** set-up with Apache Artemis.
 
-ActiveMQ Artemis has extremely flexible clustering which allows you to set-up 
servers in many different topologies.
+Apache Artemis has extremely flexible clustering which allows you to set-up 
servers in many different topologies.
 
 The most common topology that you'll perhaps be familiar with if you are used 
to application broker clustering is a **symmetric cluster**.
 
@@ -16,7 +16,7 @@ By connecting node in such a way, we can, from a JMS point of 
view, give the imp
 
 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.
 
-To set up ActiveMQ Artemis to form a symmetric cluster we simply need to mark 
each broker as `clustered` and we need to define a `cluster-connection` in 
`broker.xml`.
+To set up Apache Artemis to form a symmetric cluster we simply need to mark 
each broker as `clustered` and we need to define a `cluster-connection` in 
`broker.xml`.
 
 The `cluster-connection` tells the nodes what other nodes to make connections 
to. With a `cluster-connection` 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.
 
@@ -37,4 +37,4 @@ In this example we create a symmetric cluster of six live 
nodes.
 
 In this example will we will demonstrate this by deploying a JMS topic and 
Queue on all nodes of the cluster , sending messages to the queue and topic 
from different nodes, and verifying messages are received correctly by 
consumers on different nodes.
 
-For more information on configuring ActiveMQ Artemis clustering in general, 
please see the clustering section of the user manual.
\ No newline at end of file
+For more information on configuring Apache Artemis clustering in general, 
please see the clustering section of the user manual.
\ No newline at end of file
diff --git a/examples/features/federation/federated-address-divert/readme.md 
b/examples/features/federation/federated-address-divert/readme.md
index 0ee6a288..d2688a79 100644
--- a/examples/features/federation/federated-address-divert/readme.md
+++ b/examples/features/federation/federated-address-divert/readme.md
@@ -17,4 +17,4 @@ The following is then carried out:
 2. send some messages via the producer on eu-east, and we verify the eu-west 
consumer receives the messages because of the divert binding demand
 
 
-For more information on ActiveMQ Artemis Federation please see the federation 
section of the user manual.
\ No newline at end of file
+For more information on Apache Artemis Federation please see the federation 
section of the user manual.
\ No newline at end of file
diff --git 
a/examples/features/federation/federated-address-downstream-upstream/readme.md 
b/examples/features/federation/federated-address-downstream-upstream/readme.md
index 12ed2394..c2d4819b 100644
--- 
a/examples/features/federation/federated-address-downstream-upstream/readme.md
+++ 
b/examples/features/federation/federated-address-downstream-upstream/readme.md
@@ -22,7 +22,7 @@ The following is then carried out:
 
 
 
-In other words, we are showing how with Federated Address, ActiveMQ Artemis 
**replicates**  sent messages to all addresses and subsequently delivered to 
all consumers, regardless if the consumer is local or is on a distant broker. 
Decoupling the location where producers and consumers need to be.
+In other words, we are showing how with Federated Address, Apache Artemis 
**replicates**  sent messages to all addresses and subsequently delivered to 
all consumers, regardless if the consumer is local or is on a distant broker. 
Decoupling the location where producers and consumers need to be.
 
 The config that defines the federation you can see in the broker.xml for each 
broker is within the following tags. You will note upstreams are different in 
each as well as the federation name, which has to be globally unique.
 
@@ -33,4 +33,4 @@ The config that defines the federation you can see in the 
broker.xml for each br
 ```
 
 
-For more information on ActiveMQ Artemis Federation please see the federation 
section of the user manual.
+For more information on Apache Artemis Federation please see the federation 
section of the user manual.
diff --git 
a/examples/features/federation/federated-address-downstream/readme.md 
b/examples/features/federation/federated-address-downstream/readme.md
index 12ed2394..c2d4819b 100644
--- a/examples/features/federation/federated-address-downstream/readme.md
+++ b/examples/features/federation/federated-address-downstream/readme.md
@@ -22,7 +22,7 @@ The following is then carried out:
 
 
 
-In other words, we are showing how with Federated Address, ActiveMQ Artemis 
**replicates**  sent messages to all addresses and subsequently delivered to 
all consumers, regardless if the consumer is local or is on a distant broker. 
Decoupling the location where producers and consumers need to be.
+In other words, we are showing how with Federated Address, Apache Artemis 
**replicates**  sent messages to all addresses and subsequently delivered to 
all consumers, regardless if the consumer is local or is on a distant broker. 
Decoupling the location where producers and consumers need to be.
 
 The config that defines the federation you can see in the broker.xml for each 
broker is within the following tags. You will note upstreams are different in 
each as well as the federation name, which has to be globally unique.
 
@@ -33,4 +33,4 @@ The config that defines the federation you can see in the 
broker.xml for each br
 ```
 
 
-For more information on ActiveMQ Artemis Federation please see the federation 
section of the user manual.
+For more information on Apache Artemis Federation please see the federation 
section of the user manual.
diff --git a/examples/features/federation/federated-address/readme.md 
b/examples/features/federation/federated-address/readme.md
index 12ed2394..c2d4819b 100644
--- a/examples/features/federation/federated-address/readme.md
+++ b/examples/features/federation/federated-address/readme.md
@@ -22,7 +22,7 @@ The following is then carried out:
 
 
 
-In other words, we are showing how with Federated Address, ActiveMQ Artemis 
**replicates**  sent messages to all addresses and subsequently delivered to 
all consumers, regardless if the consumer is local or is on a distant broker. 
Decoupling the location where producers and consumers need to be.
+In other words, we are showing how with Federated Address, Apache Artemis 
**replicates**  sent messages to all addresses and subsequently delivered to 
all consumers, regardless if the consumer is local or is on a distant broker. 
Decoupling the location where producers and consumers need to be.
 
 The config that defines the federation you can see in the broker.xml for each 
broker is within the following tags. You will note upstreams are different in 
each as well as the federation name, which has to be globally unique.
 
@@ -33,4 +33,4 @@ The config that defines the federation you can see in the 
broker.xml for each br
 ```
 
 
-For more information on ActiveMQ Artemis Federation please see the federation 
section of the user manual.
+For more information on Apache Artemis Federation please see the federation 
section of the user manual.
diff --git 
a/examples/features/federation/federated-queue-downstream-upstream/readme.md 
b/examples/features/federation/federated-queue-downstream-upstream/readme.md
index a4893ecb..aceb1e4d 100644
--- a/examples/features/federation/federated-queue-downstream-upstream/readme.md
+++ b/examples/features/federation/federated-queue-downstream-upstream/readme.md
@@ -37,7 +37,7 @@ If US Central and EU East were even priority then the 
re-direct would be loaded
 11. And repeat the same on EU West.
 
 
-In other words, we are showing how with Federated Queues, ActiveMQ Artemis 
**routes**  sent messages to local consumers as priority, but is able to 
re-route the sent messages to other distant brokers if consumers are attached 
to those brokers. Decoupling the location where producers and consumers need to 
be.
+In other words, we are showing how with Federated Queues, Apache Artemis 
**routes**  sent messages to local consumers as priority, but is able to 
re-route the sent messages to other distant brokers if consumers are attached 
to those brokers. Decoupling the location where producers and consumers need to 
be.
 
 Here's the relevant snippet from the broker configuration, which tells the 
broker to form a cluster between the two nodes and to load balance the messages 
between the nodes.
 
@@ -50,4 +50,4 @@ The config that defines the federation you can see in the 
broker.xml for each br
 ```
 
 
-For more information on ActiveMQ Artemis Federation please see the federation 
section of the user manual.
\ No newline at end of file
+For more information on Apache Artemis Federation please see the federation 
section of the user manual.
\ No newline at end of file
diff --git a/examples/features/federation/federated-queue-downstream/readme.md 
b/examples/features/federation/federated-queue-downstream/readme.md
index a4893ecb..aceb1e4d 100644
--- a/examples/features/federation/federated-queue-downstream/readme.md
+++ b/examples/features/federation/federated-queue-downstream/readme.md
@@ -37,7 +37,7 @@ If US Central and EU East were even priority then the 
re-direct would be loaded
 11. And repeat the same on EU West.
 
 
-In other words, we are showing how with Federated Queues, ActiveMQ Artemis 
**routes**  sent messages to local consumers as priority, but is able to 
re-route the sent messages to other distant brokers if consumers are attached 
to those brokers. Decoupling the location where producers and consumers need to 
be.
+In other words, we are showing how with Federated Queues, Apache Artemis 
**routes**  sent messages to local consumers as priority, but is able to 
re-route the sent messages to other distant brokers if consumers are attached 
to those brokers. Decoupling the location where producers and consumers need to 
be.
 
 Here's the relevant snippet from the broker configuration, which tells the 
broker to form a cluster between the two nodes and to load balance the messages 
between the nodes.
 
@@ -50,4 +50,4 @@ The config that defines the federation you can see in the 
broker.xml for each br
 ```
 
 
-For more information on ActiveMQ Artemis Federation please see the federation 
section of the user manual.
\ No newline at end of file
+For more information on Apache Artemis Federation please see the federation 
section of the user manual.
\ No newline at end of file
diff --git a/examples/features/federation/federated-queue/readme.md 
b/examples/features/federation/federated-queue/readme.md
index a4893ecb..aceb1e4d 100644
--- a/examples/features/federation/federated-queue/readme.md
+++ b/examples/features/federation/federated-queue/readme.md
@@ -37,7 +37,7 @@ If US Central and EU East were even priority then the 
re-direct would be loaded
 11. And repeat the same on EU West.
 
 
-In other words, we are showing how with Federated Queues, ActiveMQ Artemis 
**routes**  sent messages to local consumers as priority, but is able to 
re-route the sent messages to other distant brokers if consumers are attached 
to those brokers. Decoupling the location where producers and consumers need to 
be.
+In other words, we are showing how with Federated Queues, Apache Artemis 
**routes**  sent messages to local consumers as priority, but is able to 
re-route the sent messages to other distant brokers if consumers are attached 
to those brokers. Decoupling the location where producers and consumers need to 
be.
 
 Here's the relevant snippet from the broker configuration, which tells the 
broker to form a cluster between the two nodes and to load balance the messages 
between the nodes.
 
@@ -50,4 +50,4 @@ The config that defines the federation you can see in the 
broker.xml for each br
 ```
 
 
-For more information on ActiveMQ Artemis Federation please see the federation 
section of the user manual.
\ No newline at end of file
+For more information on Apache Artemis Federation please see the federation 
section of the user manual.
\ No newline at end of file
diff --git a/examples/features/ha/application-layer-failover/readme.md 
b/examples/features/ha/application-layer-failover/readme.md
index c9cb10ea..0e76d002 100644
--- a/examples/features/ha/application-layer-failover/readme.md
+++ b/examples/features/ha/application-layer-failover/readme.md
@@ -4,11 +4,11 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory. This 
example will always spawn and stop multiple brokers.
 
-ActiveMQ Artemis implements fully transparent **automatic** failover of 
connections from a live node to a backup node which requires no special coding. 
This is described in a different example and requires broker replication.
+Apache Artemis implements fully transparent **automatic** failover of 
connections from a live node to a backup node which requires no special coding. 
This is described in a different example and requires broker replication.
 
-However, ActiveMQ Artemis also supports **Application-Layer** failover which 
is useful in the case where replication is not enabled.
+However, Apache Artemis also supports **Application-Layer** failover which is 
useful in the case where replication is not enabled.
 
-With Application-Layer failover, it's up to the application to register a JMS 
ExceptionListener with ActiveMQ Artemis. This listener will then be called by 
ActiveMQ Artemis in the event that connection failure is detected.
+With Application-Layer failover, it's up to the application to register a JMS 
ExceptionListener with Apache Artemis. This listener will then be called by 
Apache Artemis in the event that connection failure is detected.
 
 User code in the ExceptionListener can then recreate any JMS Connection, 
Session, etc on another node and the application can continue.
 
@@ -16,4 +16,4 @@ Application-Layer failover is an alternative approach to High 
Availability (HA).
 
 Application-Layer failover differs from automatic failover in that some client 
side coding is required in order to implement this. Also, with 
Application-Layer failover, since the old Session object dies and a new is 
created, any uncommitted work in the old Session will be lost, and any 
unacknowledged messages might be redelivered.
 
-For more information on ActiveMQ Artemis failover and HA, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
+For more information on Apache Artemis failover and HA, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
diff --git a/examples/features/ha/non-transaction-failover/readme.md 
b/examples/features/ha/non-transaction-failover/readme.md
index ef99388a..7a91ff5e 100644
--- a/examples/features/ha/non-transaction-failover/readme.md
+++ b/examples/features/ha/non-transaction-failover/readme.md
@@ -12,4 +12,4 @@ When a _non-transacted_ JMS session is used, once and only 
once delivery is not
 
 It is up to the client to deal with such cases. To ensure once and only once 
delivery, the client must use transacted JMS sessions (as shown in the 
"transaction-failover" example).
 
-For more information on ActiveMQ Artemis failover and HA, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
+For more information on Apache Artemis failover and HA, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
diff --git a/examples/features/ha/replicated-failback-static/readme.md 
b/examples/features/ha/replicated-failback-static/readme.md
index cfdf5dc0..9d577ce1 100644
--- a/examples/features/ha/replicated-failback-static/readme.md
+++ b/examples/features/ha/replicated-failback-static/readme.md
@@ -6,4 +6,4 @@ To run the example, simply type **mvn verify** from this 
directory.
 
 This example is the same as the "replicated-failback" example but with a 
"static" clustering configuration (i.e. not using UDP multicast).
 
-For more information on ActiveMQ Artemis failover and HA, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
+For more information on Apache Artemis failover and HA, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
diff --git a/examples/features/ha/replicated-failback/readme.md 
b/examples/features/ha/replicated-failback/readme.md
index 73544bcd..41534153 100644
--- a/examples/features/ha/replicated-failback/readme.md
+++ b/examples/features/ha/replicated-failback/readme.md
@@ -6,4 +6,4 @@ To run the example, simply type **mvn verify** from this 
directory.
 
 This example demonstrates two servers coupled as a live-backup pair for high 
availability (HA) using replication and a client connection failing over from 
live to backup when the live broker is crashed and then back to the original 
live when it is restarted (i.e. "failback").
 
-For more information on ActiveMQ Artemis failover and HA, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
+For more information on Apache Artemis failover and HA, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
diff --git a/examples/features/ha/replicated-multiple-failover/readme.md 
b/examples/features/ha/replicated-multiple-failover/readme.md
index 0610bae2..c1a49f13 100644
--- a/examples/features/ha/replicated-multiple-failover/readme.md
+++ b/examples/features/ha/replicated-multiple-failover/readme.md
@@ -6,4 +6,4 @@ To run the example, simply type **mvn verify** from this 
directory.
 
 This example demonstrates three servers coupled as a live-backup-backup group 
for high availability (HA) using replication, and a client connection failing 
over from live to backup when the live broker is crashed and then to the second 
backup once the new live fails.
 
-For more information on ActiveMQ Artemis failover and HA, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
+For more information on Apache Artemis failover and HA, and clustering in 
general, please see the clustering section of the user manual.
\ No newline at end of file
diff --git a/examples/features/standard/browser/readme.md 
b/examples/features/standard/browser/readme.md
index 514c5480..1e2de36f 100644
--- a/examples/features/standard/browser/readme.md
+++ b/examples/features/standard/browser/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to use a JMS 
[QueueBrowser](https://docs.oracle.com/javaee/7/api/javax/jms/QueueBrowser.html)
 with ActiveMQ Artemis.
+This example shows you how to use a JMS 
[QueueBrowser](https://docs.oracle.com/javaee/7/api/javax/jms/QueueBrowser.html)
 with Apache Artemis.
 
 Queues are a standard part of JMS, please consult the JMS 1.1 specification 
for full details.
 
diff --git a/examples/features/standard/cdi/readme.md 
b/examples/features/standard/cdi/readme.md
index c6194d19..4d53159d 100644
--- a/examples/features/standard/cdi/readme.md
+++ b/examples/features/standard/cdi/readme.md
@@ -23,7 +23,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory.
 
-This is a simple example that demonstrates how to use CDI to integrate with 
ActiveMQ Artemis on the client side.  It is designed mainly for connecting to a 
remote broker rather than embedding within your application.
+This is a simple example that demonstrates how to use CDI to integrate with 
Apache Artemis on the client side.  It is designed mainly for connecting to a 
remote broker rather than embedding within your application.
 
 ## Configuring the connection
 
diff --git a/examples/features/standard/client-kickoff/readme.md 
b/examples/features/standard/client-kickoff/readme.md
index 57372415..a7880a4b 100644
--- a/examples/features/standard/client-kickoff/readme.md
+++ b/examples/features/standard/client-kickoff/readme.md
@@ -6,4 +6,4 @@ To run the example, simply type **mvn verify** from this 
directory, or **mvn -Pn
 
 This example shows how to kick off a client connected to ActiveMQ using 
[JMX](http://www.oracle.com/technetwork/java/javase/tech/javamanagement-140525.html)
 
-The example will connect to ActiveMQ Artemis. Using JMX, we will list the 
remote addresses connected to the broker and close the corresponding 
connections. The client will be kicked off from ActiveMQ Artemis receiving an 
exception that its JMS connection was interrupted.
\ No newline at end of file
+The example will connect to Apache Artemis. Using JMX, we will list the remote 
addresses connected to the broker and close the corresponding connections. The 
client will be kicked off from Apache Artemis receiving an exception that its 
JMS connection was interrupted.
\ No newline at end of file
diff --git a/examples/features/standard/completion-listener/readme.md 
b/examples/features/standard/completion-listener/readme.md
index 000be0ae..ec4ca03d 100644
--- a/examples/features/standard/completion-listener/readme.md
+++ b/examples/features/standard/completion-listener/readme.md
@@ -4,4 +4,4 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to send a message asynchronously to ActiveMQ 
Artemis and use a CompletionListener to be notified of the Broker receiving it.
\ No newline at end of file
+This example shows you how to send a message asynchronously to Apache Artemis 
and use a CompletionListener to be notified of the Broker receiving it.
\ No newline at end of file
diff --git a/examples/features/standard/consumer-rate-limit/readme.md 
b/examples/features/standard/consumer-rate-limit/readme.md
index be610530..ee5a62b4 100644
--- a/examples/features/standard/consumer-rate-limit/readme.md
+++ b/examples/features/standard/consumer-rate-limit/readme.md
@@ -4,9 +4,9 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-With ActiveMQ Artemis you can specify a maximum consume rate at which a JMS 
MessageConsumer will consume messages. This can be specified when creating or 
configuring the connection factory. See `jndi.properties`.
+With Apache Artemis you can specify a maximum consume rate at which a JMS 
MessageConsumer will consume messages. This can be specified when creating or 
configuring the connection factory. See `jndi.properties`.
 
-If this value is specified then ActiveMQ Artemis will ensure that messages are 
never consumed at a rate higher than the specified rate. This is a form of 
consumer _throttling_.
+If this value is specified then Apache Artemis will ensure that messages are 
never consumed at a rate higher than the specified rate. This is a form of 
consumer _throttling_.
 
 ## Example step-by-step
 
diff --git a/examples/features/standard/context/readme.md 
b/examples/features/standard/context/readme.md
index c98fa006..9880238d 100644
--- a/examples/features/standard/context/readme.md
+++ b/examples/features/standard/context/readme.md
@@ -4,6 +4,6 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to send and receive a message to a JMS Queue using 
ActiveMQ Artemis by using a JMSContext.
+This example shows you how to send and receive a message to a JMS Queue using 
Apache Artemis by using a JMSContext.
 
 A JMSContext is part of JMS 2.0 and combines the JMS Connection and Session 
Objects into a simple interface.
\ No newline at end of file
diff --git a/examples/features/standard/core-bridge/readme.md 
b/examples/features/standard/core-bridge/readme.md
index 67dedbde..46de28ec 100644
--- a/examples/features/standard/core-bridge/readme.md
+++ b/examples/features/standard/core-bridge/readme.md
@@ -6,15 +6,15 @@ To run the example, simply type **mvn verify** from this 
directory, or **mvn -Pn
 
 This example demonstrates a core bridge deployed on one server, which consumes 
messages from a local queue and forwards them to an address on a second server.
 
-Core bridges are used to create message flows between any two ActiveMQ Artemis 
servers which are remotely separated. Core bridges are resilient and will cope 
with temporary connection failure allowing them to be an ideal choice for 
forwarding over unreliable connections, e.g. a WAN.
+Core bridges are used to create message flows between any two Apache Artemis 
servers which are remotely separated. Core bridges are resilient and will cope 
with temporary connection failure allowing them to be an ideal choice for 
forwarding over unreliable connections, e.g. a WAN.
 
 They can also be configured with an optional filter expression, and will only 
forward messages that match that filter.
 
 Furthermore they can be configured to use an optional Transformer class. A 
user-defined Transformer class can be specified which is called at forwarding 
time. This gives the user the opportunity to transform the message in some 
ways, e.g. changing its properties or body
 
-ActiveMQ Artemis also includes a **JMS Bridge**. This is similar to a core 
bridge, but uses the JMS API and can be used to bridge between any two JMS 1.1 
compliant messaging systems. The core bridge is limited to bridging between 
ActiveMQ Artemis instances, but may provide better performance than the JMS 
bridge. The JMS bridge is covered in a separate example.
+Apache Artemis also includes a **JMS Bridge**. This is similar to a core 
bridge, but uses the JMS API and can be used to bridge between any two JMS 1.1 
compliant messaging systems. The core bridge is limited to bridging between 
Apache Artemis instances, but may provide better performance than the JMS 
bridge. The JMS bridge is covered in a separate example.
 
-For more information on bridges, please see the ActiveMQ Artemis user manual.
+For more information on bridges, please see the Apache Artemis user manual.
 
 In this example we will demonstrate a simple sausage factory for aardvarks.
 
diff --git a/examples/features/standard/database/readme.md 
b/examples/features/standard/database/readme.md
index d2d1c0c3..4468a57a 100644
--- a/examples/features/standard/database/readme.md
+++ b/examples/features/standard/database/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to configure ActiveMQ Artemis to run with a 
database.
+This example shows you how to configure Apache Artemis to run with a database.
 
 ### Notice
  
diff --git a/examples/features/standard/dead-letter/readme.md 
b/examples/features/standard/dead-letter/readme.md
index 5a553477..1f8cc3b5 100644
--- a/examples/features/standard/dead-letter/readme.md
+++ b/examples/features/standard/dead-letter/readme.md
@@ -10,7 +10,7 @@ Messages can be delivered unsuccessfully (e.g. if the 
transacted session used to
 
 To prevent this, messaging systems define dead letter messages: after a 
specified unsuccessful delivery attempts, the message is removed from the 
destination and instead routed to a _dead letter address_ where they can be 
consumed for further investigation.
 
-The example will show how to configure ActiveMQ Artemis to route a message to 
a dead letter address after 3 unsuccessful delivery attempts.
+The example will show how to configure Apache Artemis to route a message to a 
dead letter address after 3 unsuccessful delivery attempts.
 
 The example will send 1 message to a queue. We will deliver the message 3 
times and rollback the session every time.
 
@@ -29,6 +29,6 @@ _Dead letter addresses_ and _maximum delivery attempts_ are 
defined in the confi
 
 This configuration will moved dead letter messages from `exampleQueue` to the 
`deadLetterQueue`.
 
-ActiveMQ Artemis allows to specify either an address or a queue. In this 
example, we will use a queue to hold the dead letter messages.
+Apache Artemis allows to specify either an address or a queue. In this 
example, we will use a queue to hold the dead letter messages.
 
 The maximum attempts of delivery is `3`. Once this figure is reached, a 
message is considered a dead letter message and is moved to the 
`deadLetterQueue`.
\ No newline at end of file
diff --git a/examples/features/standard/delayed-redelivery/readme.md 
b/examples/features/standard/delayed-redelivery/readme.md
index af0eb11d..bcc18300 100644
--- a/examples/features/standard/delayed-redelivery/readme.md
+++ b/examples/features/standard/delayed-redelivery/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example demonstrates how ActiveMQ Artemis can be configured to provide a 
delayed redelivery in the case where a message needs to be redelivered.
+This example demonstrates how Apache Artemis can be configured to provide a 
delayed redelivery in the case where a message needs to be redelivered.
 
 Delaying redelivery can often be useful in the case that clients regularly 
fail or roll-back. Without a delayed redelivery, the system can get into a 
"thrashing" state, with delivery being attempted, the client rolling back, and 
delivery being re-attempted ad infinitum in quick succession, using up valuable 
CPU and network resources.
 
diff --git a/examples/features/standard/divert/readme.md 
b/examples/features/standard/divert/readme.md
index 0cea170d..578e7f63 100644
--- a/examples/features/standard/divert/readme.md
+++ b/examples/features/standard/divert/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-ActiveMQ Artemis diverts allow messages to be transparently "diverted" from 
one address to another with just some simple configuration defined on the 
broker side.
+Apache Artemis diverts allow messages to be transparently "diverted" from one 
address to another with just some simple configuration defined on the broker 
side.
 
 Diverts can be defined to be **exclusive** or **non-exclusive**.
 
diff --git a/examples/features/standard/durable-subscription/readme.md 
b/examples/features/standard/durable-subscription/readme.md
index 4153987f..e9bf3fae 100644
--- a/examples/features/standard/durable-subscription/readme.md
+++ b/examples/features/standard/durable-subscription/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example demonstrates how to use a durable subscription with ActiveMQ 
Artemis.
+This example demonstrates how to use a durable subscription with Apache 
Artemis.
 
 Durable subscriptions are a standard part of JMS, please consult the JMS 1.1 
specification for full details.
 
diff --git a/examples/features/standard/embedded-simple/readme.md 
b/examples/features/standard/embedded-simple/readme.md
index 11e2151c..9844692b 100644
--- a/examples/features/standard/embedded-simple/readme.md
+++ b/examples/features/standard/embedded-simple/readme.md
@@ -4,8 +4,8 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory.
 
-This examples shows how to setup and run an embedded broker using ActiveMQ 
Artemis.
+This examples shows how to setup and run an embedded broker using Apache 
Artemis.
 
-ActiveMQ Artemis was designed using POJOs (Plain Old Java Objects) which means 
embedding ActiveMQ Artemis in your own application is as simple as 
instantiating a few objects.
+Apache Artemis was designed using POJOs (Plain Old Java Objects) which means 
embedding Apache Artemis in your own application is as simple as instantiating 
a few objects.
 
 This example uses an external configuration file (i.e. broker.xml).
\ No newline at end of file
diff --git a/examples/features/standard/embedded/readme.md 
b/examples/features/standard/embedded/readme.md
index 551a2ad7..3102e916 100644
--- a/examples/features/standard/embedded/readme.md
+++ b/examples/features/standard/embedded/readme.md
@@ -4,8 +4,8 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory.
 
-This examples shows how to setup and run an embedded broker using ActiveMQ 
Artemis.
+This examples shows how to setup and run an embedded broker using Apache 
Artemis.
 
-ActiveMQ Artemis was designed using POJOs (Plain Old Java Objects) which means 
embedding ActiveMQ Artemis in your own application is as simple as 
instantiating a few objects.
+Apache Artemis was designed using POJOs (Plain Old Java Objects) which means 
embedding Apache Artemis in your own application is as simple as instantiating 
a few objects.
 
 This example does not use any configuration files. The broker is configured 
using POJOs and can be easily ported to any dependency injection framework.
\ No newline at end of file
diff --git a/examples/features/standard/exclusive-queue/readme.md 
b/examples/features/standard/exclusive-queue/readme.md
index 3700ba47..b8731d39 100644
--- a/examples/features/standard/exclusive-queue/readme.md
+++ b/examples/features/standard/exclusive-queue/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to configure ActiveMQ Artemis so all messages are 
delivered to the same consumer
+This example shows you how to configure Apache Artemis so all messages are 
delivered to the same consumer
 
 ## ExclusiveQueueExample.java
 
diff --git a/examples/features/standard/expiry/readme.md 
b/examples/features/standard/expiry/readme.md
index 258cb8b8..e39c6731 100644
--- a/examples/features/standard/expiry/readme.md
+++ b/examples/features/standard/expiry/readme.md
@@ -4,11 +4,11 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to configure ActiveMQ Artemis so messages are 
expipired after a certain time.
+This example shows you how to configure Apache Artemis so messages are 
expipired after a certain time.
 
 Messages can be retained in the messaging system for a limited period of time 
before being removed. JMS specification states that clients should not receive 
messages that have been expired (but it does not guarantee this will not 
happen).
 
-ActiveMQ Artemis can assign a _expiry address_ to a given queue so that when 
messages are expired, they are removed from the queue and routed to this 
address. These "expired" messages can later be consumed for further inspection.
+Apache Artemis can assign a _expiry address_ to a given queue so that when 
messages are expired, they are removed from the queue and routed to this 
address. These "expired" messages can later be consumed for further inspection.
 
 The example will send 1 message with a short _time-to-live_ to a queue. We 
will wait for the message to expire and checks that the message is no longer in 
the queue it was sent to. We will instead consume it from an _expiry queue_ 
where it was moved when it expired.
 
diff --git a/examples/features/standard/http-transport/readme.md 
b/examples/features/standard/http-transport/readme.md
index fed65917..ef55c90f 100644
--- a/examples/features/standard/http-transport/readme.md
+++ b/examples/features/standard/http-transport/readme.md
@@ -4,8 +4,8 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to configure ActiveMQ Artemis to use the HTTP 
protocol as its transport layer.
+This example shows you how to configure Apache Artemis to use the HTTP 
protocol as its transport layer.
 
-ActiveMQ Artemis supports a variety of network protocols to be its underlying 
transport without any specific code change.
+Apache Artemis supports a variety of network protocols to be its underlying 
transport without any specific code change.
 
-This example is taken from the queue example without any code change. By 
changing the client's URL in `jndi.properties` one can get ActiveMQ Artemis 
working with the HTTP transport.
\ No newline at end of file
+This example is taken from the queue example without any code change. By 
changing the client's URL in `jndi.properties` one can get Apache Artemis 
working with the HTTP transport.
\ No newline at end of file
diff --git a/examples/features/standard/interceptor-amqp/readme.md 
b/examples/features/standard/interceptor-amqp/readme.md
index d7de6c24..7df3b450 100644
--- a/examples/features/standard/interceptor-amqp/readme.md
+++ b/examples/features/standard/interceptor-amqp/readme.md
@@ -4,9 +4,9 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to implement and configure a simple incoming, 
server-side AMQP interceptor with ActiveMQ Artemis.
+This example shows you how to implement and configure a simple incoming, 
server-side AMQP interceptor with Apache Artemis.
 
-ActiveMQ Artemis allows an application to use an interceptor to hook into the 
messaging system. To intercept AMQP packets all that needs to be done is to 
implement the 
`org.apache.activemq.artemis.protocol.amqp.broker.AmqpInterceptor` interface.
+Apache Artemis allows an application to use an interceptor to hook into the 
messaging system. To intercept AMQP packets all that needs to be done is to 
implement the 
`org.apache.activemq.artemis.protocol.amqp.broker.AmqpInterceptor` interface.
 
 Once you have your own interceptor class add it to the broker.xml as follows:
 
diff --git a/examples/features/standard/interceptor-client/readme.md 
b/examples/features/standard/interceptor-client/readme.md
index 51203adb..6382f179 100644
--- a/examples/features/standard/interceptor-client/readme.md
+++ b/examples/features/standard/interceptor-client/readme.md
@@ -4,9 +4,9 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to implement and configure a simple incoming, 
client-side interceptor with ActiveMQ Artemis.
+This example shows you how to implement and configure a simple incoming, 
client-side interceptor with Apache Artemis.
 
-ActiveMQ Artemis allows an application to use an interceptor to hook into the 
messaging system. To intercept "core" packets all that needs to be done is to 
implement the `org.apache.activemq.artemis.api.core.Interceptor` interface.
+Apache Artemis allows an application to use an interceptor to hook into the 
messaging system. To intercept "core" packets all that needs to be done is to 
implement the `org.apache.activemq.artemis.api.core.Interceptor` interface.
 
 Once you have your own interceptor class, add it to client via the 
`incomingInterceptorList` URL parameter.
 
diff --git a/examples/features/standard/interceptor-mqtt/readme.md 
b/examples/features/standard/interceptor-mqtt/readme.md
index cf9745a5..e1cac98d 100644
--- a/examples/features/standard/interceptor-mqtt/readme.md
+++ b/examples/features/standard/interceptor-mqtt/readme.md
@@ -4,9 +4,9 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to implement and configure a simple incoming, 
server-side MQTT interceptor with ActiveMQ Artemis.
+This example shows you how to implement and configure a simple incoming, 
server-side MQTT interceptor with Apache Artemis.
 
-ActiveMQ Artemis allows an application to use an interceptor to hook into the 
messaging system. To intercept MQTT packets all that needs to be done is to 
implement the `org.apache.activemq.artemis.core.protocol.mqtt.MQTTInterceptor` 
interface.
+Apache Artemis allows an application to use an interceptor to hook into the 
messaging system. To intercept MQTT packets all that needs to be done is to 
implement the `org.apache.activemq.artemis.core.protocol.mqtt.MQTTInterceptor` 
interface.
 
 Once you have your own interceptor class add it to the broker.xml as follows:
 
diff --git a/examples/features/standard/interceptor/readme.md 
b/examples/features/standard/interceptor/readme.md
index 84a8ae26..bd6a86ed 100644
--- a/examples/features/standard/interceptor/readme.md
+++ b/examples/features/standard/interceptor/readme.md
@@ -4,9 +4,9 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to implement and configure a simple incoming, 
server-side interceptor with ActiveMQ Artemis.
+This example shows you how to implement and configure a simple incoming, 
server-side interceptor with Apache Artemis.
 
-ActiveMQ Artemis allows an application to use an interceptor to hook into the 
messaging system. To intercept "core" packets all that needs to be done is to 
implement the `org.apache.activemq.artemis.api.core.Interceptor` interface.
+Apache Artemis allows an application to use an interceptor to hook into the 
messaging system. To intercept "core" packets all that needs to be done is to 
implement the `org.apache.activemq.artemis.api.core.Interceptor` interface.
 
 Once you have your own interceptor class, add it to the broker.xml, as follows:
 
diff --git a/examples/features/standard/jms-bridge/readme.md 
b/examples/features/standard/jms-bridge/readme.md
index 3af6fb75..a8ca21bd 100644
--- a/examples/features/standard/jms-bridge/readme.md
+++ b/examples/features/standard/jms-bridge/readme.md
@@ -4,11 +4,11 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to create a JMS Bridge between two ActiveMQ Artemis 
brokers.
+This example shows you how to create a JMS Bridge between two Apache Artemis 
brokers.
 
 ![](jms-bridge.png)
 
-The example will use two ActiveMQ Artemis brokers:
+The example will use two Apache Artemis brokers:
 
 *   Server #0 – the _Source_ broker. It will be configured with a JMS Topic 
bound to JNDI under `source/topic`
 *   Server #1 – the _Target_ broker. It will be configured with a JMS Queue 
bound to JNDI under `target/queue`
diff --git a/examples/features/standard/jmx-ssl/readme.md 
b/examples/features/standard/jmx-ssl/readme.md
index 3c1147a7..7668a084 100644
--- a/examples/features/standard/jmx-ssl/readme.md
+++ b/examples/features/standard/jmx-ssl/readme.md
@@ -4,17 +4,17 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows how to manage ActiveMQ Artemis using [JMX over 
SSL](http://www.oracle.com/technetwork/java/javase/tech/javamanagement-140525.html)
+This example shows how to manage Apache Artemis using [JMX over 
SSL](http://www.oracle.com/technetwork/java/javase/tech/javamanagement-140525.html)
 
 ## Example configuration
 
-ActiveMQ Artemis exposes its managed resources by default on the platform 
MBeanServer.
+Apache Artemis exposes its managed resources by default on the platform 
MBeanServer.
 
 To access this MBeanServer remotely, add the following to the management.xml 
configuration:
 
     <connector connector-port="1099" connector-host="localhost"/>
 
-With these properties, ActiveMQ Artemis broker will be manageable remotely 
using standard JMX URL on port `1099`.
+With these properties, Apache Artemis broker will be manageable remotely using 
standard JMX URL on port `1099`.
 
 The various keystore files are generated using the following commands:
 
@@ -69,4 +69,4 @@ keytool -keystore client-keystore.jks -storepass $STORE_PASS 
-keypass $KEY_PASS
 
 ## More information
 
-*   [Java management 
guide](https://docs.oracle.com/javase/8/docs/technotes/guides/management/agent.html)
\ No newline at end of file
+*   [Java management 
guide](https://docs.oracle.com/javase/8/docs/technotes/guides/management/agent.html)
diff --git a/examples/features/standard/jmx/readme.md 
b/examples/features/standard/jmx/readme.md
index dad7f8cf..b9923c06 100644
--- a/examples/features/standard/jmx/readme.md
+++ b/examples/features/standard/jmx/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows how to manage ActiveMQ Artemis using 
[JMX](http://www.oracle.com/technetwork/java/javase/tech/javamanagement-140525.html)
+This example shows how to manage Apache Artemis using 
[JMX](http://www.oracle.com/technetwork/java/javase/tech/javamanagement-140525.html)
 
 ## More information
 
diff --git a/examples/features/standard/large-message/readme.md 
b/examples/features/standard/large-message/readme.md
index 13c07bff..df1572a9 100644
--- a/examples/features/standard/large-message/readme.md
+++ b/examples/features/standard/large-message/readme.md
@@ -4,13 +4,13 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, This 
example will start and stop the broker since it will look for a failure.
 
-This example shows you how to send and receive very large messages with 
ActiveMQ Artemis.
+This example shows you how to send and receive very large messages with Apache 
Artemis.
 
-ActiveMQ Artemis supports the sending and receiving of huge messages, much 
larger than can fit in available RAM on the client or server. Effectively the 
only limit to message size is the amount of disk space you have on the server.
+Apache Artemis supports the sending and receiving of huge messages, much 
larger than can fit in available RAM on the client or server. Effectively the 
only limit to message size is the amount of disk space you have on the server.
 
-Large messages are persisted on the broker so they can survive a broker 
restart. In other words ActiveMQ Artemis doesn't just do a simple socket stream 
from the sender to the consumer.
+Large messages are persisted on the broker so they can survive a broker 
restart. In other words Apache Artemis doesn't just do a simple socket stream 
from the sender to the consumer.
 
-In order to do this ActiveMQ Artemis provides an extension to JMS where you 
can use an InputStream or OutputStream as the source or destination for your 
messages respectively. You can send messages as large as it would fit in your 
disk.
+In order to do this Apache Artemis provides an extension to JMS where you can 
use an InputStream or OutputStream as the source or destination for your 
messages respectively. You can send messages as large as it would fit in your 
disk.
 
 You may also choose to read LargeMessages using the regular ByteStream or 
ByteMessage methods, but using the InputStream or OutputStream will provide you 
a much better performance.
 
@@ -18,7 +18,7 @@ You may also choose to read LargeMessages using the regular 
ByteStream or ByteMe
 
 In this example we limit both the broker and the client to be running in a 
maximum of 50MB of RAM, and we send a message with a body of size 2GiB.
 
-ActiveMQ Artemis can support much large message sizes but we choose these 
sizes and limit RAM so the example runs more quickly.
+Apache Artemis can support much large message sizes but we choose these sizes 
and limit RAM so the example runs more quickly.
 
 We create a file on disk representing the message body, create a 
FileInputStream on that file and set that InputStream as the body of the 
message before sending.
 
diff --git a/examples/features/standard/management-notifications/readme.md 
b/examples/features/standard/management-notifications/readme.md
index 3ea674dc..9e04135a 100644
--- a/examples/features/standard/management-notifications/readme.md
+++ b/examples/features/standard/management-notifications/readme.md
@@ -4,16 +4,16 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows how to receive management notifications from ActiveMQ 
Artemis using JMS Messages.
+This example shows how to receive management notifications from Apache Artemis 
using JMS Messages.
 
-ActiveMQ Artemis servers emit management notifications when events of interest 
occur (consumers are created or closed, destinations are created or deleted, 
security authentication fails, etc.).
+Apache Artemis servers emit management notifications when events of interest 
occur (consumers are created or closed, destinations are created or deleted, 
security authentication fails, etc.).
 These notifications can be received either by using JMX (see "jmx" example) or 
by receiving JMS Messages from a well-known destination.
 
 This example will setup a JMS MessageListener to receive management 
notifications. We will also perform normal JMS operations to see the kind of 
notifications they trigger.
 
 ## Example configuration
 
-ActiveMQ Artemis can configured to send JMS messages when management 
notifications are emitted on the server.
+Apache Artemis can configured to send JMS messages when management 
notifications are emitted on the server.
 
 By default, the management name is called `activemq.notifications` but this 
can be configured in [broker.xml](server0/broker.xml). For this example, we 
will set it to `jms.topic.notificationsTopic` to be able to receive 
notifications from a JMS Topic.
 
diff --git a/examples/features/standard/management/readme.md 
b/examples/features/standard/management/readme.md
index dcc6c562..a3c9cb6a 100644
--- a/examples/features/standard/management/readme.md
+++ b/examples/features/standard/management/readme.md
@@ -4,13 +4,13 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory.
 
-This example shows how to manage ActiveMQ Artemis using JMS Messages to invoke 
management operations on the server.
+This example shows how to manage Apache Artemis using JMS Messages to invoke 
management operations on the server.
 
-To manage ActiveMQ Artemis using JMX, see the "jmx" example.
+To manage Apache Artemis using JMX, see the "jmx" example.
 
 ## Example configuration
 
-ActiveMQ Artemis can be managed by sending JMS messages with specific 
properties to its _management_ queue.
+Apache Artemis can be managed by sending JMS messages with specific properties 
to its _management_ queue.
 
 By default, the management name is called `activemq.management` but this can 
be configured in broker.xml like so:
 
diff --git a/examples/features/standard/message-counters/readme.md 
b/examples/features/standard/message-counters/readme.md
index 6321a031..fa531333 100644
--- a/examples/features/standard/message-counters/readme.md
+++ b/examples/features/standard/message-counters/readme.md
@@ -20,6 +20,6 @@ Message counter is configured in the broker configuration 
file broker.xml:
 
 By default, message counters are not enabled (for performance reason). To 
enable them, set `message-counter-enabled` to `true`.
 Queues are sampled every 10 seconds by default. For this example we will 
reduce it to 2 seconds by setting `message-counter-sample-period` to `2000`.
-ActiveMQ Artemis holds in memory the message counters' history for a maximum 
number of days (10 by default). We can change the number of days the history is 
kept by setting the `message-counter-max-day-history` parameter.
+Apache Artemis holds in memory the message counters' history for a maximum 
number of days (10 by default). We can change the number of days the history is 
kept by setting the `message-counter-max-day-history` parameter.
 
-The sample period and the max day history parameters have a small impact on 
the performance of ActiveMQ Artemis (the resources taken to sample a queue are 
not available to the system's normal use). You should set these parameters 
accordingly to the use and throughput of your messages.
\ No newline at end of file
+The sample period and the max day history parameters have a small impact on 
the performance of Apache Artemis (the resources taken to sample a queue are 
not available to the system's normal use). You should set these parameters 
accordingly to the use and throughput of your messages.
\ No newline at end of file
diff --git a/examples/features/standard/message-group/readme.md 
b/examples/features/standard/message-group/readme.md
index b8065d63..8e48ed90 100644
--- a/examples/features/standard/message-group/readme.md
+++ b/examples/features/standard/message-group/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to configure and use message groups with ActiveMQ 
Artemis.
+This example shows you how to configure and use message groups with Apache 
Artemis.
 
 Message groups are sets of messages that has the following characteristics:
 
diff --git a/examples/features/standard/message-group2/readme.md 
b/examples/features/standard/message-group2/readme.md
index 062515dc..fb0a8c9f 100644
--- a/examples/features/standard/message-group2/readme.md
+++ b/examples/features/standard/message-group2/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to configure and use message groups via a 
connection factory with ActiveMQ Artemis.
+This example shows you how to configure and use message groups via a 
connection factory with Apache Artemis.
 
 Message groups are sets of messages that has the following characteristics:
 
diff --git a/examples/features/standard/netty-openssl/readme.md 
b/examples/features/standard/netty-openssl/readme.md
index de012a55..ed8732e8 100644
--- a/examples/features/standard/netty-openssl/readme.md
+++ b/examples/features/standard/netty-openssl/readme.md
@@ -4,9 +4,9 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to configure Netty OpenSSL with ActiveMQ Artemis to 
send and receive message.
+This example shows you how to configure Netty OpenSSL with Apache Artemis to 
send and receive message.
 
-Using SSL can make your messaging applications interact with ActiveMQ Artemis 
securely. An application can be secured transparently without extra coding 
effort.
+Using SSL can make your messaging applications interact with Apache Artemis 
securely. An application can be secured transparently without extra coding 
effort.
 Beside using JDK's implementation, Artemis also supports using native OpenSSL 
provided by Netty.
 To secure your messaging application with Netty's OpenSSL, you need to 
configure connector and acceptor as follows:
 
diff --git a/examples/features/standard/no-consumer-buffering/readme.md 
b/examples/features/standard/no-consumer-buffering/readme.md
index 33512dad..94db8952 100644
--- a/examples/features/standard/no-consumer-buffering/readme.md
+++ b/examples/features/standard/no-consumer-buffering/readme.md
@@ -4,11 +4,11 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-By default, ActiveMQ Artemis consumers buffer messages from the broker in a 
client side buffer before actual delivery actually occurs.
+By default, Apache Artemis consumers buffer messages from the broker in a 
client side buffer before actual delivery actually occurs.
 
-This improves performance since otherwise every time you called receive() or 
had processed the last message in a MessageListener onMessage() method, the 
ActiveMQ Artemis client would have to go the broker to request the next message 
involving a network round trip for every message reducing performance.
+This improves performance since otherwise every time you called receive() or 
had processed the last message in a MessageListener onMessage() method, the 
Apache Artemis client would have to go the broker to request the next message 
involving a network round trip for every message reducing performance.
 
-Therefore, by default, ActiveMQ Artemis pre-fetches messages into a buffer on 
each consumer. The total maximum size of messages in bytes that will be 
buffered on each consumer is determined by the `consumerWindowSize` parameter 
on the connection URL.
+Therefore, by default, Apache Artemis pre-fetches messages into a buffer on 
each consumer. The total maximum size of messages in bytes that will be 
buffered on each consumer is determined by the `consumerWindowSize` parameter 
on the connection URL.
 
 In some cases it is not desirable to buffer any messages on the client side 
consumer.
 
@@ -18,7 +18,7 @@ If orders were buffered in each consumer, and a new consumer 
was added that cons
 
 To turn off client side buffering of messages, set `consumerWindowSize` to 
zero.
 
-With ActiveMQ Artemis you can specify a maximum consume rate at which a JMS 
MessageConsumer will consume messages. This can be specified when configuring 
the connection URL.
+With Apache Artemis you can specify a maximum consume rate at which a JMS 
MessageConsumer will consume messages. This can be specified when configuring 
the connection URL.
 
 ## Example step-by-step
 
diff --git a/examples/features/standard/paging/readme.md 
b/examples/features/standard/paging/readme.md
index ef89c554..160261f3 100644
--- a/examples/features/standard/paging/readme.md
+++ b/examples/features/standard/paging/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows how ActiveMQ Artemis would avoid running out of memory 
resources by paging messages.
+This example shows how Apache Artemis would avoid running out of memory 
resources by paging messages.
 
 A maximum size can be specified per address via the address settings in the 
configuration file (broker.xml).
 
diff --git a/examples/features/standard/pre-acknowledge/readme.md 
b/examples/features/standard/pre-acknowledge/readme.md
index d511c724..b2242d98 100644
--- a/examples/features/standard/pre-acknowledge/readme.md
+++ b/examples/features/standard/pre-acknowledge/readme.md
@@ -14,4 +14,4 @@ The down-side of acknowledging on the broker before delivery, 
is that if the sys
 
 An example of a use-case where it might be a good idea to use pre-acknowledge, 
is for stock price update messages. With these messages it might be ok to lose 
a message in event of crash, since the next price update message will arrive 
soon, overriding the previous price.
 
-In order to use pre-acknowledge functionality with ActiveMQ Artemis the 
session has to be created with a special, ActiveMQ Artemis specific 
acknowledgement mode, given by the value of 
`ActiveMQJMSConstants.PRE_ACKNOWLEDGE`.
\ No newline at end of file
+In order to use pre-acknowledge functionality with Apache Artemis the session 
has to be created with a special, Apache Artemis specific acknowledgement mode, 
given by the value of `ActiveMQJMSConstants.PRE_ACKNOWLEDGE`.
\ No newline at end of file
diff --git a/examples/features/standard/producer-rate-limit/readme.md 
b/examples/features/standard/producer-rate-limit/readme.md
index 09e3ba9d..e2f18e75 100644
--- a/examples/features/standard/producer-rate-limit/readme.md
+++ b/examples/features/standard/producer-rate-limit/readme.md
@@ -4,9 +4,9 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-With ActiveMQ Artemis you can specify a maximum send rate at which a JMS 
MessageProducer will send messages. This can be specified when creating or 
deploying the connection factory. See `activemq-jms.xml`
+With Apache Artemis you can specify a maximum send rate at which a JMS 
MessageProducer will send messages. This can be specified when creating or 
deploying the connection factory. See `activemq-jms.xml`
 
-If this value is specified then ActiveMQ Artemis will ensure that messages are 
never produced at a rate higher than specified. This is a form of producer 
_throttling_.
+If this value is specified then Apache Artemis will ensure that messages are 
never produced at a rate higher than specified. This is a form of producer 
_throttling_.
 
 ## Example step-by-step
 
diff --git a/examples/features/standard/queue-jakarta/readme.md 
b/examples/features/standard/queue-jakarta/readme.md
index 68e4417c..07bcad1b 100644
--- a/examples/features/standard/queue-jakarta/readme.md
+++ b/examples/features/standard/queue-jakarta/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to send and receive a message to a JMS Queue using 
ActiveMQ Artemis.
+This example shows you how to send and receive a message to a JMS Queue using 
Apache Artemis.
 
 Queues are a standard part of JMS, please consult the Jakarta Messaging 3.0 
specification for full details.
 
diff --git a/examples/features/standard/queue-requestor/readme.md 
b/examples/features/standard/queue-requestor/readme.md
index de6cebc1..5c994f63 100644
--- a/examples/features/standard/queue-requestor/readme.md
+++ b/examples/features/standard/queue-requestor/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to use a 
[QueueRequestor](https://docs.oracle.com/javaee/7/api/javax/jms/QueueRequestor.html)
 with ActiveMQ Artemis.
+This example shows you how to use a 
[QueueRequestor](https://docs.oracle.com/javaee/7/api/javax/jms/QueueRequestor.html)
 with Apache Artemis.
 
 JMS is mainly used to send messages asynchronously so that the producer of a 
message is not waiting for the result of the message consumption. However, 
there are cases where it is necessary to have a synchronous behavior: the code 
sending a message requires a reply for this message before continuing its 
execution.
 A QueueRequestor facilitates this use case by providing a simple request/reply 
abstraction on top of JMS.
diff --git a/examples/features/standard/queue/readme.md 
b/examples/features/standard/queue/readme.md
index ab22a598..4f00c758 100644
--- a/examples/features/standard/queue/readme.md
+++ b/examples/features/standard/queue/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to send and receive a message to a JMS Queue using 
ActiveMQ Artemis.
+This example shows you how to send and receive a message to a JMS Queue using 
Apache Artemis.
 
 Queues are a standard part of JMS, please consult the JMS 1.1 specification 
for full details.
 
diff --git a/examples/features/standard/reattach-node/readme.md 
b/examples/features/standard/reattach-node/readme.md
index 903e079f..15305640 100644
--- a/examples/features/standard/reattach-node/readme.md
+++ b/examples/features/standard/reattach-node/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example demonstrates how ActiveMQ Artemis connections can be configured 
to be resilient to temporary network failures.
+This example demonstrates how Apache Artemis connections can be configured to 
be resilient to temporary network failures.
 
 In the case of a network failure being detected, either as a result of a 
failure to read/write to the connection, or the failure of a pong to arrive 
back from the broker in good time after a ping is sent, instead of failing the 
connection immediately and notifying any user ExceptionListener objects, 
ActiveMQ can be configured to automatically retry the connection, and reattach 
to the broker when it becomes available again across the network.
 
@@ -18,4 +18,4 @@ We then wait a few seconds, then restart the acceptor. The 
client reattaches and
 
 The JMS Connection Factory is configured to reattach automatically by 
specifying the various reconnect related attributes in the connection URL in 
`jndi.properties`.
 
-For more details on how to configure this and for clustering in general please 
consult the ActiveMQ Artemis user manual.
\ No newline at end of file
+For more details on how to configure this and for clustering in general please 
consult the Apache Artemis user manual.
\ No newline at end of file
diff --git a/examples/features/standard/scheduled-message/readme.md 
b/examples/features/standard/scheduled-message/readme.md
index 5b970c8d..a1649821 100644
--- a/examples/features/standard/scheduled-message/readme.md
+++ b/examples/features/standard/scheduled-message/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to send a scheduled message to a JMS Queue using 
ActiveMQ Artemis.
+This example shows you how to send a scheduled message to a JMS Queue using 
Apache Artemis.
 
 A Scheduled Message is a message that will be delivered at a time specified by 
the sender. To do this, simply set a 
`org.apache.activemq.artemis.api.core.Message.HDR_SCHEDULED_DELIVERY_TIME` 
header property. The value of the property should be the time of delivery in 
milliseconds.
 
diff --git a/examples/features/standard/security-ldap/readme.md 
b/examples/features/standard/security-ldap/readme.md
index 6916f2f3..3ccdf7f2 100644
--- a/examples/features/standard/security-ldap/readme.md
+++ b/examples/features/standard/security-ldap/readme.md
@@ -6,13 +6,13 @@ To run the example, simply type **mvn verify** from this 
directory, or **mvn -Pn
 
 **Note:** The logging from the embedded Apache DS LDAP server is verbose and 
it may appear that there are errors, but these logs can be ignored.
 
-This example shows how to configure and use security using ActiveMQ Artemis 
and the Apache DS LDAP server.
+This example shows how to configure and use security using Apache Artemis and 
the Apache DS LDAP server.
 
-With security properly configured, ActiveMQ Artemis can restrict client access 
to its resources, including connection creation, message sending/receiving, 
etc. This is done by configuring users and roles as well as permissions in the 
configuration files.
+With security properly configured, Apache Artemis can restrict client access 
to its resources, including connection creation, message sending/receiving, 
etc. This is done by configuring users and roles as well as permissions in the 
configuration files.
 
-ActiveMQ Artemis supports wild-card security configuration. This feature makes 
security configuration very flexible and enables fine-grained control over 
permissions in an efficient way.
+Apache Artemis supports wild-card security configuration. This feature makes 
security configuration very flexible and enables fine-grained control over 
permissions in an efficient way.
 
-For a full description of how to configure security with ActiveMQ Artemis, 
please consult the user manual.
+For a full description of how to configure security with Apache Artemis, 
please consult the user manual.
 
 This example demonstrates how to configure users/roles in the Apache DS LDAP 
server, how to configure topics with proper permissions using wild-card 
expressions, and how they take effects in a simple program.
 
@@ -83,7 +83,7 @@ Users and roles are configured in Apache DS. The 
SecurityExample class will star
          objectClass: groupOfNames
          objectClass: top`
 
-User name and password consists of a valid account that can be used to 
establish connections to a ActiveMQ Artemis server, while roles are used in 
controlling the access privileges against ActiveMQ Artemis topics and queues. 
You can achieve this control by configuring proper permissions in `broker.xml`, 
like the following
+User name and password consists of a valid account that can be used to 
establish connections to a Apache Artemis server, while roles are used in 
controlling the access privileges against Apache Artemis topics and queues. You 
can achieve this control by configuring proper permissions in `broker.xml`, 
like the following
 
 <security-settings>
     <!-- any user can have full control of generic topics -->
diff --git a/examples/features/standard/security/readme.md 
b/examples/features/standard/security/readme.md
index e7d87131..1f1aaad9 100644
--- a/examples/features/standard/security/readme.md
+++ b/examples/features/standard/security/readme.md
@@ -4,13 +4,13 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows how to configure and use security using ActiveMQ Artemis.
+This example shows how to configure and use security using Apache Artemis.
 
-With security properly configured, ActiveMQ Artemis can restrict client access 
to its resources, including connection creation, message sending/receiving, 
etc. This is done by configuring users and roles as well as permissions in the 
configuration files.
+With security properly configured, Apache Artemis can restrict client access 
to its resources, including connection creation, message sending/receiving, 
etc. This is done by configuring users and roles as well as permissions in the 
configuration files.
 
-ActiveMQ Artemis supports wild-card security configuration. This feature makes 
security configuration very flexible and enables fine-grained control over 
permissions in an efficient way.
+Apache Artemis supports wild-card security configuration. This feature makes 
security configuration very flexible and enables fine-grained control over 
permissions in an efficient way.
 
-For a full description of how to configure security with ActiveMQ Artemis, 
please consult the user manual.
+For a full description of how to configure security with Apache Artemis, 
please consult the user manual.
 
 This example demonstrates how to configure users/roles, how to configure 
topics with proper permissions using wild-card expressions, and how they take 
effects in a simple program.
 
@@ -28,7 +28,7 @@ The `artemis-roles.properties` file follows the syntax of 
<role>=<users> where <
     news-user=frank,sam
     us-user=frank
 
-User name and password consists of a valid account that can be used to 
establish connections to a ActiveMQ Artemis server, while roles are used in 
controlling the access privileges against ActiveMQ Artemis topics and queues. 
You can achieve this control by configuring proper permissions in `broker.xml`, 
like the following
+User name and password consists of a valid account that can be used to 
establish connections to a Apache Artemis server, while roles are used in 
controlling the access privileges against Apache Artemis topics and queues. You 
can achieve this control by configuring proper permissions in `broker.xml`, 
like the following
 
     <security-settings>
        <!-- any user can have full control of generic topics -->
diff --git a/examples/features/standard/send-acknowledgements/readme.md 
b/examples/features/standard/send-acknowledgements/readme.md
index 0a98ae15..f629da35 100644
--- a/examples/features/standard/send-acknowledgements/readme.md
+++ b/examples/features/standard/send-acknowledgements/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-Asynchronous Send Acknowledgements are an advanced feature of ActiveMQ Artemis 
which allow you to receive acknowledgements that messages were successfully 
received at the broker in a separate thread to the sending thread
+Asynchronous Send Acknowledgements are an advanced feature of Apache Artemis 
which allow you to receive acknowledgements that messages were successfully 
received at the broker in a separate thread to the sending thread
 
 In this example we create a normal JMS session, then set a 
SendAcknowledgementHandler on the JMS session's underlying core session. We 
send many messages to the broker without blocking and asynchronously receive 
send acknowledgements via the SendAcknowledgementHandler.
 
diff --git a/examples/features/standard/spring-boot-integration/readme.md 
b/examples/features/standard/spring-boot-integration/readme.md
index 7a818577..2cd1785f 100644
--- a/examples/features/standard/spring-boot-integration/readme.md
+++ b/examples/features/standard/spring-boot-integration/readme.md
@@ -1,4 +1,4 @@
-# ActiveMQ Artemis Spring Boot Example
+# Apache Artemis Spring Boot Example
 
 If you have not already done so, [prepare the broker 
distribution](../../../../README.md#getting-started) before running the example.
 
diff --git a/examples/features/standard/spring-integration/readme.md 
b/examples/features/standard/spring-integration/readme.md
index b61369da..f418478a 100644
--- a/examples/features/standard/spring-integration/readme.md
+++ b/examples/features/standard/spring-integration/readme.md
@@ -1,7 +1,7 @@
-# ActiveMQ Artemis Spring Example
+# Apache Artemis Spring Example
 
 If you have not already done so, [prepare the broker 
distribution](../../../../README.md#getting-started) before running the example.
 
 To run the example, simply type **mvn verify** from this directory
 
-This examples shows how to setup and run an embedded broker within a Spring 
ApplicationContext using ActiveMQ Artemis along with ActiveMQ Artemis 
configuration files.
\ No newline at end of file
+This examples shows how to setup and run an embedded broker within a Spring 
ApplicationContext using Apache Artemis along with Apache Artemis configuration 
files.
\ No newline at end of file
diff --git a/examples/features/standard/ssl-enabled-crl-mqtt/readme.md 
b/examples/features/standard/ssl-enabled-crl-mqtt/readme.md
index 23959788..c7843ded 100644
--- a/examples/features/standard/ssl-enabled-crl-mqtt/readme.md
+++ b/examples/features/standard/ssl-enabled-crl-mqtt/readme.md
@@ -1,4 +1,4 @@
-# ActiveMQ Artemis MQTT CRL Example
+# Apache Artemis MQTT CRL Example
 
 If you have not already done so, [prepare the broker 
distribution](../../../../README.md#getting-started) before running the example.
 
@@ -101,4 +101,4 @@ openssl pkcs12 -in client-ca-keystore.p12 -nodes -nocerts 
-out client-ca.pem -pa
 echo 00 > openssl-crlnumber
 openssl ca -config openssl.conf -revoke other-client.crt -keyfile 
client-ca.pem -cert client-ca.crt
 openssl ca -config openssl.conf -gencrl -keyfile client-ca.pem -cert 
client-ca.crt -out other-client-crl.pem -crldays $VALIDITY
-```
\ No newline at end of file
+```
diff --git 
a/examples/features/standard/ssl-enabled-dual-authentication/readme.md 
b/examples/features/standard/ssl-enabled-dual-authentication/readme.md
index c6802250..9cd6f190 100644
--- a/examples/features/standard/ssl-enabled-dual-authentication/readme.md
+++ b/examples/features/standard/ssl-enabled-dual-authentication/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to configure 2-way SSL along with 2 different 
authentications mechanisms so that SSL and non-SSL clients can send and consume 
messages to/from ActiveMQ Artemis. The non-SSL authentication mechanism simply 
uses username and password. The SSL authentication mechanism uses the client's 
certificate.
+This example shows you how to configure 2-way SSL along with 2 different 
authentications mechanisms so that SSL and non-SSL clients can send and consume 
messages to/from Apache Artemis. The non-SSL authentication mechanism simply 
uses username and password. The SSL authentication mechanism uses the client's 
certificate.
 
 To configure 2-way SSL you need to configure the acceptor as follows:
 
diff --git a/examples/features/standard/ssl-enabled/readme.md 
b/examples/features/standard/ssl-enabled/readme.md
index b5afbb02..fbb9b596 100644
--- a/examples/features/standard/ssl-enabled/readme.md
+++ b/examples/features/standard/ssl-enabled/readme.md
@@ -4,9 +4,9 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to configure SSL with ActiveMQ Artemis to send and 
receive message.
+This example shows you how to configure SSL with Apache Artemis to send and 
receive message.
 
-Using SSL can make your messaging applications interact with ActiveMQ Artemis 
securely. An application can be secured transparently without extra coding 
effort. To secure your messaging application with SSL, you need to configure 
connector and acceptor as follows:
+Using SSL can make your messaging applications interact with Apache Artemis 
securely. An application can be secured transparently without extra coding 
effort. To secure your messaging application with SSL, you need to configure 
connector and acceptor as follows:
 
     <acceptor 
name="netty-ssl-acceptor">tcp://localhost:5500?sslEnabled=true;keyStorePath=server-keystore.jks;keyStorePassword=securepass</acceptor>
 
diff --git a/examples/features/standard/static-selector/readme.md 
b/examples/features/standard/static-selector/readme.md
index 5607c60e..f4d8a5a8 100644
--- a/examples/features/standard/static-selector/readme.md
+++ b/examples/features/standard/static-selector/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to configure a ActiveMQ Artemis queue with static 
message selectors (filters).
+This example shows you how to configure a Apache Artemis queue with static 
message selectors (filters).
 
 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, broker.xml, as an element called `filter` inside each queue definition, 
like
 
diff --git a/examples/features/standard/temp-queue/readme.md 
b/examples/features/standard/temp-queue/readme.md
index b41976cc..ea01dbc2 100644
--- a/examples/features/standard/temp-queue/readme.md
+++ b/examples/features/standard/temp-queue/readme.md
@@ -4,6 +4,6 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to use a TemporaryQueue with ActiveMQ Artemis. 
First a temporary queue is created to send and receive a message and then 
deleted. Then another temporary queue is created and used after its connection 
is closed to illustrate its scope.
+This example shows you how to use a TemporaryQueue with Apache Artemis. First 
a temporary queue is created to send and receive a message and then deleted. 
Then another temporary queue is created and used after its connection is closed 
to illustrate its scope.
 
 A TemporaryQueue is a JMS queue that exists only within the lifetime of its 
connection. It is often used in request-reply type messaging where the reply is 
sent through a temporary destination. The temporary queue is often created as a 
broker resource, so after using, the user should call delete() method to 
release the resources. Please consult the JMS 1.1 specification for full 
details.
\ No newline at end of file
diff --git a/examples/features/standard/topic-hierarchies/readme.md 
b/examples/features/standard/topic-hierarchies/readme.md
index b69048a5..8fe190ae 100644
--- a/examples/features/standard/topic-hierarchies/readme.md
+++ b/examples/features/standard/topic-hierarchies/readme.md
@@ -4,9 +4,9 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-ActiveMQ Artemis supports topic hierarchies. With a topic hierarchy you can 
register a subscriber with a wild-card and that subscriber will receive any 
messages routed to an address that match the wildcard.
+Apache Artemis supports topic hierarchies. With a topic hierarchy you can 
register a subscriber with a wild-card and that subscriber will receive any 
messages routed to an address that match the wildcard.
 
-ActiveMQ Artemis wild-cards can use the character `#` which means "match any 
number of words", and the character `*` which means "match a single word". 
Words are delimited by the character `.`.
+Apache Artemis wild-cards can use the character `#` which means "match any 
number of words", and the character `*` which means "match a single word". 
Words are delimited by the character `.`.
 
 For example if I subscribe using the wild-card `news.europe.#`, then that 
would match messages sent to the addresses `news.europe`, `news.europe.sport` 
and `news.europe.entertainment`, but it does not match messages sent to the 
address `news.usa.wrestling`.
 
diff --git a/examples/features/standard/topic/readme.md 
b/examples/features/standard/topic/readme.md
index 83de1e8f..c26cea15 100644
--- a/examples/features/standard/topic/readme.md
+++ b/examples/features/standard/topic/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to send and receive a message to a JMS Topic with 
ActiveMQ Artemis.
+This example shows you how to send and receive a message to a JMS Topic with 
Apache Artemis.
 
 Topics are a standard part of JMS, please consult the JMS 1.1 specification 
for full details.
 
diff --git a/examples/features/standard/transactional/readme.md 
b/examples/features/standard/transactional/readme.md
index 4df51c49..af8d3cf0 100644
--- a/examples/features/standard/transactional/readme.md
+++ b/examples/features/standard/transactional/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to use a transacted Session with ActiveMQ Artemis.
+This example shows you how to use a transacted Session with Apache Artemis.
 
 Firstly 2 messages are sent via the transacted sending session before being 
committed. This ensures that both message are sent
 
diff --git a/examples/features/standard/xa-heuristic/readme.md 
b/examples/features/standard/xa-heuristic/readme.md
index c23b6f5b..29ba12ee 100644
--- a/examples/features/standard/xa-heuristic/readme.md
+++ b/examples/features/standard/xa-heuristic/readme.md
@@ -4,10 +4,10 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to make an XA heuristic decision through the 
ActiveMQ Artemis Management Interface.
+This example shows you how to make an XA heuristic decision through the Apache 
Artemis Management Interface.
 
 A heuristic decision is a unilateral decision to commit or rollback an XA 
transaction branch after it has been prepared.
 
 In this example we simulate a transaction manager to control the transactions. 
First we create an XASession and enlist it in a transaction through its 
XAResource. We then send a text message, 'hello' and end/prepare the 
transaction on the XAResource, but neither commit nor roll back the 
transaction. Another transaction is created and associated with the same 
XAResource, and a second message, 'world' is sent on behalf of the second 
transaction. Again we leave the second transaction in pre [...]
 
-This example uses JMX to manipulate transactions in a ActiveMQ Artemis Server. 
For details on JMX facilities with ActiveMQ Artemis, please look at the JMX 
Example.
\ No newline at end of file
+This example uses JMX to manipulate transactions in a Apache Artemis Server. 
For details on JMX facilities with Apache Artemis, please look at the JMX 
Example.
\ No newline at end of file
diff --git a/examples/features/standard/xa-receive/readme.md 
b/examples/features/standard/xa-receive/readme.md
index f45d5d3c..5632258a 100644
--- a/examples/features/standard/xa-receive/readme.md
+++ b/examples/features/standard/xa-receive/readme.md
@@ -6,6 +6,6 @@ To run the example, simply type **mvn verify** from this 
directory, or **mvn -Pn
 
 This example demonstrates receiving a message within the scope of an XA 
transaction. When using an XA transaction the message will only be acknowledged 
and removed from the queue when the transaction is committed. If the 
transaction is not committed the message maybe redelivered after rollback or 
during XA recovery.
 
-ActiveMQ Artemis is JTA aware, meaning you can use ActiveMQ Artemis in an XA 
transactional environment and participate in XA transactions. It provides the 
javax.transaction.xa.XAResource interface for that purpose. Users can get a 
XAConnectionFactory to create XAConnections and XASessions.
+Apache Artemis is JTA aware, meaning you can use Apache Artemis in an XA 
transactional environment and participate in XA transactions. It provides the 
javax.transaction.xa.XAResource interface for that purpose. Users can get a 
XAConnectionFactory to create XAConnections and XASessions.
 
 In this example we simulate a transaction manager to control the transactions. 
First we create an XASession for receiving and a normal session for sending. 
Then we start a new xa transaction and enlist the receiving XASession through 
its XAResource. We then send two words, 'hello' and 'world', receive them, and 
let the transaction roll back. The received messages are cancelled back to the 
queue. Next we start a new transaction with the same XAResource enlisted, but 
this time we commit th [...]
\ No newline at end of file
diff --git a/examples/features/standard/xa-send/readme.md 
b/examples/features/standard/xa-send/readme.md
index 08ee57c9..86c0a54d 100644
--- a/examples/features/standard/xa-send/readme.md
+++ b/examples/features/standard/xa-send/readme.md
@@ -4,8 +4,8 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how message sending behaves in an XA transaction in 
ActiveMQ Artemis. When a message is sent within the scope of an XA transaction, 
it will only reach the queue once the transaction is committed. If the 
transaction is rolled back the sent messages will be discarded by the server.
+This example shows you how message sending behaves in an XA transaction in 
Apache Artemis. When a message is sent within the scope of an XA transaction, 
it will only reach the queue once the transaction is committed. If the 
transaction is rolled back the sent messages will be discarded by the server.
 
-ActiveMQ Artemis is JTA aware, meaning you can use ActiveMQ Artemis in a XA 
transactional environment and participate in XA transactions. It provides the 
`javax.transaction.xa.XAResource` interface for that purpose. Users can get a 
XAConnectionFactory to create XAConnections and XASessions.
+Apache Artemis is JTA aware, meaning you can use Apache Artemis in a XA 
transactional environment and participate in XA transactions. It provides the 
`javax.transaction.xa.XAResource` interface for that purpose. Users can get a 
XAConnectionFactory to create XAConnections and XASessions.
 
 In this example we simulate a transaction manager to control the transactions. 
First we create an XASession and enlist it in a transaction through its 
XAResource. We then send two words, `hello` and `world`, with the session, let 
the transaction roll back. The messages are discarded and never be received. 
Next we start a new transaction with the same XAResource, but this time we 
commit the transaction. Both messages are received.
\ No newline at end of file
diff --git 
a/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge/readme.md
 
b/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge/readme.md
index cdf9cab8..a561054e 100644
--- 
a/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge/readme.md
+++ 
b/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge/readme.md
@@ -11,7 +11,7 @@ This example however is just focusing on integration with 5.x.
 ##Prerequisites
 
 - install ActiveMQ 5.x
-- install ActiveMQ Artemis
+- install Apache Artemis
 
 ##Preparing
 
@@ -62,7 +62,7 @@ This approach might be preferred if for example you only have 
access to the 5.x
 ## Prerequisites
 
 - install ActiveMQ 5.x
-- install ActiveMQ Artemis
+- install Apache Artemis
 
 ## Preparing
 
@@ -144,5 +144,5 @@ Send some messages to the ActiveMQ 5.x broker.
 
 `$5X_HOME/bin/activemq producer --user admin --password password --destination 
queue://TEST.FOO`
 
-Log into the ActiveMQ Artemis console and browse the messages in the 
`TEST.FOO` queue.
+Log into the Apache Artemis console and browse the messages in the `TEST.FOO` 
queue.
 
diff --git a/examples/features/sub-modules/tomcat/readme.md 
b/examples/features/sub-modules/tomcat/readme.md
index dfc84624..8ca1c9ff 100644
--- a/examples/features/sub-modules/tomcat/readme.md
+++ b/examples/features/sub-modules/tomcat/readme.md
@@ -1,14 +1,14 @@
-# Apache ActiveMQ Artemis Tomcat Integration JNDI Resources Sample
+# Apache Apache Artemis Tomcat Integration JNDI Resources Sample
 
 This is a Sample Tomcat application showing JNDI resource in tomcat 
context.xml for ConnectionFactory 
-and Destination for Apache ActiveMQ Artemis.
+and Destination for Apache Apache Artemis.
 
 The sample context.xml used by the tomcat in this example can be found under:
 /src/tomcat7-maven-plugin/resources/context.xml
 
 To run 
 
-start Apache ActiveMQ Artemis on port 61616
+start Apache Apache Artemis on port 61616
  
 then
 
diff --git a/examples/perf/jmeter/readme.md b/examples/perf/jmeter/readme.md
index 0c99ec31..f8c3b942 100644
--- a/examples/perf/jmeter/readme.md
+++ b/examples/perf/jmeter/readme.md
@@ -1,4 +1,4 @@
-#Running the ActiveMQ Artemis JMeter Performance Testing Examples
+#Running the Apache Artemis JMeter Performance Testing Examples
 
 ##Create and run a sample broker for performance testing:
 
diff --git a/examples/protocols/amqp/proton-clustered-cpp/readme.md 
b/examples/protocols/amqp/proton-clustered-cpp/readme.md
index 8e87fed4..30616b96 100644
--- a/examples/protocols/amqp/proton-clustered-cpp/readme.md
+++ b/examples/protocols/amqp/proton-clustered-cpp/readme.md
@@ -1,6 +1,6 @@
 # AMQP CPP example
 
-ActiveMQ Artemis is a multi protocol broker. It will inspect the initial 
handshake of clients to determine what protocol to use.
+Apache Artemis is a multi protocol broker. It will inspect the initial 
handshake of clients to determine what protocol to use.
 
 All you need to do is to connect a client into activemq's configured port and 
you should be able connect.
 
@@ -19,9 +19,9 @@ To run this example simply run the command **mvn verify 
-Pexample**, execute the
     [proton-cpp]$ ./compile.sh
     [proton-cpp]$ ./hello
 
-You don't need to do anything special to configure the ActiveMQ Artemis broker 
to accept AMQP clients.
+You don't need to do anything special to configure the Apache Artemis broker 
to accept AMQP clients.
 
-Just for the sake of documentation though we are setting the port of ActiveMQ 
Artemis on this example as 5672 which is the port qpid have by default.
+Just for the sake of documentation though we are setting the port of Apache 
Artemis on this example as 5672 which is the port qpid have by default.
 
 This is totally optional and you don't need to follow this convention. You can 
use any port you chose including ActiveMQ's 61616 default port
 
diff --git a/examples/protocols/amqp/proton-cpp/readme.md 
b/examples/protocols/amqp/proton-cpp/readme.md
index 4b8a0565..3da5f8d9 100644
--- a/examples/protocols/amqp/proton-cpp/readme.md
+++ b/examples/protocols/amqp/proton-cpp/readme.md
@@ -1,6 +1,6 @@
 # AMQP CPP example
 
-ActiveMQ Artemis is a multi protocol broker. It will inspect the initial 
handshake of clients to determine what protocol to use.
+Apache Artemis is a multi protocol broker. It will inspect the initial 
handshake of clients to determine what protocol to use.
 
 All you need to do is to connect a client into ActiveMQ's configured port and 
you should be able connect.
 
@@ -19,9 +19,9 @@ To run this example simply run the command **mvn verify 
-Pexample**, execute the
     [proton-cpp]$ ./compile.sh
     [proton-cpp]$ ./hello
 
-You don't need to do anything special to configure the ActiveMQ Artemis broker 
to accept AMQP clients.
+You don't need to do anything special to configure the Apache Artemis broker 
to accept AMQP clients.
 
-Just for the sake of documentation though we are setting the port of ActiveMQ 
Artemis on this example as 5672 which is the port qpid have by default.
+Just for the sake of documentation though we are setting the port of Apache 
Artemis on this example as 5672 which is the port qpid have by default.
 
 This is totally optional and you don't need to follow this convention. You can 
use any port you chose including ActiveMQ's 61616 default port:
 
diff --git a/examples/protocols/amqp/proton-ruby/readme.md 
b/examples/protocols/amqp/proton-ruby/readme.md
index 8e010562..c8a0cd47 100644
--- a/examples/protocols/amqp/proton-ruby/readme.md
+++ b/examples/protocols/amqp/proton-ruby/readme.md
@@ -1,6 +1,6 @@
 # Proton Ruby Example
 
-ActiveMQ Artemis can be configured to accept requests from any AMQP client 
that supports the 1.0 version of the protocol. This example shows a simply 
proton ruby client that sends and receives messages.
+Apache Artemis can be configured to accept requests from any AMQP client that 
supports the 1.0 version of the protocol. This example shows a simply proton 
ruby client that sends and receives messages.
 
 To run the example you will need the following packages installed, 
alsa-lib.i686 libXv.i686 libXScrnSaver.i686 qt.i686 qt-x11.i686 
qtwebkit-2.2.2-2.fc18.i686, gcc, ruby.
 
@@ -10,7 +10,7 @@ you will also need the qpid-proton libraries installed, again 
`yum install qpid-
 
 lastly you wull have to create the gems `gem install qpid_proton`.
 
-To configure ActiveMQ Artemis to accept AMQP client connections you need to 
add an Acceptor like so:
+To configure Apache Artemis to accept AMQP client connections you need to add 
an Acceptor like so:
 
     <acceptor 
name="proton-acceptor">tcp://localhost:5672?protocols=AMQP</acceptor>
 
diff --git a/examples/protocols/amqp/sasl-scram/readme.md 
b/examples/protocols/amqp/sasl-scram/readme.md
index 6f5857b8..48f2c85e 100644
--- a/examples/protocols/amqp/sasl-scram/readme.md
+++ b/examples/protocols/amqp/sasl-scram/readme.md
@@ -5,7 +5,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** 
 if you want to start and create the broker manually.
 
-This example demonstrates the usage of SCRAM-SHA SASL authentication with 
ActiveMQ Artemis and AMQP clients.
+This example demonstrates the usage of SCRAM-SHA SASL authentication with 
Apache Artemis and AMQP clients.
 
 Of note is the AMQP acceptor configuration restricting the offered mechanisms 
to SCRAM-SHA-256, and the reference
 to the login config scope ``amqp-sasl-scram`` that holds the relevant SCRAM 
login module.
diff --git a/examples/protocols/mqtt/clustered-queue-mqtt/readme.md 
b/examples/protocols/mqtt/clustered-queue-mqtt/readme.md
index 204ef5ae..e0da34fa 100644
--- a/examples/protocols/mqtt/clustered-queue-mqtt/readme.md
+++ b/examples/protocols/mqtt/clustered-queue-mqtt/readme.md
@@ -10,4 +10,4 @@ We then create an MQTT subscriber on the queue on each node, 
and we create a pro
 
 We then send some messages via the producer, and we verify that **both** 
subscribers receive the sent messages.
 
-For more information on ActiveMQ Artemis clustering please see the clustering 
section of the user manual.
\ No newline at end of file
+For more information on Apache Artemis clustering please see the clustering 
section of the user manual.
\ No newline at end of file
diff --git a/examples/protocols/openwire/queue/readme.md 
b/examples/protocols/openwire/queue/readme.md
index 605765ac..acd55559 100644
--- a/examples/protocols/openwire/queue/readme.md
+++ b/examples/protocols/openwire/queue/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to send and receive a message to a JMS queue using 
ActiveMQ Artemis.
+This example shows you how to send and receive a message to a JMS queue using 
Apache Artemis.
 
 This example does exactly the same as the "queue" example however using the 
OpenWire client.
 
diff --git a/examples/protocols/stomp/stomp-dual-authentication/readme.md 
b/examples/protocols/stomp/stomp-dual-authentication/readme.md
index 1ca5adb1..7aedb041 100644
--- a/examples/protocols/stomp/stomp-dual-authentication/readme.md
+++ b/examples/protocols/stomp/stomp-dual-authentication/readme.md
@@ -4,7 +4,7 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to configure 2-way SSL along with 2 different 
authentications mechanisms so that SSL and non-SSL clients can send and consume 
messages to/from ActiveMQ Artemis. The non-SSL authentication mechanism simply 
uses username and password. The SSL authentication mechanism uses the client's 
certificate. The Stomp client uses SSL socket directly to send a message. Then 
a JMS client will use a non-SSL connection to consume it.
+This example shows you how to configure 2-way SSL along with 2 different 
authentications mechanisms so that SSL and non-SSL clients can send and consume 
messages to/from Apache Artemis. The non-SSL authentication mechanism simply 
uses username and password. The SSL authentication mechanism uses the client's 
certificate. The Stomp client uses SSL socket directly to send a message. Then 
a JMS client will use a non-SSL connection to consume it.
 
 The various keystore files are generated using the following commands:
 
diff --git a/examples/protocols/stomp/stomp-embedded-interceptor/readme.md 
b/examples/protocols/stomp/stomp-embedded-interceptor/readme.md
index cd434aab..cf195355 100644
--- a/examples/protocols/stomp/stomp-embedded-interceptor/readme.md
+++ b/examples/protocols/stomp/stomp-embedded-interceptor/readme.md
@@ -4,6 +4,6 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify -Pexample** from this directory.
 
-This example shows you how to configure ActiveMQ Artemis to intercept received 
Stomp messages.
+This example shows you how to configure Apache Artemis to intercept received 
Stomp messages.
 
 The client will open a socket to initiate a Stomp 1.2 connection and then send 
one Stomp message (using TCP directly). The interceptor will print each message 
received.
\ No newline at end of file
diff --git a/examples/protocols/stomp/stomp-jms/readme.md 
b/examples/protocols/stomp/stomp-jms/readme.md
index 96bdb781..94e7b88c 100644
--- a/examples/protocols/stomp/stomp-jms/readme.md
+++ b/examples/protocols/stomp/stomp-jms/readme.md
@@ -4,4 +4,4 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to configure ActiveMQ Artemis to send and receive 
Stomp messages using Stomp 1.2 protocol via the JMS API using the 
[stomp-jms](https://github.com/fusesource/stompjms) client.
\ No newline at end of file
+This example shows you how to configure Apache Artemis to send and receive 
Stomp messages using Stomp 1.2 protocol via the JMS API using the 
[stomp-jms](https://github.com/fusesource/stompjms) client.
\ No newline at end of file
diff --git a/examples/protocols/stomp/stomp-websockets/readme.md 
b/examples/protocols/stomp/stomp-websockets/readme.md
index 560b0781..372a51c7 100644
--- a/examples/protocols/stomp/stomp-websockets/readme.md
+++ b/examples/protocols/stomp/stomp-websockets/readme.md
@@ -4,13 +4,13 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to configure ActiveMQ Artemis to send and receive 
Stomp messages from modern web browser using Web Sockets.
+This example shows you how to configure Apache Artemis to send and receive 
Stomp messages from modern web browser using Web Sockets.
 
-The example will start a ActiveMQ Artemis broker configured with Stomp over 
Web Sockets and JMS. Web browsers clients and Java application will exchange 
message using a JMS Topic.
+The example will start a Apache Artemis broker configured with Stomp over Web 
Sockets and JMS. Web browsers clients and Java application will exchange 
message using a JMS Topic.
 
 ## Example step-by-step
 
-To subscribe to the topic from your web browser, open the [Chat 
Example](chat/index.html) from another tab. The chat example is preconfigured 
to connect to the ActiveMQ Artemis broker with the URL `ws://localhost:61613` 
and subscribe to the JMS Topic (through its core address `chat`).
+To subscribe to the topic from your web browser, open the [Chat 
Example](chat/index.html) from another tab. The chat example is preconfigured 
to connect to the Apache Artemis broker with the URL `ws://localhost:61613` and 
subscribe to the JMS Topic (through its core address `chat`).
 
 You can open as many Web clients as you want and they will all exchange 
messages through the topic
 
diff --git a/examples/protocols/stomp/stomp/readme.md 
b/examples/protocols/stomp/stomp/readme.md
index 100e0c75..c5383cb8 100644
--- a/examples/protocols/stomp/stomp/readme.md
+++ b/examples/protocols/stomp/stomp/readme.md
@@ -4,6 +4,6 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to configure ActiveMQ Artemis to send and receive 
Stomp messages.
+This example shows you how to configure Apache Artemis to send and receive 
Stomp messages.
 
 The client will open a socket to send one Stomp message (using TCP directly). 
The client will then consume a message from a queue and check it is the message 
sent with Stomp.
\ No newline at end of file
diff --git a/examples/protocols/stomp/stomp1.1/readme.md 
b/examples/protocols/stomp/stomp1.1/readme.md
index 2b9c3c4a..ad253ab4 100644
--- a/examples/protocols/stomp/stomp1.1/readme.md
+++ b/examples/protocols/stomp/stomp1.1/readme.md
@@ -4,6 +4,6 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to configure ActiveMQ Artemis to send and receive 
Stomp messages using Stomp 1.1 protocol.
+This example shows you how to configure Apache Artemis to send and receive 
Stomp messages using Stomp 1.1 protocol.
 
 The client will open a socket to initiate a Stomp 1.1 connection and then send 
one Stomp message (using TCP directly). The client will then consume a message 
from a queue and check it is the message sent with Stomp.
\ No newline at end of file
diff --git a/examples/protocols/stomp/stomp1.2/readme.md 
b/examples/protocols/stomp/stomp1.2/readme.md
index 0f6d013f..db25db3e 100644
--- a/examples/protocols/stomp/stomp1.2/readme.md
+++ b/examples/protocols/stomp/stomp1.2/readme.md
@@ -4,6 +4,6 @@ If you have not already done so, [prepare the broker 
distribution](../../../../R
 
 To run the example, simply type **mvn verify** from this directory, or **mvn 
-PnoServer verify** if you want to start and create the broker manually.
 
-This example shows you how to configure ActiveMQ Artemis to send and receive 
Stomp messages using Stomp 1.2 protocol.
+This example shows you how to configure Apache Artemis to send and receive 
Stomp messages using Stomp 1.2 protocol.
 
 The client will open a socket to initiate a Stomp 1.2 connection and then send 
one Stomp message (using TCP directly). The client will then consume a message 
from a queue and check it is the message sent with Stomp.
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to