http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/producer-rate-limit/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/producer-rate-limit/pom.xml 
b/examples/jms/producer-rate-limit/pom.xml
index 9ed6b7d..e45d34c 100644
--- a/examples/jms/producer-rate-limit/pom.xml
+++ b/examples/jms/producer-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-producer-rate-limit-example</artifactId>
+   <artifactId>activemq-jms-producer-rate-limit-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Producer 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.ProducerRateLimitExample</clientClass>
+                     
<clientClass>org.apache.activemq.jms.example.ProducerRateLimitExample</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-producer-rate-limit-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  
<artifactId>activemq-jms-producer-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/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java
----------------------------------------------------------------------
diff --git 
a/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java
 
b/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java
index 639eb1c..28ddfce 100644
--- 
a/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java
+++ 
b/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.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 producer can be limited to produce 
messages at a maximum rate

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 0738c00..34976c6 100644
--- 
a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ 
b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -15,14 +15,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/proton-cpp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-cpp/pom.xml b/examples/jms/proton-cpp/pom.xml
index f118d42..e682663 100644
--- a/examples/jms/proton-cpp/pom.xml
+++ b/examples/jms/proton-cpp/pom.xml
@@ -3,24 +3,24 @@
    <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-protoncpp</artifactId>
+   <artifactId>activemq-jms-protoncpp</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 AMQP CPP Example</name>
 
    <dependencies>
       <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-commons</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-commons</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -43,8 +43,8 @@
          <artifactId>jboss-jms-api_2.0_spec</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-amqp-protocol</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-amqp-protocol</artifactId>
          <version>${project.version}</version>
       </dependency>
 
@@ -59,8 +59,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>
@@ -85,28 +85,28 @@
                   </configuration>
                   <dependencies>
                      <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>
-                        <groupId>org.apache.activemq6</groupId>
-                        <artifactId>activemq6-amqp-protocol</artifactId>
+                        <groupId>org.apache.activemq</groupId>
+                        <artifactId>activemq-amqp-protocol</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/proton-cpp/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/proton-cpp/readme.html 
b/examples/jms/proton-cpp/readme.html
index d4bb2bd..d6cd84f 100644
--- a/examples/jms/proton-cpp/readme.html
+++ b/examples/jms/proton-cpp/readme.html
@@ -33,7 +33,7 @@
      <pre class="prettyprint">
      <code>
          &lt;acceptor name="proton-acceptor"&gt;
-         
&lt;factory-class&gt;org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class&gt;
+         
&lt;factory-class&gt;org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class&gt;
          &lt;param key="port" value="5672"/&gt;
          &lt;/acceptor&gt;
      </code>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 9ec2984..af159fd 100644
--- 
a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ 
b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -14,7 +14,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="proton-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/proton-j/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-j/pom.xml b/examples/jms/proton-j/pom.xml
index b674fe3..8c6749c 100644
--- a/examples/jms/proton-j/pom.xml
+++ b/examples/jms/proton-j/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-proton-j-example</artifactId>
+   <artifactId>activemq-proton-j-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Proton-J 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>
@@ -28,8 +28,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>
@@ -51,7 +51,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     
<clientClass>org.apache.activemq6.jms.example.ProtonJExample</clientClass>
+                     
<clientClass>org.apache.activemq.jms.example.ProtonJExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                      </args>
@@ -66,33 +66,33 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-proton-j-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-proton-j-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>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-amqp-protocol</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-amqp-protocol</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/proton-j/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/proton-j/readme.html 
b/examples/jms/proton-j/readme.html
index 1d9cf1e..c9302c9 100644
--- a/examples/jms/proton-j/readme.html
+++ b/examples/jms/proton-j/readme.html
@@ -18,7 +18,7 @@
      <pre class="prettyprint">
      <code>
          &lt;acceptor name="proton-acceptor"&gt;
-         
&lt;factory-class&gt;org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class&gt;
+         
&lt;factory-class&gt;org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class&gt;
          &lt;param key="port" value="5672"/&gt;
          &lt;/acceptor&gt;
      </code>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/proton-j/src/main/java/org/apache/activemq/jms/example/ProtonJExample.java
