Return-Path: 
 <commits-return-27783-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
X-Original-To: apmail-activemq-commits-archive@www.apache.org
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 94726CBD1
	for <apmail-activemq-commits-archive@www.apache.org>;
 Mon, 17 Nov 2014 14:48:38 +0000 (UTC)
Received: (qmail 59181 invoked by uid 500); 17 Nov 2014 14:48:38 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 59046 invoked by uid 500); 17 Nov 2014 14:48:38 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 57757 invoked by uid 99); 17 Nov 2014 14:48:37 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2014 14:48:37 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 551DF98D060; Mon, 17 Nov 2014 14:48:37 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: andytaylor@apache.org
To: commits@activemq.apache.org
Date: Mon, 17 Nov 2014 14:48:55 -0000
Message-Id: <a99dd38879834faf8d5f371f6cd08e1d@git.apache.org>
In-Reply-To: <4795dcec67344b8e975c3f1f7e3bf4f7@git.apache.org>
References: <4795dcec67344b8e975c3f1f7e3bf4f7@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [20/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-3 renaming
 package names from activemq6 to activemq

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-jgroups/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/pom.xml b/examples/jms/clustered-jgroups/pom.xml
index 22c7a16..252ba9d 100644
--- a/examples/jms/clustered-jgroups/pom.xml
+++ b/examples/jms/clustered-jgroups/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
@@ -14,8 +14,8 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -27,8 +27,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start0</id>
@@ -73,7 +73,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.ClusteredJgroupsExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.ClusteredJgroupsExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                         <param>jnp://localhost:1199</param>
@@ -101,28 +101,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
                   <artifactId>clustered-jgroups</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java b/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java
index 547466a..cfa2fdc 100644
--- a/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java
+++ b/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -21,7 +21,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.common.example.HornetQExample;
+import org.apache.activemq.common.example.HornetQExample;
 
 /**
  * A simple example that demonstrates clustering using jgroups.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-configuration.xml
index d7bbd87..42c2500 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -15,7 +15,7 @@
 
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5445"/>
       </connector>
    </connectors>
@@ -23,7 +23,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5445"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-configuration.xml
index c44a76a..08ec4fa 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -14,7 +14,7 @@
    <!-- Connectors -->
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5446"/>
       </connector>
    </connectors>
@@ -22,7 +22,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5446"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/pom.xml b/examples/jms/clustered-queue/pom.xml
index 2dff3ec..842a688 100644
--- a/examples/jms/clustered-queue/pom.xml
+++ b/examples/jms/clustered-queue/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
@@ -14,8 +14,8 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -27,8 +27,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start0</id>
@@ -69,7 +69,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.ClusteredQueueExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.ClusteredQueueExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                         <param>jnp://localhost:1199</param>
@@ -97,28 +97,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
                   <artifactId>clustered-queue</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java b/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java
index fba0412..c70b31f 100644
--- a/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java
+++ b/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -21,7 +21,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.common.example.HornetQExample;
+import org.apache.activemq.common.example.HornetQExample;
 
 /**
  * A simple example that demonstrates server side load-balancing of messages between the queue instances on different

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 7a1dd9f..dfe394e 100644
--- a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -14,7 +14,7 @@
 
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5445"/>
       </connector>
    </connectors>
@@ -22,7 +22,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5445"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 5e6bb32..4aafb11 100644
--- a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -15,7 +15,7 @@
    <!-- Connectors -->
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5446"/>
       </connector>
    </connectors>
@@ -23,7 +23,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5446"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-standalone/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/pom.xml b/examples/jms/clustered-standalone/pom.xml
index 2997594..27787c5 100644
--- a/examples/jms/clustered-standalone/pom.xml
+++ b/examples/jms/clustered-standalone/pom.xml
@@ -3,19 +3,19 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-jms-clustered-standalone-example</artifactId>
+   <artifactId>activemq-jms-clustered-standalone-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Clustered Standalone Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -27,8 +27,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start0</id>
@@ -87,7 +87,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.ClusteredStandaloneExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.ClusteredStandaloneExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                         <param>jnp://localhost:1199</param>
@@ -131,28 +131,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-jms-clustered-standalone-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-clustered-standalone-example</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java b/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java
index ac29355..383f87e 100644
--- a/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java
+++ b/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -21,7 +21,7 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.common.example.HornetQExample;
+import org.apache.activemq.common.example.HornetQExample;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 2abad05..2254265 100644
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -14,7 +14,7 @@
 
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5445"/>
       </connector>
    </connectors>
@@ -22,7 +22,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5445"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 6a822d8..536f293 100644
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -15,7 +15,7 @@
    <!-- Connectors -->
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5446"/>
       </connector>
    </connectors>
@@ -23,7 +23,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5446"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-configuration.xml
index 66feb58..667e374 100644
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-configuration.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-configuration.xml
@@ -15,7 +15,7 @@
    <!-- Connectors -->
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5447"/>
       </connector>
    </connectors>
@@ -23,7 +23,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5447"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-static-discovery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/pom.xml b/examples/jms/clustered-static-discovery/pom.xml
index feefb96..cc601b5 100644
--- a/examples/jms/clustered-static-discovery/pom.xml
+++ b/examples/jms/clustered-static-discovery/pom.xml
@@ -3,19 +3,19 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-jms-clustered-static-discovery-example</artifactId>
+   <artifactId>activemq-jms-clustered-static-discovery-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Clustered Static Discovery Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -27,8 +27,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start0</id>
@@ -81,7 +81,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.StaticClusteredQueueExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.StaticClusteredQueueExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                         <param>jnp://localhost:1199</param>
@@ -135,28 +135,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-jms-clustered-static-discovery-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-clustered-static-discovery-example</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java b/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java
index 03051d6..65045f9 100644
--- a/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java
+++ b/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -21,7 +21,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.common.example.HornetQExample;
+import org.apache.activemq.common.example.HornetQExample;
 
 /**
  * A simple example that demonstrates server side load-balancing of messages between the queue instances on different

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 32b5e93..b2401e3 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -15,12 +15,12 @@
 
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5445"/>
       </connector>
       <!-- connector to the server1 -->
       <connector name="server1-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5446"/>
       </connector>
    </connectors>
@@ -28,7 +28,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5445"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 5963e6e..90b6027 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -14,12 +14,12 @@
    <!-- Connectors -->
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5446"/>
       </connector>
       <!-- connector to the server0 -->
       <connector name="server0-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5445"/>
       </connector>
    </connectors>
@@ -27,7 +27,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5446"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-configuration.xml
index 6e678b2..2ce1382 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-configuration.xml
@@ -27,12 +27,12 @@
    <!-- Connectors -->
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5447"/>
       </connector>
       <!-- connector to the server0 -->
       <connector name="server0-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5445"/>
       </connector>
    </connectors>
@@ -40,7 +40,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5447"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-configuration.xml
index a452ab3..c929b19 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-configuration.xml
@@ -27,12 +27,12 @@
    <!-- Connectors -->
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5448"/>
       </connector>
       <!-- connector to the server0 -->
       <connector name="server0-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5445"/>
       </connector>
    </connectors>
@@ -40,7 +40,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5448"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-static-oneway/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/pom.xml b/examples/jms/clustered-static-oneway/pom.xml
index 11e1922..fc6a62d 100644
--- a/examples/jms/clustered-static-oneway/pom.xml
+++ b/examples/jms/clustered-static-oneway/pom.xml
@@ -3,19 +3,19 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-jms-clustered-static-oneway-example</artifactId>
+   <artifactId>activemq-jms-clustered-static-oneway-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Clustered Static One Way Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -27,8 +27,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start0</id>
@@ -69,7 +69,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.ClusterStaticOnewayExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.ClusterStaticOnewayExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                         <param>jnp://localhost:1199</param>
@@ -113,28 +113,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-jms-clustered-static-oneway-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-clustered-static-oneway-example</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java b/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java
index c6a84b7..326a8e5 100644
--- a/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java
+++ b/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -21,7 +21,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.common.example.HornetQExample;
+import org.apache.activemq.common.example.HornetQExample;
 
 /**
  * A simple example that demonstrates server side load-balancing of messages between the queue instances on different

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-configuration.xml
index ea57781..3f7fcca 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -28,12 +28,12 @@
 
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5445"/>
       </connector>
       <!-- connector to the server1 -->
       <connector name="server1-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5446"/>
       </connector>
    </connectors>
@@ -41,7 +41,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5445"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-configuration.xml
index f2042c4..b137aa3 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -27,12 +27,12 @@
    <!-- Connectors -->
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5446"/>
       </connector>
       <!-- connector to the server0 -->
       <connector name="server2-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5447"/>
       </connector>
    </connectors>
@@ -40,7 +40,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5446"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-configuration.xml
index 87323e0..86fcff2 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-configuration.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-configuration.xml
@@ -27,7 +27,7 @@
    <!-- Connectors -->
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5447"/>
       </connector>
    </connectors>
@@ -35,7 +35,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5447"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-topic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/pom.xml b/examples/jms/clustered-topic/pom.xml
index 15fa3a1..8e9b25c 100644
--- a/examples/jms/clustered-topic/pom.xml
+++ b/examples/jms/clustered-topic/pom.xml
@@ -3,19 +3,19 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-jms-clustered-topic-example</artifactId>
+   <artifactId>activemq-jms-clustered-topic-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Clustered Topic Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -27,8 +27,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start0</id>
@@ -77,7 +77,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.ClusteredTopicExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.ClusteredTopicExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                         <param>jnp://localhost:1199</param>
@@ -111,28 +111,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-jms-clustered-topic-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-clustered-topic-example</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java b/examples/jms/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java
index e9589d8..02ee1a6 100644
--- a/examples/jms/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java
+++ b/examples/jms/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -21,7 +21,7 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.common.example.HornetQExample;
+import org.apache.activemq.common.example.HornetQExample;
 
 /**
  * A simple example that shows a JMS Topic clustered across two nodes of a cluster.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 7798277..29f46b6 100644
--- a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -15,7 +15,7 @@
 
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5445"/>
       </connector>
    </connectors>
@@ -23,7 +23,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5445"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-configuration.xml
index a31bf2b..c98a3ce 100644
--- a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -14,7 +14,7 @@
    <!-- Connectors -->
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5446"/>
       </connector>
    </connectors>
@@ -22,7 +22,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5446"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/colocated-failover-scale-down/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/pom.xml b/examples/jms/colocated-failover-scale-down/pom.xml
index 6c8ee75..0e94e28 100644
--- a/examples/jms/colocated-failover-scale-down/pom.xml
+++ b/examples/jms/colocated-failover-scale-down/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
@@ -14,8 +14,8 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -27,8 +27,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start0</id>
@@ -69,7 +69,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.ColocatedFailoverScaleDownExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.ColocatedFailoverScaleDownExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                         <param>jnp://localhost:1199</param>
@@ -103,28 +103,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
                   <artifactId>colocated-failover-scale-down</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java b/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java
index 01b8b6b..9a208f4 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java
+++ b/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -21,7 +21,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.common.example.HornetQExample;
+import org.apache.activemq.common.example.HornetQExample;
 
 /**
  * A simple example that demonstrates server side load-balancing of messages between the queue instances on different

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml
index c3acf43..a80e564 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -14,10 +14,10 @@
 
    <connectors>
       <connector name="invm-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
       </connector>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5445"/>
       </connector>
    </connectors>
@@ -25,10 +25,10 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="invm-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
       </acceptor>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5445"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml
index d39842e..eb6d69d 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -15,10 +15,10 @@
    <!-- Connectors -->
    <connectors>
       <connector name="invm-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
       </connector>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5446"/>
       </connector>
    </connectors>
@@ -26,10 +26,10 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="invm-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
       </acceptor>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5446"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/colocated-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/pom.xml b/examples/jms/colocated-failover/pom.xml
index ba0ce53..a8ccf23 100644
--- a/examples/jms/colocated-failover/pom.xml
+++ b/examples/jms/colocated-failover/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
@@ -14,8 +14,8 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -27,8 +27,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start0</id>
@@ -69,7 +69,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.ColocatedFailoverExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.ColocatedFailoverExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                         <param>jnp://localhost:1199</param>
@@ -103,28 +103,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
                   <artifactId>colocated-failover</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java b/examples/jms/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java
index 70b5551..4d01648 100644
--- a/examples/jms/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java
+++ b/examples/jms/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -21,7 +21,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.common.example.HornetQExample;
+import org.apache.activemq.common.example.HornetQExample;
 
 /**
  * A simple example that demonstrates a colocated server

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 81c84bc..d749796 100644
--- a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -14,7 +14,7 @@
 
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5445"/>
       </connector>
    </connectors>
@@ -22,7 +22,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5445"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 57d7dda..0b5025c 100644
--- a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -15,7 +15,7 @@
    <!-- Connectors -->
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5446"/>
       </connector>
    </connectors>
@@ -23,7 +23,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5446"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/consumer-rate-limit/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/pom.xml b/examples/jms/consumer-rate-limit/pom.xml
index 82e3bbe..5b836ce 100644
--- a/examples/jms/consumer-rate-limit/pom.xml
+++ b/examples/jms/consumer-rate-limit/pom.xml
@@ -3,19 +3,19 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-jms-consumer-rate-limit-example</artifactId>
+   <artifactId>activemq-jms-consumer-rate-limit-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Consumer Rate Limit Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -27,8 +27,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start</id>
@@ -50,7 +50,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.ConsumerRateLimitExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.ConsumerRateLimitExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                      </args>
@@ -65,28 +65,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-jms-consumer-rate-limit-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-consumer-rate-limit-example</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java b/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java
index ac4718d..927d438 100644
--- a/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java
+++ b/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -21,7 +21,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.common.example.HornetQExample;
+import org.apache.activemq.common.example.HornetQExample;
 
 /**
  * This example demonstrates how a message consumer can be limited to consumer messages at a maximum rate

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 34d3c72..4097556 100644
--- a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -14,14 +14,14 @@
 
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>         
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
       </connector>
    </connectors>
    
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>         
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
       </acceptor>
    </acceptors>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/dead-letter/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/pom.xml b/examples/jms/dead-letter/pom.xml
index a55a596..0a2c07b 100644
--- a/examples/jms/dead-letter/pom.xml
+++ b/examples/jms/dead-letter/pom.xml
@@ -3,19 +3,19 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-jms-dead-letter-example</artifactId>
+   <artifactId>activemq-jms-dead-letter-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Dead Letter Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -27,8 +27,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start</id>
@@ -50,7 +50,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.DeadLetterExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.DeadLetterExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                      </args>
@@ -65,28 +65,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-jms-dead-letter-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-dead-letter-example</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java b/examples/jms/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java
index 837cd15..b214ffc 100644
--- a/examples/jms/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java
+++ b/examples/jms/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -21,7 +21,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.common.example.HornetQExample;
+import org.apache.activemq.common.example.HornetQExample;
 
 /**
  * An example showing how messages are moved to dead letter destination when they are unsuccessfully delivered multiple times

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 6546556..7699e92 100644
--- a/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -14,14 +14,14 @@
 
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>         
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
       </connector>
    </connectors>
    
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>         
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
       </acceptor>
    </acceptors>