diff --git a/artemis-cli/src/main/filtered-resources/org/apache/activemq/artemis/cli/banner.txt b/artemis-cli/src/main/filtered-resources/org/apache/activemq/artemis/cli/banner.txt
index 7b6aadeb2c3..76c7b02993d 100644
--- a/artemis-cli/src/main/filtered-resources/org/apache/activemq/artemis/cli/banner.txt
+++ b/artemis-cli/src/main/filtered-resources/org/apache/activemq/artemis/cli/banner.txt
@@ -3,6 +3,6 @@
    / _ \|  _ \ __|/ _ \  \/  | |/  __/
   / ___ \ | \/ |_/  __/ |\/| | |\___ \
  /_/   \_\|   \__\____|_|  |_|_|/___ /
- Apache ActiveMQ Artemis ${project.version}
+ Apache Artemis ${project.version}
 
 
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
index b6a2e82fdae..f460f6e986b 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
@@ -70,7 +70,7 @@
  * Notice that this class should not use any logging as it's part of the bootstrap and using logging here could disrupt
  * the order of bootstrapping on certain components (e.g. JMX being started from log4j)
  */
-@Command(name = "artemis", description = "ActiveMQ Artemis Command Line")
+@Command(name = "artemis", description = "Apache Artemis Command Line")
 public class Artemis implements Runnable {
 
 
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index 8cb987bb93f..3e726c4ed9b 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -595,7 +595,7 @@ public Object run(ActionContext context) throws Exception {
          allowAnonymous = Boolean.FALSE;
       }
 
-      context.out.println(String.format("Creating ActiveMQ Artemis instance at: %s", directory.getCanonicalPath()));
+      context.out.println(String.format("Creating Apache Artemis instance at: %s", directory.getCanonicalPath()));
 
       Map<String, String> filters = new LinkedHashMap<>();
 
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/InstallAbstract.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/InstallAbstract.java
index 2dd3bb216bb..539de4f204a 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/InstallAbstract.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/InstallAbstract.java
@@ -42,13 +42,13 @@ public class InstallAbstract extends InputAbstract {
    @Parameters(description = "The instance directory to hold the broker's configuration and data. Path must be writable.")
    protected File directory;
 
-   @Option(names = "--etc", description = "Directory where ActiveMQ configuration is located. Paths can be absolute or relative to artemis.instance directory. Default: etc.")
+   @Option(names = "--etc", description = "Directory where Apache Artemis configuration is located. Paths can be absolute or relative to artemis.instance directory. Default: etc.")
    protected String etc = "etc";
 
-   @Option(names = "--data", description = "Directory where ActiveMQ data are stored. Paths can be absolute or relative to artemis.instance directory. Default: data.")
+   @Option(names = "--data", description = "Directory where Apache Artemis data is stored. Paths can be absolute or relative to artemis.instance directory. Default: data.")
    protected String data = "data";
 
-   @Option(names = "--home", description = "Directory where ActiveMQ Artemis is installed.")
+   @Option(names = "--home", description = "Directory where Apache Artemis is installed.")
    protected File home;
 
    @Option(names = "--encoding", description = "The encoding that text files should use. Default: UTF-8.")
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/PrintVersion.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/PrintVersion.java
index fc0fb48f6ca..92d6f2a4483 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/PrintVersion.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/PrintVersion.java
@@ -27,9 +27,9 @@ public class PrintVersion extends ActionAbstract {
    public Object execute(ActionContext context) throws Exception {
       Version version = VersionLoader.getVersion();
 
-      context.out.println("Apache ActiveMQ Artemis " + version.getFullVersion());
-      context.out.println("ActiveMQ Artemis home: " + this.getBrokerHome());
-      context.out.println("ActiveMQ Artemis instance: " + this.getBrokerInstance());
+      context.out.println("Apache Artemis " + version.getFullVersion());
+      context.out.println("Apache Artemis home: " + this.getBrokerHome());
+      context.out.println("Apache Artemis instance: " + this.getBrokerInstance());
 
       return version;
    }
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
index 54991e160a2..4c3780fdaea 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
@@ -65,7 +65,7 @@
 
 /**
  * Read XML output from {@code org.apache.activemq.artemis.core.persistence.impl.journal.XmlDataExporter}, create a core
- * session, and send the messages to a running instance of ActiveMQ Artemis.  It uses the StAX
+ * session, and send the messages to a running instance of Apache Artemis.  It uses the StAX
  * {@code javax.xml.stream.XMLStreamReader} for speed and simplicity.
  */
 @Command(name = "imp", description = "Import all message-data using an XML that could be interpreted by any system.")
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
index a63eef02af8..a158b496678 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
@@ -28,7 +28,7 @@ public interface ActiveMQBootstrapLogger {
 
    ActiveMQBootstrapLogger LOGGER = BundleFactory.newBundle(ActiveMQBootstrapLogger.class, ActiveMQBootstrapLogger.class.getPackage().getName());
 
-   @LogMessage(id = 101000, value = "Starting ActiveMQ Artemis Server version {}", level = LogMessage.Level.INFO)
+   @LogMessage(id = 101000, value = "Starting Apache Artemis Server version {}", level = LogMessage.Level.INFO)
    void serverStarting(String version);
 
    @LogMessage(id = 104000, value = "Failed to delete file {}", level = LogMessage.Level.ERROR)
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
index d50d56e4836..b792eb88695 100755
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
@@ -18,7 +18,7 @@
 
 if [ -z "$ARTEMIS_INSTANCE" ] ; then
 
-  ## resolve links - $0 may be a link to ActiveMQ's home
+  ## resolve links - $0 may be a link to Artemis' home
   PRG="$0"
   progname=`basename "$0"`
   saveddir=`pwd`
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
index 491f881a29a..96119d7e3be 100755
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
@@ -23,7 +23,7 @@ service=`basename "$0"`
 #
 if [ -z "$ARTEMIS_INSTANCE" ] ; then
 
-  ## resolve links - $0 may be a link to ActiveMQ's home
+  ## resolve links - $0 may be a link to Artemis' home
   PRG="$0"
   saveddir=`pwd`
 
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
index 526d1612011..b48e0cb4979 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
@@ -19,8 +19,8 @@
 
 <service>
    <id>artemis-${artemis.instance.name}-${host}</id>
-   <name>ActiveMQ Artemis: ${artemis.instance.name} @ ${host}</name>
-   <description>Apache ActiveMQ Artemis is a reliable messaging broker</description>
+   <name>Apache Artemis: ${artemis.instance.name} @ ${host}</name>
+   <description>Apache Artemis is a reliable messaging broker</description>
 
    <env name="ARTEMIS_HOME" value="${artemis.home}"/>
    <env name="ARTEMIS_INSTANCE" value="@artemis.instance@"/>
@@ -35,7 +35,7 @@
    <startargument>-Xms512M</startargument>
    <startargument>-Xmx${java-memory}</startargument>
 
-   <!-- Cluster Properties: Used to pass startarguments to ActiveMQ Artemis which can be referenced in broker.xml
+   <!-- Cluster Properties: Used to pass startarguments to Apache Artemis which can be referenced in broker.xml
    <startargument>-Dartemis.remoting.default.port=61617</startargument>
    <startargument>-Dartemis.remoting.amqp.port=5673</startargument>
    <startargument>-Dartemis.remoting.stomp.port=61614</startargument>
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
index 6da714fe09a..687cdd5acf1 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
@@ -20,7 +20,7 @@ ARTEMIS_INSTANCE='@artemis.instance@'
 ARTEMIS_DATA_DIR='${artemis.instance.data}'
 ARTEMIS_OOME_DUMP='${artemis.instance.oome.dump}'
 
-# Cluster Properties: Used to pass arguments to ActiveMQ Artemis which can be referenced in broker.xml
+# Cluster Properties: Used to pass arguments to Apache Artemis which can be referenced in broker.xml
 #ARTEMIS_CLUSTER_PROPS="-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446"
 
 # Hawtio Properties
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
index 308d7951857..c5d4b0ec3e6 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
@@ -21,7 +21,7 @@ set ARTEMIS_INSTANCE="@artemis.instance@"
 set ARTEMIS_DATA_DIR="${artemis.instance.data}"
 set ARTEMIS_OOME_DUMP="${artemis.instance.oome.dump}"
 
-rem Cluster Properties: Used to pass arguments to ActiveMQ Artemis which can be referenced in broker.xml
+rem Cluster Properties: Used to pass arguments to Apache Artemis which can be referenced in broker.xml
 rem set ARTEMIS_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446
 
 rem Java Opts
diff --git a/artemis-cli/src/test/resources/broker-nojms.xml b/artemis-cli/src/test/resources/broker-nojms.xml
index 1ceecc960de..0cfbb35b975 100644
--- a/artemis-cli/src/test/resources/broker-nojms.xml
+++ b/artemis-cli/src/test/resources/broker-nojms.xml
@@ -36,7 +36,7 @@ under the License.
       </connectors>
 
       <acceptors>
-         <!-- Default ActiveMQ Artemis Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
+         <!-- Default Apache Artemis Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
          <acceptor name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</acceptor>
 
          <!-- AMQP Acceptor.  Listens on default AMQP port for AMQP traffic.-->
@@ -45,7 +45,7 @@ under the License.
          <!-- STOMP Acceptor. -->
          <acceptor name="stomp">tcp://${activemq.remoting.stomp.host:localhost}:${activemq.remoting.stomp.port:61613}?protocols=STOMP</acceptor>
 
-         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Artemis Core and STOMP for legacy HornetQ clients. -->
+         <!-- HornetQ Compatibility Acceptor.  Enables Artemis Core and STOMP for legacy HornetQ clients. -->
          <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:localhost}:${activemq.remoting.hornetq.port:5445}?protocols=CORE,STOMP</acceptor>
       </acceptors>
 
diff --git a/artemis-cli/src/test/resources/broker-reload.xml b/artemis-cli/src/test/resources/broker-reload.xml
index b89c705fe64..267af0ac35e 100644
--- a/artemis-cli/src/test/resources/broker-reload.xml
+++ b/artemis-cli/src/test/resources/broker-reload.xml
@@ -42,7 +42,7 @@ under the License.
       </connectors>
 
       <acceptors>
-         <!-- Default ActiveMQ Artemis Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
+         <!-- Default Apache Artemis Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
          <acceptor name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</acceptor>
 
          <!-- AMQP Acceptor.  Listens on default AMQP port for AMQP traffic.-->
@@ -51,7 +51,7 @@ under the License.
          <!-- STOMP Acceptor. -->
          <acceptor name="stomp">tcp://${activemq.remoting.stomp.host:localhost}:${activemq.remoting.stomp.port:61613}?protocols=STOMP</acceptor>
 
-         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Artemis Core and STOMP for legacy HornetQ clients. -->
+         <!-- HornetQ Compatibility Acceptor.  Enables Artemis Core and STOMP for legacy HornetQ clients. -->
          <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:localhost}:${activemq.remoting.hornetq.port:5445}?protocols=CORE,STOMP</acceptor>
       </acceptors>
 
diff --git a/artemis-cli/src/test/resources/broker-with-password-codec.xml b/artemis-cli/src/test/resources/broker-with-password-codec.xml
index 9240f7e5ccc..97263a64fd5 100644
--- a/artemis-cli/src/test/resources/broker-with-password-codec.xml
+++ b/artemis-cli/src/test/resources/broker-with-password-codec.xml
@@ -42,7 +42,7 @@ under the License.
       </connectors>
 
       <acceptors>
-         <!-- Default ActiveMQ Artemis Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
+         <!-- Default Apache Artemis Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
          <acceptor name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</acceptor>
 
          <!-- AMQP Acceptor.  Listens on default AMQP port for AMQP traffic.-->
@@ -51,7 +51,7 @@ under the License.
          <!-- STOMP Acceptor. -->
          <acceptor name="stomp">tcp://${activemq.remoting.stomp.host:localhost}:${activemq.remoting.stomp.port:61613}?protocols=STOMP</acceptor>
 
-         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Artemis Core and STOMP for legacy HornetQ clients. -->
+         <!-- HornetQ Compatibility Acceptor.  Enables Artemis Core and STOMP for legacy HornetQ clients. -->
          <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:localhost}:${activemq.remoting.hornetq.port:5445}?protocols=CORE,STOMP</acceptor>
       </acceptors>
 
diff --git a/artemis-cli/src/test/resources/broker.xml b/artemis-cli/src/test/resources/broker.xml
index 983b8c2328a..d41d2cc9c15 100644
--- a/artemis-cli/src/test/resources/broker.xml
+++ b/artemis-cli/src/test/resources/broker.xml
@@ -40,7 +40,7 @@ under the License.
       </connectors>
 
       <acceptors>
-         <!-- Default ActiveMQ Artemis Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
+         <!-- Default Apache Artemis Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
          <acceptor name="artemis">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</acceptor>
 
          <!-- AMQP Acceptor.  Listens on default AMQP port for AMQP traffic.-->
@@ -49,7 +49,7 @@ under the License.
          <!-- STOMP Acceptor. -->
          <acceptor name="stomp">tcp://${activemq.remoting.stomp.host:localhost}:${activemq.remoting.stomp.port:61613}?protocols=STOMP</acceptor>
 
-         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Artemis Core and STOMP for legacy HornetQ clients. -->
+         <!-- HornetQ Compatibility Acceptor.  Enables Artemis Core and STOMP for legacy HornetQ clients. -->
          <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:localhost}:${activemq.remoting.hornetq.port:5445}?protocols=CORE,STOMP</acceptor>
       </acceptors>
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
index 3216891a00d..8f78ac23c1e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
@@ -67,10 +67,10 @@ public interface ActiveMQServerLogger {
    @LogMessage(id = 221000, value = "{} message broker is starting with configuration {}", level = LogMessage.Level.INFO)
    void serverStarting(String type, Configuration configuration);
 
-   @LogMessage(id = 221001, value = "Apache ActiveMQ Artemis Message Broker version {} [{}, nodeID={}] {}", level = LogMessage.Level.INFO)
+   @LogMessage(id = 221001, value = "Apache Artemis Message Broker version {} [{}, nodeID={}] {}", level = LogMessage.Level.INFO)
    void serverStarted(String fullVersion, String name, SimpleString nodeId, String identity);
 
-   @LogMessage(id = 221002, value = "Apache ActiveMQ Artemis Message Broker version {} [{}] stopped, uptime {}", level = LogMessage.Level.INFO)
+   @LogMessage(id = 221002, value = "Apache Artemis Message Broker version {} [{}] stopped, uptime {}", level = LogMessage.Level.INFO)
    void serverStopped(String version, SimpleString nodeId, String uptime);
 
    @LogMessage(id = 221003, value = "Deploying {} queue {} on address {}", level = LogMessage.Level.INFO)
@@ -91,7 +91,7 @@ public interface ActiveMQServerLogger {
    @LogMessage(id = 221008, value = "primary server wants to restart, restarting server in backup", level = LogMessage.Level.INFO)
    void awaitFailBack();
 
-   @LogMessage(id = 221109, value = "Apache ActiveMQ Artemis Backup Server version {} [{}] started; waiting for primary to fail before activating", level = LogMessage.Level.INFO)
+   @LogMessage(id = 221109, value = "Apache Artemis Backup Server version {} [{}] started; waiting for primary to fail before activating", level = LogMessage.Level.INFO)
    void backupServerStarted(String version, SimpleString nodeID);
 
    @LogMessage(id = 221010, value = "Backup Server is now active", level = LogMessage.Level.INFO)
@@ -342,7 +342,7 @@ void slowConsumerDetected(String sessionID,
    @LogMessage(id = 222006, value = "Binding already exists with name {}, divert will not be deployed", level = LogMessage.Level.WARN)
    void divertBindingAlreadyExists(SimpleString bindingName);
 
-   @LogMessage(id = 222007, value = "Security risk! Apache ActiveMQ Artemis is running with the default cluster admin user and default password. Please see the cluster chapter in the ActiveMQ Artemis User Guide for instructions on how to change this.", level = LogMessage.Level.WARN)
+   @LogMessage(id = 222007, value = "Security risk! Apache Artemis is running with the default cluster admin user and default password. Please see the cluster chapter in the Artemis User Guide for instructions on how to change this.", level = LogMessage.Level.WARN)
    void clusterSecurityRisk();
 
    @LogMessage(id = 222008, value = "unable to restart server, please kill and restart manually", level = LogMessage.Level.WARN)
@@ -1361,7 +1361,7 @@ void slowConsumerDetected(String sessionID,
    @LogMessage(id = 224099, value = "Message with ID {} has a header too large. More information available on debug level for class {}", level = LogMessage.Level.WARN)
    void messageWithHeaderTooLarge(Long messageID, String loggerClass);
 
-   @LogMessage(id = 224101, value = "Apache ActiveMQ Artemis is using a scheduled pool without remove on cancel policy, so a cancelled task could be not automatically removed from the work queue, it may also cause unbounded retention of cancelled tasks.", level = LogMessage.Level.WARN)
+   @LogMessage(id = 224101, value = "Apache Artemis is using a scheduled pool without remove on cancel policy, so a cancelled task could be not automatically removed from the work queue, it may also cause unbounded retention of cancelled tasks.", level = LogMessage.Level.WARN)
    void scheduledPoolWithNoRemoveOnCancelPolicy();
 
    @LogMessage(id = 224102, value = "unable to undeploy address {} : reason {}", level = LogMessage.Level.INFO)
diff --git a/tests/smoke-tests/src/main/filtered-resources/servers/windowsUpgrade/bin/artemis-service.xml b/tests/smoke-tests/src/main/filtered-resources/servers/windowsUpgrade/bin/artemis-service.xml
index 17e469ca570..4ddf05cce62 100644
--- a/tests/smoke-tests/src/main/filtered-resources/servers/windowsUpgrade/bin/artemis-service.xml
+++ b/tests/smoke-tests/src/main/filtered-resources/servers/windowsUpgrade/bin/artemis-service.xml
@@ -19,8 +19,8 @@
 
 <service>
    <id>artemis-windowsUpgrade-0.0.0.0</id>
-   <name>ActiveMQ Artemis: windowsUpgrade @ 0.0.0.0</name>
-   <description>Apache ActiveMQ Artemis is a reliable messaging broker</description>
+   <name>Apache Artemis: windowsUpgrade @ 0.0.0.0</name>
+   <description>Apache Artemis is a reliable messaging broker</description>
 
    <env name="ARTEMIS_HOME" value="must-change"/>
    <env name="ARTEMIS_INSTANCE" value="${project.basedir}/target/classes/servers/windowsUpgrade"/>
@@ -37,7 +37,7 @@
    <startargument>-Xms512M</startargument>
    <startargument>-Xmx1G</startargument>
 
-   <!-- Cluster Properties: Used to pass startarguments to ActiveMQ Artemis which can be referenced in broker.xml
+   <!-- Cluster Properties: Used to pass startarguments to Apache Artemis which can be referenced in broker.xml
    <startargument>-Dartemis.remoting.default.port=61617</startargument>
    <startargument>-Dartemis.remoting.amqp.port=5673</startargument>
    <startargument>-Dartemis.remoting.stomp.port=61614</startargument>