----------------------------------------------------------------------
diff --git 
a/examples/jms/proton-j/src/main/java/org/apache/activemq/jms/example/ProtonJExample.java
 
b/examples/jms/proton-j/src/main/java/org/apache/activemq/jms/example/ProtonJExample.java
index a0724b0..c240ca8 100644
--- 
a/examples/jms/proton-j/src/main/java/org/apache/activemq/jms/example/ProtonJExample.java
+++ 
b/examples/jms/proton-j/src/main/java/org/apache/activemq/jms/example/ProtonJExample.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 org.apache.qpid.amqp_1_0.client.Connection;
@@ -19,7 +19,7 @@ import org.apache.qpid.amqp_1_0.client.Receiver;
 import org.apache.qpid.amqp_1_0.client.Sender;
 import org.apache.qpid.amqp_1_0.client.Session;
 import org.apache.qpid.amqp_1_0.type.UnsignedInteger;
-import org.apache.activemq6.common.example.HornetQExample;
+import org.apache.activemq.common.example.HornetQExample;
 
 public class ProtonJExample extends HornetQExample
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-configuration.xml
index f4a6c24..1bf6569 100644
--- 
a/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ 
b/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -14,7 +14,7 @@
     <!-- Acceptors -->
     <acceptors>
         <acceptor name="proton-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="5672"/>
         </acceptor>
     </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/proton-ruby/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-ruby/pom.xml b/examples/jms/proton-ruby/pom.xml
index 58e11f5..52d5d3e 100644
--- a/examples/jms/proton-ruby/pom.xml
+++ b/examples/jms/proton-ruby/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-proton-ruby-example</artifactId>
+   <artifactId>activemq-jms-proton-ruby-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Proton Ruby Examplee</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>
    </dependencies>
@@ -23,8 +23,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>
@@ -44,33 +44,33 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-jms-proton-ruby-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-proton-ruby-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>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-amqp-protocol</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-amqp-protocol</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/proton-ruby/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/proton-ruby/readme.html 
b/examples/jms/proton-ruby/readme.html
index 7c3f163..9fc3e19 100644
--- a/examples/jms/proton-ruby/readme.html
+++ b/examples/jms/proton-ruby/readme.html
@@ -20,7 +20,7 @@
      <pre class="prettyprint">
      <code>
      &lt;acceptor name="proton-acceptor"&gt;
-        
&lt;factory-class&gt;org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class&gt;
+        
&lt;factory-class&gt;org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class&gt;
         &lt;param key="protocol" value="AMQP"/&gt;
         &lt;param key="port" value="5672"/&gt;
      &lt;/acceptor&gt;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 4b5c988..cd05fb3 100644
--- 
a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ 
b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -13,7 +13,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="proton-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="protocol" value="AMQP"/>
          <param key="port" value="5672"/>
       </acceptor>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/queue-message-redistribution/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/pom.xml 
b/examples/jms/queue-message-redistribution/pom.xml
index 2ca870f..9aeabc9 100644
--- a/examples/jms/queue-message-redistribution/pom.xml
+++ b/examples/jms/queue-message-redistribution/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-queue-message-redistribution-example</artifactId>
+   <artifactId>activemq-jms-queue-message-redistribution-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Queue Message Redistribution 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.QueueMessageRedistributionExample</clientClass>
+                     
<clientClass>org.apache.activemq.jms.example.QueueMessageRedistributionExample</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-queue-message-redistribution-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  
<artifactId>activemq-jms-queue-message-redistribution-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/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java
 
b/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java
index 7b3ac8c..aeb1431 100644
--- 
a/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java
+++ 
b/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.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 a queue with the same name deployed on two nodes 
of a cluster.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 50967ed..275e48f 100644
--- 
a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ 
b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/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="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/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-configuration.xml
 
b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-configuration.xml
index d65b91a..df39e5b 100644
--- 
a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ 
b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -16,7 +16,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="5446"/>
       </connector>
    </connectors>
