diff --git a/NOTICE b/NOTICE
index 288a13f562..9584e27dd9 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,14 +1,14 @@
-HornetQ
+ActiveMQ
Copyright 2009 Red Hat, Inc. Licensed under the Apache License, version 2.0.
-Unless required by applicable law, HornetQ is distributed on
+Unless required by applicable law, ActiveMQ is distributed on
an "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, either express or
implied, including the implied warranties of TITLE, NON-INFRINGEMENT,
MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
-Certain portions of HornetQ are based on code made available
+Certain portions of ActiveMQ are based on code made available
under the GNU Lesser General Public License, version 2.1 or later
(http://www.fsf.org/licensing/licenses/lgpl.html).
"JBoss" and "Red Hat" are trademarks of Red Hat, Inc. and/or its
affiliates, registered in the U.S. and other countries. Your
-permissions under the licensing terms governing HornetQ do
+permissions under the licensing terms governing ActiveMQ do
not include a license, express or implied, to any Red Hat trademark.
\ No newline at end of file
diff --git a/RELEASING.md b/RELEASING.md
index 1f839877e9..bf5a5ef804 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -18,12 +18,12 @@ Assuming current version is ``X.Y.Z-SNAPSHOT``
0. Update the release notes.
1. Prepare a single commit changing all version tags in all pom's.
-2. tag this commit locally by 'git tag -a HornetQ_X_Y_Z_Final -m "release for x.y.z.Final' or what ever the version is
+2. tag this commit locally by 'git tag -a ActiveMQ_X_Y_Z_Final -m "release for x.y.z.Final' or what ever the version is
3. remember to update the version in the main pom, think of a cool name if you can
4. update the hornetq-maven-plugin plugin in the main pom to one that is released, if needed release a new version of the plugin.
5. Either use ``git revert`` to create a new commit reverting the commit with the version changes. Or change again all versions to ``R.S.T-SNAPSHOT``.
6. push both commits with version changes together, including them in the same _pull-request_.
-7. push the committed tag upstream 'git push upstream HornetQ_X_Y_Z_Final'
+7. push the committed tag upstream 'git push upstream ActiveMQ_X_Y_Z_Final'
8. download and unpack the tag from github
9. firstly upload the maven artifacts to the staged repository 'mvn -Pmaven-release deploy' (you will need the repository details in your settings.xml'
10. go to nexus (https://repository.jboss.org/nexus/index.html), log in, select staging repositories, select the staging profile that you uploaded and close it.
@@ -55,7 +55,7 @@ If everything is ok then release by:
if there is a problem
-1. delete the tag locally 'git tag -d HornetQ_X_Y_Z_Final"
-2. delete the tag remotely 'git push origin :refs/tags/HornetQ_X_Y_Z_Final"
+1. delete the tag locally 'git tag -d ActiveMQ_X_Y_Z_Final"
+2. delete the tag remotely 'git push origin :refs/tags/ActiveMQ_X_Y_Z_Final"
3. go to nexus and drop the profile
4. fix what's broken and start again
diff --git a/activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt b/activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt
index 411caec9b4..cddde50691 100644
--- a/activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt
+++ b/activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt
@@ -3,6 +3,6 @@
| |_| |/ _ \| '__| '_ \ / _ \ __| | | |
| _ | (_) | | | | | | __/ |_| |_| |
|_| |_|\___/|_| |_| |_|\___|\__|\__\_\
- HornetQ ${project.version}
+ ActiveMQ ${project.version}
diff --git a/activemq-native/README b/activemq-native/README
index a40400f46e..88bd9904cd 100644
--- a/activemq-native/README
+++ b/activemq-native/README
@@ -1,5 +1,5 @@
-This is a simple tutorial on compiling libHornetQLibAIO.so
+This is a simple tutorial on compiling libActiveMQLibAIO.so
DEPENDENCIES
diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/package.html b/activemq-ra/src/main/java/org/apache/activemq/ra/package.html
index 0eb7e73df5..eda0590a22 100644
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/package.html
+++ b/activemq-ra/src/main/java/org/apache/activemq/ra/package.html
@@ -18,7 +18,7 @@ Copyright 2009 Red Hat, Inc.
- HornetQ Resource Adaptor
+ ActiveMQ Resource Adaptor