@@ -24,7 +24,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/queue-requestor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/pom.xml 
b/examples/jms/queue-requestor/pom.xml
index 3f12fdb..effabbd 100644
--- a/examples/jms/queue-requestor/pom.xml
+++ b/examples/jms/queue-requestor/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-queue-requestor-example</artifactId>
+   <artifactId>activemq-jms-queue-requestor-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Queue Requestor 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.QueueRequestorExample</clientClass>
+                     
<clientClass>org.apache.activemq.jms.example.QueueRequestorExample</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-queue-requestor-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-queue-requestor-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/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java
 
b/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java
index 9e02ea3..0db9b2f 100644
--- 
a/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java
+++ 
b/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.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.JMSException;
 import javax.jms.Queue;
@@ -22,7 +22,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 JMS example that shows how to use queues requestors.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/TextReverserService.java
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/TextReverserService.java
 
b/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/TextReverserService.java
index a3be585..a5e0fa4 100644
--- 
a/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/TextReverserService.java
+++ 
b/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/TextReverserService.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;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-configuration.xml
index d1834b1..99aea5a 100644
--- 
a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ 
b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -15,14 +15,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/queue-selector/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/pom.xml 
b/examples/jms/queue-selector/pom.xml
index 65240fe..f19478a 100644
--- a/examples/jms/queue-selector/pom.xml
+++ b/examples/jms/queue-selector/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-queue-selector-example</artifactId>
+   <artifactId>activemq-jms-queue-selector-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Queue Selector 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.QueueSelectorExample</clientClass>
+                     
<clientClass>org.apache.activemq.jms.example.QueueSelectorExample</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-queue-selector-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-queue-selector-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/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java
 
b/examples/jms/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java
index 7253ce9..3dcb924 100644
--- 
a/examples/jms/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java
+++ 
b/examples/jms/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.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;
@@ -24,7 +24,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 JMS example that uses selectors with queue consumers.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 30fa21a..10e0c83 100644
--- 
a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ 
b/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -13,14 +13,14 @@
    <!-- 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>
       </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/queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/pom.xml b/examples/jms/queue/pom.xml
index e286fed..24caa0a 100644
--- a/examples/jms/queue/pom.xml
+++ b/examples/jms/queue/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-queue-example</artifactId>
+   <artifactId>activemq-jms-queue-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Queue 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.QueueExample</clientClass>
+                     
<clientClass>org.apache.activemq.jms.example.QueueExample</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-queue-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-queue-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/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java
 
b/examples/jms/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java
index 2d62c56..77dfcf5 100644
--- 
a/examples/jms/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java
+++ 
b/examples/jms/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.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 JMS Queue example that creates a producer and consumer on a queue 
and sends then receives a message.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
index f03dc5f..f56cb9b 100644
--- 
a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ 
b/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -15,14 +15,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/reattach-node/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/pom.xml 
b/examples/jms/reattach-node/pom.xml
index 419ef06..c7dbb52 100644
--- a/examples/jms/reattach-node/pom.xml
+++ b/examples/jms/reattach-node/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-reattach-node-example</artifactId>
+   <artifactId>activemq-jms-reattach-node-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Reattach Node 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>
@@ -45,7 +45,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     
<clientClass>org.apache.activemq6.jms.example.ReattachExample</clientClass>
+                     
<clientClass>org.apache.activemq.jms.example.ReattachExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                      </args>
@@ -69,28 +69,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-jms-reattach-node-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-reattach-node-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/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java
----------------------------------------------------------------------
diff --git 
a/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java
 
b/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java
index 9f97d2c..07fec4b 100644
--- 
a/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java
+++ 
b/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.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;
@@ -22,9 +22,9 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.api.jms.HornetQJMSClient;
-import org.apache.activemq6.api.jms.management.JMSManagementHelper;
-import org.apache.activemq6.common.example.HornetQExample;
+import org.apache.activemq.api.jms.HornetQJMSClient;
+import org.apache.activemq.api.jms.management.JMSManagementHelper;
+import org.apache.activemq.common.example.HornetQExample;
 
 /**
  * This examples demonstrates a connection created to a server. Failure of the 
network connection is then simulated

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-configuration.xml
index fa5f8dd..d7f412e 100644
--- 
a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ 
b/examples/jms/reattach-node/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>
          <param key="port" value="5445"/>
       </connector>
       
       <!-- We just use this connector so we can send management operations 
while the other acceptor
       is stopped -->
      <connector name="netty-connector2">
-         
<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>
@@ -29,14 +29,14 @@
    <!-- 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>
 
       <!-- We just use this acceptor so we can send management operations 
while the other acceptor
       is stopped -->
       <acceptor name="netty-acceptor2">
-         
<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/replicated-failback-static/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/pom.xml 
b/examples/jms/replicated-failback-static/pom.xml
index 5962ff1..92c9f70 100644
--- a/examples/jms/replicated-failback-static/pom.xml
+++ b/examples/jms/replicated-failback-static/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-replicated-failback-static-example</artifactId>
+   <artifactId>activemq-jms-replicated-failback-static-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Replicated Failback Static 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.ReplicatedFailbackStaticExample</clientClass>
+                     
<clientClass>org.apache.activemq.jms.example.ReplicatedFailbackStaticExample</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-replicated-failback-static-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  
<artifactId>activemq-jms-replicated-failback-static-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/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java
 
b/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java
index 3074352..3ba96ff 100644
--- 
a/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java
+++ 
b/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.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;
@@ -22,7 +22,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;
 
 /**
  * Example of live and replicating backup pair.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 5e6c93d..fe87d1e 100644
--- 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -26,11 +26,11 @@
 
    <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 name="netty-backup-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>
@@ -38,7 +38,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/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-configuration.xml
 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 4967bdc..f307d63 100644
--- 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -27,11 +27,11 @@
    <!-- Connectors -->
    <connectors>
       <connector name="netty-live-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 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>
@@ -39,7 +39,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/replicated-failback/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/pom.xml 
b/examples/jms/replicated-failback/pom.xml
index 9262927..930019a 100644
--- a/examples/jms/replicated-failback/pom.xml
+++ b/examples/jms/replicated-failback/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-replicated-failback-example</artifactId>
+   <artifactId>activemq-jms-replicated-failback-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Replicated Failback 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.ReplicatedFailbackExample</clientClass>
+                     
<clientClass>org.apache.activemq.jms.example.ReplicatedFailbackExample</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-replicated-failback-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  
<artifactId>activemq-jms-replicated-failback-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/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java
 
b/examples/jms/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java
index c88e88e..c736c16 100644
--- 
a/examples/jms/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java
+++ 
b/examples/jms/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.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;
@@ -22,7 +22,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;
 
 /**
  * Example of live and replicating backup pair.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml
index dcacd3f..e1be0d6 100644
--- 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -26,7 +26,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>
@@ -34,7 +34,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/replicated-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml
 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml
index 2441dce..fb6f8cb 100644
--- 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -25,11 +25,11 @@
    <!-- Connectors -->
    <connectors>
       <connector name="netty-live-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 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>
@@ -37,7 +37,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/replicated-multiple-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/pom.xml 
b/examples/jms/replicated-multiple-failover/pom.xml
index 6545a32..2a7748a 100644
--- a/examples/jms/replicated-multiple-failover/pom.xml
+++ b/examples/jms/replicated-multiple-failover/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-replicated-multiple-failover-example</artifactId>
+   <artifactId>activemq-jms-replicated-multiple-failover-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Replicated Multiple Failover 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>
@@ -99,7 +99,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     
<clientClass>org.apache.activemq6.jms.example.ReplicatedMultipleFailoverExample</clientClass>
+                     
<clientClass>org.apache.activemq.jms.example.ReplicatedMultipleFailoverExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                         <param>jnp://localhost:1199</param>
@@ -143,28 +143,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  
<artifactId>activemq6-jms-replicated-multiple-failover-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  
<artifactId>activemq-jms-replicated-multiple-failover-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/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java
 
b/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java
index 0208537..ad6bd7a 100644
--- 
a/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java
+++ 
b/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.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;
@@ -22,7 +22,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;
 
 /**
  * @author <a href="mailto:[email protected]";>Andy Taylor</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 613bfaa..1d2b00b 100644
--- 
a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ 
b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -19,7 +19,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="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="5445"/>
       </acceptor>
    </acceptors>

Reply via email to