150 files changed, 536 insertions, 601 deletions

diff --git a/java/client/build.xml b/java/client/build.xml
index d26064ed15..abeb3ec903 100644
--- a/java/client/build.xml
+++ b/java/client/build.xml
@@ -24,7 +24,7 @@
 
   <import file="../module.xml"/>
 
-  <property name="output.dir" value="${module.precompiled}/org/apache/qpidity/filter/selector"/>
+  <property name="output.dir" value="${module.precompiled}/org/apache/qpid/filter/selector"/>
 
   <target name="precompile">
     <mkdir dir="${output.dir}"/>
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DeclareQueue.java b/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DeclareQueue.java
index 8bb27847ce..b16a7fa7c3 100755
--- a/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DeclareQueue.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DeclareQueue.java
@@ -1,8 +1,8 @@
 package org.apache.qpid.example.amqpexample.direct;
 
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
 
 /**
  *  This creates a queue a queue and binds it to the
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DirectProducer.java b/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DirectProducer.java
index 7329792a2b..62609182cf 100755
--- a/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DirectProducer.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DirectProducer.java
@@ -2,14 +2,14 @@ package org.apache.qpid.example.amqpexample.direct;
 
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
 
 public class DirectProducer implements MessageListener
 {
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/Listener.java b/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/Listener.java
index b199c3a69a..081fbf2521 100755
--- a/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/Listener.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/Listener.java
@@ -2,14 +2,14 @@ package org.apache.qpid.example.amqpexample.direct;
 
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-
-import org.apache.qpidity.transport.MessageCreditUnit;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+
+import org.apache.qpid.transport.MessageCreditUnit;
 
 /**
  * This listens to messages on a queue and terminates
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/DeclareQueue.java b/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/DeclareQueue.java
index 67f24148d8..9af5f21e66 100755
--- a/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/DeclareQueue.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/DeclareQueue.java
@@ -1,8 +1,8 @@
 package org.apache.qpid.example.amqpexample.fanout;
 
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
 
 /**
  *  This creates a queue a queue and binds it to the
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/FannoutProducer.java b/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/FannoutProducer.java
index 4c647fde36..27540b3d9c 100755
--- a/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/FannoutProducer.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/FannoutProducer.java
@@ -1,11 +1,11 @@
 package org.apache.qpid.example.amqpexample.fanout;
 
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
 
 public class FannoutProducer
 {
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java b/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java
index 1feb5cfe23..7942ce5ca3 100755
--- a/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java
@@ -2,16 +2,16 @@ package org.apache.qpid.example.amqpexample.fanout;
 
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
-import org.apache.qpidity.transport.MessageCreditUnit;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
+import org.apache.qpid.transport.MessageCreditUnit;
 
 /**
  * This listens to messages on a queue and terminates
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicListener.java b/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicListener.java
index 100dcf52bf..2e4edfbe6f 100755
--- a/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicListener.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicListener.java
@@ -2,14 +2,14 @@ package org.apache.qpid.example.amqpexample.pubsub;
 
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-import org.apache.qpidity.transport.MessageCreditUnit;
-import org.apache.qpidity.transport.Option;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+import org.apache.qpid.transport.MessageCreditUnit;
+import org.apache.qpid.transport.Option;
 
 
 public class TopicListener implements MessageListener
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicPublisher.java b/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicPublisher.java
index c960643504..9808ebba9f 100755
--- a/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicPublisher.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicPublisher.java
@@ -1,11 +1,11 @@
 package org.apache.qpid.example.amqpexample.pubsub;
 
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
 
 public class TopicPublisher
 {
diff --git a/java/client/pom.xml b/java/client/pom.xml
index bcce3e1d3b..2ad41d96cd 100644
--- a/java/client/pom.xml
+++ b/java/client/pom.xml
@@ -112,7 +112,7 @@
                         <configuration>
                             <sourceDirectory>${basedir}/src/main/grammar</sourceDirectory>
                             <outputDirectory>${basedir}/target/generated-sources</outputDirectory>
-                            <packageName>org.apache.qpidity.filter.selector</packageName>
+                            <packageName>org.apache.qpid.filter.selector</packageName>
                         </configuration>
                         <goals>
                             <goal>javacc</goal>
@@ -237,16 +237,16 @@
                <artifactId>maven-javadoc-plugin</artifactId>
                <configuration>
                   <excludePackageNames>
-                      org.apache.qpid.*:org.apache.qpidity.njms:org.apache.qpidity.njms.*:org.apache.qpidity.nclient.impl
+                      org.apache.qpid.*:org.apache.qpid.njms:org.apache.qpid.njms.*:org.apache.qpid.nclient.impl
                   </excludePackageNames>
                   <groups>
                     <group>
                       <title>API</title>
-                      <packages>org.apache.qpidity.nclient</packages>
+                      <packages>org.apache.qpid.nclient</packages>
                     </group>
                     <group>
                       <title>Utility Package</title>
-                       <packages>org.apache.qpidity.nclient.util</packages>
+                       <packages>org.apache.qpid.nclient.util</packages>
                     </group>
                   </groups>
                </configuration>
diff --git a/java/client/src/main/grammar/SelectorParser.jj b/java/client/src/main/grammar/SelectorParser.jj
index a72da526ae..b45cf1a487 100644
--- a/java/client/src/main/grammar/SelectorParser.jj
+++ b/java/client/src/main/grammar/SelectorParser.jj
@@ -61,20 +61,20 @@ PARSER_BEGIN(SelectorParser)
  *

  */

 

-package org.apache.qpidity.filter.selector;

+package org.apache.qpid.filter.selector;

 

 import java.io.StringReader;

 import java.util.ArrayList;

 

-import org.apache.qpidity.QpidException;

-import org.apache.qpidity.filter.ArithmeticExpression;

-import org.apache.qpidity.filter.BooleanExpression;

-import org.apache.qpidity.filter.ComparisonExpression;

-import org.apache.qpidity.filter.ConstantExpression;

-import org.apache.qpidity.filter.Expression;

-import org.apache.qpidity.filter.LogicExpression;

-import org.apache.qpidity.filter.PropertyExpression;

-import org.apache.qpidity.filter.UnaryExpression;

+import org.apache.qpid.QpidException;

+import org.apache.qpid.filter.ArithmeticExpression;

+import org.apache.qpid.filter.BooleanExpression;

+import org.apache.qpid.filter.ComparisonExpression;

+import org.apache.qpid.filter.ConstantExpression;

+import org.apache.qpid.filter.Expression;

+import org.apache.qpid.filter.LogicExpression;

+import org.apache.qpid.filter.PropertyExpression;

+import org.apache.qpid.filter.UnaryExpression;

 

 /**

  * JMS Selector Parser generated by JavaCC

diff --git a/java/client/src/main/java/client.log4j b/java/client/src/main/java/client.log4j
index a5531bb874..19cc946118 100644
--- a/java/client/src/main/java/client.log4j
+++ b/java/client/src/main/java/client.log4j
@@ -21,15 +21,10 @@ log4j.rootLogger=${root.logging.level}
 

 #log4j.logger.org.apache.qpid=${amqj.logging.level}, console

 #log4j.additivity.org.apache.qpid=false

-#log4j.logger.org.apache.qpidity.transport=TRACE, console

 

 log4j.logger.org.apache.qpid=ERROR, console

 log4j.additivity.org.apache.qpid=false

 

-log4j.logger.org.apache.qpidity=ERROR, console

-log4j.additivity.org.apache.qpidity=false

-

-#log4j.logger.org.apache.qpidity.transport=DEBUG, console

 #log4j.logger.org.apache.qpid.client.message.AbstractBytesTypedMessage=DEBUG, console

 

 log4j.appender.console=org.apache.log4j.ConsoleAppender

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
index ce10553210..a2df2f3cf2 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
@@ -12,11 +12,11 @@ import org.apache.qpid.client.failover.FailoverException;
 import org.apache.qpid.framing.ProtocolVersion;
 import org.apache.qpid.jms.BrokerDetails;
 import org.apache.qpid.jms.Session;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.ClosedListener;
-import org.apache.qpidity.ErrorCode;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.transport.ProtocolVersionException;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.ClosedListener;
+import org.apache.qpid.ErrorCode;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.transport.ProtocolVersionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,7 +35,7 @@ public class AMQConnectionDelegate_0_10 implements AMQConnectionDelegate, Closed
     /**
      * The QpidConeection instance that is mapped with thie JMS connection.
      */
-    org.apache.qpidity.nclient.Connection _qpidConnection;
+    org.apache.qpid.nclient.Connection _qpidConnection;
 
     //--- constructor
     public AMQConnectionDelegate_0_10(AMQConnection conn)
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
index 9dff8e3e7e..cf73bc5089 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
@@ -28,16 +28,16 @@ import org.apache.qpid.client.protocol.AMQProtocolHandler;
 import org.apache.qpid.client.message.MessageFactoryRegistry;
 import org.apache.qpid.client.message.FiledTableSupport;
 import org.apache.qpid.util.Serial;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-import org.apache.qpidity.ErrorCode;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.transport.MessageCreditUnit;
-import org.apache.qpidity.transport.MessageFlowMode;
-import org.apache.qpidity.transport.RangeSet;
-import org.apache.qpidity.transport.Option;
-import org.apache.qpidity.transport.ExchangeBoundResult;
-import org.apache.qpidity.transport.Future;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+import org.apache.qpid.ErrorCode;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.transport.MessageCreditUnit;
+import org.apache.qpid.transport.MessageFlowMode;
+import org.apache.qpid.transport.RangeSet;
+import org.apache.qpid.transport.Option;
+import org.apache.qpid.transport.ExchangeBoundResult;
+import org.apache.qpid.transport.Future;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -71,8 +71,8 @@ public class AMQSession_0_10 extends AMQSession
     private Object _currentExceptionLock = new Object();
     private QpidException _currentException;
 
-    // a ref on the qpidity connection
-    protected org.apache.qpidity.nclient.Connection _qpidConnection;
+    // a ref on the qpid connection
+    protected org.apache.qpid.nclient.Connection _qpidConnection;
 
     private RangeSet unacked = new RangeSet();
     private int unackedCount = 0;
@@ -96,7 +96,7 @@ public class AMQSession_0_10 extends AMQSession
      * @param defaultPrefetchLowMark  The number of prefetched messages at which to resume the session.
      * @param qpidConnection          The qpid connection
      */
-    AMQSession_0_10(org.apache.qpidity.nclient.Connection qpidConnection, AMQConnection con, int channelId,
+    AMQSession_0_10(org.apache.qpid.nclient.Connection qpidConnection, AMQConnection con, int channelId,
                     boolean transacted, int acknowledgeMode, MessageFactoryRegistry messageFactoryRegistry,
                     int defaultPrefetchHighMark, int defaultPrefetchLowMark)
     {
@@ -126,7 +126,7 @@ public class AMQSession_0_10 extends AMQSession
      * @param defaultPrefetchLow  The number of prefetched messages at which to resume the session.
      * @param qpidConnection      The connection
      */
-    AMQSession_0_10(org.apache.qpidity.nclient.Connection qpidConnection, AMQConnection con, int channelId,
+    AMQSession_0_10(org.apache.qpid.nclient.Connection qpidConnection, AMQConnection con, int channelId,
                     boolean transacted, int acknowledgeMode, int defaultPrefetchHigh, int defaultPrefetchLow)
     {
 
@@ -594,7 +594,7 @@ public class AMQSession_0_10 extends AMQSession
      *
      * @return The associated Qpid Session.
      */
-    protected org.apache.qpidity.nclient.Session getQpidSession()
+    protected org.apache.qpid.nclient.Session getQpidSession()
     {
         return _qpidSession;
     }
@@ -645,7 +645,7 @@ public class AMQSession_0_10 extends AMQSession
     /**
      * Lstener for qpid protocol exceptions
      */
-    private class QpidSessionExceptionListener implements org.apache.qpidity.nclient.ClosedListener
+    private class QpidSessionExceptionListener implements org.apache.qpid.nclient.ClosedListener
     {
         public void onClosed(ErrorCode errorCode, String reason, Throwable t)
         {
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
index 9230225bd5..255b38aa10 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
@@ -27,12 +27,12 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.jms.*;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.transport.*;
-import org.apache.qpidity.transport.Session;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.filter.MessageFilter;
-import org.apache.qpidity.filter.JMSSelectorFilter;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.transport.*;
+import org.apache.qpid.transport.Session;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.filter.MessageFilter;
+import org.apache.qpid.filter.JMSSelectorFilter;
 
 import javax.jms.InvalidSelectorException;
 import javax.jms.JMSException;
@@ -46,7 +46,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * This is a 0.10 message consumer.
  */
 public class BasicMessageConsumer_0_10 extends BasicMessageConsumer<Struct[], ByteBuffer>
-        implements org.apache.qpidity.nclient.util.MessageListener
+        implements org.apache.qpid.nclient.util.MessageListener
 {
 
     /**
@@ -108,7 +108,7 @@ public class BasicMessageConsumer_0_10 extends BasicMessageConsumer<Struct[], By
         _isStarted = connection.started();
     }
 
-    // ----- Interface org.apache.qpidity.client.util.MessageListener
+    // ----- Interface org.apache.qpid.client.util.MessageListener
 
     /**
      *
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
index 5e6a5b5f40..4e906b387d 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
@@ -33,13 +33,13 @@ import org.apache.qpid.client.protocol.AMQProtocolHandler;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.url.AMQBindingURL;
-import org.apache.qpidity.nclient.util.ByteBufferMessage;
-import org.apache.qpidity.njms.ExceptionHelper;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageDeliveryMode;
-import org.apache.qpidity.transport.MessageDeliveryPriority;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.ReplyTo;
+import org.apache.qpid.nclient.util.ByteBufferMessage;
+import org.apache.qpid.njms.ExceptionHelper;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageDeliveryMode;
+import org.apache.qpid.transport.MessageDeliveryPriority;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.ReplyTo;
 
 /**
  * This is a 0_10 message producer.
@@ -208,7 +208,7 @@ public class BasicMessageProducer_0_10 extends BasicMessageProducer
         // send the message
         try
         {
-            org.apache.qpidity.nclient.Session ssn = ((AMQSession_0_10) getSession()).getQpidSession();
+            org.apache.qpid.nclient.Session ssn = ((AMQSession_0_10) getSession()).getQpidSession();
 
             // if true, we need to sync the delivery of this message
             boolean sync = (deliveryMode == DeliveryMode.PERSISTENT &&
diff --git a/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java b/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
index b10eac3a1d..6763c72ecd 100644
--- a/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
+++ b/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
@@ -21,9 +21,9 @@ import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.dtx.XidImpl;
-import org.apache.qpidity.transport.*;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.dtx.XidImpl;
+import org.apache.qpid.transport.*;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -86,7 +86,7 @@ public class XAResourceImpl implements XAResource
         }
         catch (SessionException e)
         {
-            // we need to restore the qpidity session that has been closed
+            // we need to restore the qpid session that has been closed
             _xaSession.createSession();
             // we should get a single exception
             convertExecutionErrorToXAErr(e.getExceptions().get(0).getErrorCode());
@@ -140,7 +140,7 @@ public class XAResourceImpl implements XAResource
         }
         catch (SessionException e)
         {
-            // we need to restore the qpidity session that has been closed
+            // we need to restore the qpid session that has been closed
             _xaSession.createSession();
             // we should get a single exception
             convertExecutionErrorToXAErr(e.getExceptions().get(0).getErrorCode());
@@ -169,7 +169,7 @@ public class XAResourceImpl implements XAResource
         }
         catch (SessionException e)
         {
-            // we need to restore the qpidity session that has been closed
+            // we need to restore the qpid session that has been closed
             _xaSession.createSession();
             // we should get a single exception
             convertExecutionErrorToXAErr(e.getExceptions().get(0).getErrorCode());
@@ -199,7 +199,7 @@ public class XAResourceImpl implements XAResource
             }
             catch (SessionException e)
             {
-                // we need to restore the qpidity session that has been closed
+                // we need to restore the qpid session that has been closed
                 _xaSession.createSession();
                 // we should get a single exception
                 convertExecutionErrorToXAErr(e.getExceptions().get(0).getErrorCode());
@@ -246,7 +246,7 @@ public class XAResourceImpl implements XAResource
         }
         catch (SessionException e)
         {
-            // we need to restore the qpidity session that has been closed
+            // we need to restore the qpid session that has been closed
             _xaSession.createSession();
             // we should get a single exception
             convertExecutionErrorToXAErr(e.getExceptions().get(0).getErrorCode());
@@ -289,7 +289,7 @@ public class XAResourceImpl implements XAResource
         }
         catch (SessionException e)
         {
-            // we need to restore the qpidity session that has been closed
+            // we need to restore the qpid session that has been closed
             _xaSession.createSession();
             // we should get a single exception
             convertExecutionErrorToXAErr( e.getExceptions().get(0).getErrorCode());
@@ -298,7 +298,7 @@ public class XAResourceImpl implements XAResource
         int i = 0;
         for (Object obj : res.getInDoubt())
         {
-            org.apache.qpidity.transport.Xid xid = (org.apache.qpidity.transport.Xid) obj;
+            org.apache.qpid.transport.Xid xid = (org.apache.qpid.transport.Xid) obj;
             result[i] = new XidImpl(xid.getBranchId(), (int) xid.getFormat(), xid.getGlobalId());
             i++;
         }
@@ -327,7 +327,7 @@ public class XAResourceImpl implements XAResource
         }
         catch (SessionException e)
         {
-            // we need to restore the qpidity session that has been closed
+            // we need to restore the qpid session that has been closed
             _xaSession.createSession();
             // we should get a single exception
             convertExecutionErrorToXAErr( e.getExceptions().get(0).getErrorCode());
@@ -411,7 +411,7 @@ public class XAResourceImpl implements XAResource
         }
         catch (SessionException e)
         {
-            // we need to restore the qpidity session that has been closed
+            // we need to restore the qpid session that has been closed
             _xaSession.createSession();
             // we should get a single exception
             convertExecutionErrorToXAErr(e.getExceptions().get(0).getErrorCode());
@@ -512,7 +512,7 @@ public class XAResourceImpl implements XAResource
      * @return the qpid formated xid
      * @throws XAException when xid is null or when it cannot be converted. 
      */
-    private org.apache.qpidity.transport.Xid convertXid(Xid xid) throws XAException
+    private org.apache.qpid.transport.Xid convertXid(Xid xid) throws XAException
     {
         if (xid == null)
         {
diff --git a/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java b/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
index 1eda71cc63..51b4b7899f 100644
--- a/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
+++ b/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.client;
 
-import org.apache.qpidity.nclient.DtxSession;
+import org.apache.qpid.nclient.DtxSession;
 import org.apache.qpid.client.message.MessageFactoryRegistry;
 
 import javax.jms.*;
@@ -48,7 +48,7 @@ public class XASessionImpl extends AMQSession_0_10 implements XASession, XATopic
     /**
      * Create a JMS XASession
      */
-    public XASessionImpl(org.apache.qpidity.nclient.Connection qpidConnection, AMQConnection con, int channelId,
+    public XASessionImpl(org.apache.qpid.nclient.Connection qpidConnection, AMQConnection con, int channelId,
                          int defaultPrefetchHigh, int defaultPrefetchLow)
     {
         super(qpidConnection, con, channelId, false,  // this is not a transacted session
@@ -61,7 +61,7 @@ public class XASessionImpl extends AMQSession_0_10 implements XASession, XATopic
     //-- public methods
 
     /**
-     * Create a qpidity session.
+     * Create a qpid session.
      */
     public void createSession()
     {
@@ -126,7 +126,7 @@ public class XASessionImpl extends AMQSession_0_10 implements XASession, XATopic
      *
      * @return The associated Qpid Session.
      */
-    protected org.apache.qpidity.nclient.DtxSession getQpidSession()
+    protected org.apache.qpid.nclient.DtxSession getQpidSession()
     {
         return _qpidDtxSession;
     }
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
index ab284116af..dc3a483538 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
@@ -69,9 +69,9 @@ public abstract class AbstractJMSMessage extends AMQMessage implements org.apach
     /**
      * This is 0_10 specific
      */
-    private org.apache.qpidity.api.Message _010message = null;
+    private org.apache.qpid.api.Message _010message = null;
 
-    public void set010Message(org.apache.qpidity.api.Message m )
+    public void set010Message(org.apache.qpid.api.Message m )
     {
         _010message = m;
     }
@@ -103,7 +103,7 @@ public abstract class AbstractJMSMessage extends AMQMessage implements org.apach
      * End 010 specific
      */
 
-    public org.apache.qpidity.api.Message get010Message()
+    public org.apache.qpid.api.Message get010Message()
     {
         return _010message;
     }
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
index 0dbad3726c..e14c343613 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
@@ -27,9 +27,9 @@ import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ContentBody;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpidity.transport.Struct;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.DeliveryProperties;
+import org.apache.qpid.transport.Struct;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.DeliveryProperties;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java b/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
index c6b22592e0..6c9acdef01 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
@@ -27,7 +27,7 @@ import javax.jms.JMSException;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpidity.transport.Struct;
+import org.apache.qpid.transport.Struct;
 
 
 public interface MessageFactory
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java b/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
index 24ab471f10..6117b18fde 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
@@ -30,9 +30,9 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpidity.transport.Struct;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
+import org.apache.qpid.transport.Struct;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java b/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java
index 09f41a9ba6..5093064edf 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java
@@ -25,8 +25,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.Struct;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.Struct;
 
 /**
  * This class contains everything needed to process a JMS message. It assembles the deliver body, the content header and
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/ArithmeticExpression.java b/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
index 279716598d..56d1bdcdc5 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/ArithmeticExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/BinaryExpression.java b/java/client/src/main/java/org/apache/qpid/filter/BinaryExpression.java
index 465b504ae3..f97f858fad 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/BinaryExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/BinaryExpression.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
 /**
  * An expression which performs an operation on two expression values.
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/BooleanExpression.java b/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
index 9a3b1c3106..cc24c81729 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/BooleanExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/ComparisonExpression.java b/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
index 46f387b293..adf360698b 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/ComparisonExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 import java.util.HashSet;
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/ConstantExpression.java b/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
index 26aeec2de8..447de914a4 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/ConstantExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 import java.math.BigDecimal;
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/Expression.java b/java/client/src/main/java/org/apache/qpid/filter/Expression.java
index bdc3c9cccc..e578775a77 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/Expression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/Expression.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/JMSSelectorFilter.java b/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
index c73da1682a..dcfb9a9940 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/JMSSelectorFilter.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
@@ -15,12 +15,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.filter.selector.SelectorParser;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.filter.selector.SelectorParser;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/LogicExpression.java b/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
index 7f5909df43..d7aabd5a46 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/LogicExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/MessageFilter.java b/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
index aa1303a373..a775080d81 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/MessageFilter.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/PropertyExpression.java b/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
index 5ea2004d75..700c6a15ac 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/PropertyExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
@@ -15,12 +15,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
 import org.apache.qpid.framing.CommonContentHeaderProperties;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.client.message.AbstractJMSMessage;
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/filter/UnaryExpression.java b/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
index f73449679c..b620b107c4 100644
--- a/java/client/src/main/java/org/apache/qpidity/filter/UnaryExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.filter;
+package org.apache.qpid.filter;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 import java.math.BigDecimal;
diff --git a/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java b/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
index 72ba16086d..0316255b2c 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
@@ -48,7 +48,7 @@ public interface BrokerDetails
     public static final long DEFAULT_CONNECT_TIMEOUT = 30000L;
     public static final boolean USE_SSL_DEFAULT = false;
 
-    // pulled these properties from the new BrokerDetails class in the qpidity package
+    // pulled these properties from the new BrokerDetails class in the qpid package
     public static final String PROTOCOL_TCP = "tcp";
     public static final String PROTOCOL_TLS = "tls";
 
diff --git a/java/client/src/main/java/org/apache/qpidity/naming/ReadOnlyContext.java b/java/client/src/main/java/org/apache/qpid/naming/ReadOnlyContext.java
index c73d6e4b35..59ec4cfba7 100644
--- a/java/client/src/main/java/org/apache/qpidity/naming/ReadOnlyContext.java
+++ b/java/client/src/main/java/org/apache/qpid/naming/ReadOnlyContext.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.naming;
+package org.apache.qpid.naming;
 
 import org.apache.qpid.jndi.NameParserImpl;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/naming/jndi.properties b/java/client/src/main/java/org/apache/qpid/naming/jndi.properties
index e451cf53fa..830de5f619 100644
--- a/java/client/src/main/java/org/apache/qpidity/naming/jndi.properties
+++ b/java/client/src/main/java/org/apache/qpid/naming/jndi.properties
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-java.naming.factory.initial = org.apache.qpidity.naming.PropertiesFileInitialConextFactory
+java.naming.factory.initial = org.apache.qpid.naming.PropertiesFileInitialConextFactory
 
 # use the following property to configure the default connector
 #java.naming.provider.url - ignored.
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/Client.java b/java/client/src/main/java/org/apache/qpid/nclient/Client.java
index eb0e370560..bed3ee02cb 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/Client.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.qpidity.nclient;
+package org.apache.qpid.nclient;
 
 import java.util.List;
 import java.util.UUID;
@@ -29,27 +29,27 @@ import java.util.concurrent.locks.ReentrantLock;
 import org.apache.qpid.client.url.URLParser_0_10;
 import org.apache.qpid.jms.BrokerDetails;
 import org.apache.qpid.url.QpidURL;
-import org.apache.qpidity.ErrorCode;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.nclient.impl.ClientSession;
-import org.apache.qpidity.nclient.impl.ClientSessionDelegate;
-import org.apache.qpidity.transport.Channel;
-import org.apache.qpidity.transport.ClientDelegate;
-import org.apache.qpidity.transport.Connection;
-import org.apache.qpidity.transport.ConnectionClose;
-import org.apache.qpidity.transport.ConnectionCloseCode;
-import org.apache.qpidity.transport.ConnectionCloseOk;
-import org.apache.qpidity.transport.ProtocolHeader;
-import org.apache.qpidity.transport.ProtocolVersionException;
-import org.apache.qpidity.transport.SessionDelegate;
-import org.apache.qpidity.transport.network.io.IoTransport;
-import org.apache.qpidity.transport.network.mina.MinaHandler;
-import org.apache.qpidity.transport.network.nio.NioHandler;
+import org.apache.qpid.ErrorCode;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.nclient.impl.ClientSession;
+import org.apache.qpid.nclient.impl.ClientSessionDelegate;
+import org.apache.qpid.transport.Channel;
+import org.apache.qpid.transport.ClientDelegate;
+import org.apache.qpid.transport.Connection;
+import org.apache.qpid.transport.ConnectionClose;
+import org.apache.qpid.transport.ConnectionCloseCode;
+import org.apache.qpid.transport.ConnectionCloseOk;
+import org.apache.qpid.transport.ProtocolHeader;
+import org.apache.qpid.transport.ProtocolVersionException;
+import org.apache.qpid.transport.SessionDelegate;
+import org.apache.qpid.transport.network.io.IoTransport;
+import org.apache.qpid.transport.network.mina.MinaHandler;
+import org.apache.qpid.transport.network.nio.NioHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
-public class Client implements org.apache.qpidity.nclient.Connection
+public class Client implements org.apache.qpid.nclient.Connection
 {
     private Connection _conn;
     private ClosedListener _closedListner;
@@ -65,7 +65,7 @@ public class Client implements org.apache.qpidity.nclient.Connection
      *
      * @return returns a new connection to the broker.
      */
-    public static org.apache.qpidity.nclient.Connection createConnection()
+    public static org.apache.qpid.nclient.Connection createConnection()
     {
         return new Client();
     }
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/ClosedListener.java b/java/client/src/main/java/org/apache/qpid/nclient/ClosedListener.java
index c0c6978a14..4cf0cab1ec 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/ClosedListener.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/ClosedListener.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.nclient;
+package org.apache.qpid.nclient;
 
-import org.apache.qpidity.ErrorCode;
+import org.apache.qpid.ErrorCode;
 
 
 /**
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/Connection.java b/java/client/src/main/java/org/apache/qpid/nclient/Connection.java
index 49167750d1..2d5b50b33a 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/Connection.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/Connection.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.nclient;
+package org.apache.qpid.nclient;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 
 /**
  * This represents a physical connection to a broker.
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/DtxSession.java b/java/client/src/main/java/org/apache/qpid/nclient/DtxSession.java
index 1d9c63df4f..8a859f2d84 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/DtxSession.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/DtxSession.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.nclient;
+package org.apache.qpid.nclient;
 
-import org.apache.qpidity.transport.Future;
-import org.apache.qpidity.transport.GetTimeoutResult;
-import org.apache.qpidity.transport.Option;
-import org.apache.qpidity.transport.RecoverResult;
-import org.apache.qpidity.transport.XaResult;
-import org.apache.qpidity.transport.Xid;
+import org.apache.qpid.transport.Future;
+import org.apache.qpid.transport.GetTimeoutResult;
+import org.apache.qpid.transport.Option;
+import org.apache.qpid.transport.RecoverResult;
+import org.apache.qpid.transport.XaResult;
+import org.apache.qpid.transport.Xid;
 
 /**
  * The resources for this session are controlled under the scope of a distributed transaction.
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/JMSTestCase.java b/java/client/src/main/java/org/apache/qpid/nclient/JMSTestCase.java
index feb4c1c94d..4e1b9058e6 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/JMSTestCase.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/JMSTestCase.java
@@ -1,4 +1,4 @@
- package org.apache.qpidity.nclient;
+ package org.apache.qpid.nclient;
 
 import java.util.Enumeration;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/MessagePartListener.java b/java/client/src/main/java/org/apache/qpid/nclient/MessagePartListener.java
index 7c7881502a..2fdc74fc09 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/MessagePartListener.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/MessagePartListener.java
@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.nclient;
+package org.apache.qpid.nclient;
 
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.transport.Header;
+import org.apache.qpid.transport.Header;
 
 /**
  * Assembles message parts.
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/Session.java b/java/client/src/main/java/org/apache/qpid/nclient/Session.java
index 218a7ed571..e4daaa094e 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/Session.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/Session.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.nclient;
+package org.apache.qpid.nclient;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Map;
 
-import org.apache.qpidity.transport.*;
-import org.apache.qpidity.api.Message;
+import org.apache.qpid.transport.*;
+import org.apache.qpid.api.Message;
 
 /**
  * <p>A session is associated with a connection.
@@ -116,8 +116,8 @@ public interface Session
      * <br><b><i>This method should only be used by large messages</b></i><br>
      * There are two convenience Message classes to do this.
      * <ul>
-     * <li> <code>{@link org.apache.qpidity.nclient.util.FileMessage}</code>
-     * <li> <code>{@link org.apache.qpidity.nclient.util.StreamingMessage}</code>
+     * <li> <code>{@link org.apache.qpid.nclient.util.FileMessage}</code>
+     * <li> <code>{@link org.apache.qpid.nclient.util.StreamingMessage}</code>
      * </ul>
      * You can also implement a <code>Message</code> interface to wrap any
      * data stream.
@@ -160,8 +160,8 @@ public interface Session
      * Make a set of headers to be sent together with a message
      *
      * @param headers headers to be added
-     * @see org.apache.qpidity.transport.DeliveryProperties
-     * @see org.apache.qpidity.transport.MessageProperties
+     * @see org.apache.qpid.transport.DeliveryProperties
+     * @see org.apache.qpid.transport.MessageProperties
      * @return The added headers.
      */
     public Header header(Struct... headers);
@@ -229,7 +229,7 @@ public interface Session
      *                    acquired when the transfer starts.
      *                    </ul>
      * @param listener    The listener for this destination. To transfer large messages
-     *                    use a {@link org.apache.qpidity.nclient.MessagePartListener}.
+     *                    use a {@link org.apache.qpid.nclient.MessagePartListener}.
      * @param options     Set of options. Valid options are {{@link Option#EXCLUSIVE}
      *                    and {@link Option#NONE}.
      * @param filter      A set of filters for the subscription. The syntax and semantics of these filters varies
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/impl/ClientSession.java b/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java
index f7978d0d98..ffde5336f9 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/impl/ClientSession.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java
@@ -1,4 +1,4 @@
-package org.apache.qpidity.nclient.impl;
+package org.apache.qpid.nclient.impl;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -7,22 +7,22 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.ClosedListener;
-import org.apache.qpidity.nclient.MessagePartListener;
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
-import org.apache.qpidity.transport.Option;
-import org.apache.qpidity.transport.Range;
-import org.apache.qpidity.transport.RangeSet;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.ClosedListener;
+import org.apache.qpid.nclient.MessagePartListener;
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
+import org.apache.qpid.transport.Option;
+import org.apache.qpid.transport.Range;
+import org.apache.qpid.transport.RangeSet;
 
-import static org.apache.qpidity.transport.Option.*;
+import static org.apache.qpid.transport.Option.*;
 
 /**
  * Implements a Qpid Sesion.
  */
-public class ClientSession extends org.apache.qpidity.transport.Session implements  org.apache.qpidity.nclient.DtxSession
+public class ClientSession extends org.apache.qpid.transport.Session implements  org.apache.qpid.nclient.DtxSession
 {
     static
     {
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/impl/ClientSessionDelegate.java b/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSessionDelegate.java
index da6f5e7d45..b57fd0a7ed 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/impl/ClientSessionDelegate.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSessionDelegate.java
@@ -1,20 +1,20 @@
-package org.apache.qpidity.nclient.impl;
+package org.apache.qpid.nclient.impl;
 
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.ErrorCode;
+import org.apache.qpid.ErrorCode;
 
-import org.apache.qpidity.nclient.MessagePartListener;
+import org.apache.qpid.nclient.MessagePartListener;
 
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.transport.Data;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.transport.MessageReject;
-import org.apache.qpidity.transport.MessageTransfer;
-import org.apache.qpidity.transport.Range;
-import org.apache.qpidity.transport.Session;
-import org.apache.qpidity.transport.SessionDetached;
-import org.apache.qpidity.transport.SessionDelegate;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.transport.Data;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.transport.MessageReject;
+import org.apache.qpid.transport.MessageTransfer;
+import org.apache.qpid.transport.Range;
+import org.apache.qpid.transport.Session;
+import org.apache.qpid.transport.SessionDetached;
+import org.apache.qpid.transport.SessionDelegate;
 
 
 public class ClientSessionDelegate extends SessionDelegate
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/impl/Constants.java b/java/client/src/main/java/org/apache/qpid/nclient/impl/Constants.java
index 83d491baad..f689e9abde 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/impl/Constants.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/impl/Constants.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.qpidity.nclient.impl;
+package org.apache.qpid.nclient.impl;
 
 /**
  * This class holds all the 0.10 client constants which value can be set
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/impl/DemoClient.java b/java/client/src/main/java/org/apache/qpid/nclient/impl/DemoClient.java
index 05b99a3cf1..96e1d2c772 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/impl/DemoClient.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/impl/DemoClient.java
@@ -1,17 +1,17 @@
-package org.apache.qpidity.nclient.impl;
+package org.apache.qpid.nclient.impl;
 
-import org.apache.qpidity.ErrorCode;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.ClosedListener;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
-import org.apache.qpidity.transport.MessageProperties;
+import org.apache.qpid.ErrorCode;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.ClosedListener;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
+import org.apache.qpid.transport.MessageProperties;
 
 import java.util.UUID;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/impl/LargeMsgDemoClient.java b/java/client/src/main/java/org/apache/qpid/nclient/impl/LargeMsgDemoClient.java
index 64ffe17fe0..36c0a4b3be 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/impl/LargeMsgDemoClient.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/impl/LargeMsgDemoClient.java
@@ -1,18 +1,18 @@
-package org.apache.qpidity.nclient.impl;
+package org.apache.qpid.nclient.impl;
 
 import java.io.FileInputStream;
 
-import org.apache.qpidity.ErrorCode;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.ClosedListener;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.FileMessage;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
+import org.apache.qpid.ErrorCode;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.ClosedListener;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.FileMessage;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
 
 import java.util.UUID;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/interop/BasicInteropTest.java b/java/client/src/main/java/org/apache/qpid/nclient/interop/BasicInteropTest.java
index e452091622..513c1a95de 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/interop/BasicInteropTest.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/interop/BasicInteropTest.java
@@ -1,24 +1,24 @@
-package org.apache.qpidity.nclient.interop;
+package org.apache.qpid.nclient.interop;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.qpidity.ErrorCode;
-import org.apache.qpidity.QpidException;
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.ClosedListener;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
-import org.apache.qpidity.transport.MessageCreditUnit;
-import org.apache.qpidity.transport.MessageFlowMode;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.RangeSet;
+import org.apache.qpid.ErrorCode;
+import org.apache.qpid.QpidException;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.ClosedListener;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
+import org.apache.qpid.transport.MessageCreditUnit;
+import org.apache.qpid.transport.MessageFlowMode;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.RangeSet;
 
 public class BasicInteropTest implements ClosedListener
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/util/ByteBufferMessage.java b/java/client/src/main/java/org/apache/qpid/nclient/util/ByteBufferMessage.java
index 833f905b58..8973127105 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/util/ByteBufferMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/util/ByteBufferMessage.java
@@ -1,14 +1,14 @@
-package org.apache.qpidity.nclient.util;
+package org.apache.qpid.nclient.util;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.LinkedList;
 import java.util.Queue;
 
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.api.Message;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.api.Message;
 
 /**
  * <p>A Simple implementation of the message interface
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/util/FileMessage.java b/java/client/src/main/java/org/apache/qpid/nclient/util/FileMessage.java
index 289d03574d..179c91c2e9 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/util/FileMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/util/FileMessage.java
@@ -1,4 +1,4 @@
-package org.apache.qpidity.nclient.util;
+package org.apache.qpid.nclient.util;
 
 import java.io.EOFException;
 import java.io.FileInputStream;
@@ -7,10 +7,10 @@ import java.nio.ByteBuffer;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
 
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.api.Message;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.api.Message;
 
 /**
  * FileMessage provides pull style semantics for
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/util/MessageListener.java b/java/client/src/main/java/org/apache/qpid/nclient/util/MessageListener.java
index 43c20eb6b5..c5edd62143 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/util/MessageListener.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/util/MessageListener.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.nclient.util;
+package org.apache.qpid.nclient.util;
 
-import org.apache.qpidity.api.Message;
+import org.apache.qpid.api.Message;
 
 /**
  *A message listener
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/util/MessagePartListenerAdapter.java b/java/client/src/main/java/org/apache/qpid/nclient/util/MessagePartListenerAdapter.java
index 757d44fbbb..3f1746f48a 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/util/MessagePartListenerAdapter.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/util/MessagePartListenerAdapter.java
@@ -1,12 +1,12 @@
-package org.apache.qpidity.nclient.util;
+package org.apache.qpid.nclient.util;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.nclient.MessagePartListener;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.nclient.MessagePartListener;
 
 /**
  * This is a simple message assembler.
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/util/ReadOnlyMessage.java b/java/client/src/main/java/org/apache/qpid/nclient/util/ReadOnlyMessage.java
index 8ff5c62a25..6583a95c7e 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/util/ReadOnlyMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/util/ReadOnlyMessage.java
@@ -1,10 +1,10 @@
-package org.apache.qpidity.nclient.util;
+package org.apache.qpid.nclient.util;
 
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.api.Message;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.api.Message;
 
 public abstract class ReadOnlyMessage implements Message
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/util/StreamingMessage.java b/java/client/src/main/java/org/apache/qpid/nclient/util/StreamingMessage.java
index 6c7f9e9db7..a4574438ac 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/util/StreamingMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/util/StreamingMessage.java
@@ -1,14 +1,14 @@
-package org.apache.qpidity.nclient.util;
+package org.apache.qpid.nclient.util;
 
 import java.io.EOFException;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
 
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.api.Message;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.api.Message;
 
 public class StreamingMessage extends ReadOnlyMessage implements Message
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/njms/ExceptionHelper.java b/java/client/src/main/java/org/apache/qpid/njms/ExceptionHelper.java
index e00f9008d3..ce790a3b24 100644
--- a/java/client/src/main/java/org/apache/qpidity/njms/ExceptionHelper.java
+++ b/java/client/src/main/java/org/apache/qpid/njms/ExceptionHelper.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.njms;
+package org.apache.qpid.njms;
 
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 
 import javax.jms.JMSException;
 import javax.transaction.xa.XAException;
diff --git a/java/common/Composite.tpl b/java/common/Composite.tpl
index 5df1ef44fb..37e3bf8853 100644
--- a/java/common/Composite.tpl
+++ b/java/common/Composite.tpl
@@ -1,4 +1,4 @@
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -6,12 +6,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.qpidity.transport.codec.Decoder;
-import org.apache.qpidity.transport.codec.Encodable;
-import org.apache.qpidity.transport.codec.Encoder;
-import org.apache.qpidity.transport.codec.Validator;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encodable;
+import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.transport.codec.Validator;
 
-import org.apache.qpidity.transport.network.Frame;
+import org.apache.qpid.transport.network.Frame;
 
 ${
 from genutil import *
diff --git a/java/common/Constant.tpl b/java/common/Constant.tpl
index 695812ea75..7194a61dfc 100644
--- a/java/common/Constant.tpl
+++ b/java/common/Constant.tpl
@@ -1,4 +1,4 @@
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 ${from genutil import *}
 
diff --git a/java/common/Enum.tpl b/java/common/Enum.tpl
index 337feb7065..2ec1d22522 100644
--- a/java/common/Enum.tpl
+++ b/java/common/Enum.tpl
@@ -1,4 +1,4 @@
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 public enum $name {
 ${
diff --git a/java/common/Invoker.tpl b/java/common/Invoker.tpl
index 4e174619f0..21a17624a6 100644
--- a/java/common/Invoker.tpl
+++ b/java/common/Invoker.tpl
@@ -1,4 +1,4 @@
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 import java.util.List;
 import java.util.Map;
diff --git a/java/common/MethodDelegate.tpl b/java/common/MethodDelegate.tpl
index e5ab1ae1e7..84fa0e43da 100644
--- a/java/common/MethodDelegate.tpl
+++ b/java/common/MethodDelegate.tpl
@@ -1,4 +1,4 @@
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 public abstract class MethodDelegate<C> {
 
diff --git a/java/common/Option.tpl b/java/common/Option.tpl
index 3228949d87..d45c004f6f 100644
--- a/java/common/Option.tpl
+++ b/java/common/Option.tpl
@@ -1,4 +1,4 @@
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 public enum Option {
 
diff --git a/java/common/StructFactory.tpl b/java/common/StructFactory.tpl
index b27621b1d2..f3dcbbd68a 100644
--- a/java/common/StructFactory.tpl
+++ b/java/common/StructFactory.tpl
@@ -1,4 +1,4 @@
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 class StructFactory {
 
diff --git a/java/common/Type.tpl b/java/common/Type.tpl
index c869934538..c58e08a342 100644
--- a/java/common/Type.tpl
+++ b/java/common/Type.tpl
@@ -1,4 +1,4 @@
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 ${from genutil import *}
 
diff --git a/java/common/codegen b/java/common/codegen
index ab1ab1c542..6cd51565ea 100755
--- a/java/common/codegen
+++ b/java/common/codegen
@@ -7,7 +7,7 @@ from genutil import *
 out_dir = sys.argv[1]
 spec_file = sys.argv[2]
 tpl_dir = sys.argv[3]
-pkg_dir = os.path.join(out_dir, "org/apache/qpidity/transport")
+pkg_dir = os.path.join(out_dir, "org/apache/qpid/transport")
 
 if not os.path.exists(pkg_dir):
   os.makedirs(pkg_dir)
diff --git a/java/common/pom.xml b/java/common/pom.xml
index 714087d843..894ca26710 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -61,7 +61,7 @@
 <!--                                <exec executable="python">
                                   <arg line="generate"/>
                                   <arg line="${generated.path}"/>
-                                  <arg line="org.apache.qpidity"/>
+                                  <arg line="org.apache.qpid"/>
                                   <arg line="${specs.dir}/amqp-transitional.0-10.xml"/>
                                 </exec> -->
                             </tasks>
diff --git a/java/common/src/main/java/log4j.properties b/java/common/src/main/java/log4j.properties
index 0b3b96933e..44f89dc805 100644
--- a/java/common/src/main/java/log4j.properties
+++ b/java/common/src/main/java/log4j.properties
@@ -23,8 +23,6 @@ log4j.logger.qpid.protocol=${amqj.protocol.logging.level}, console
 log4j.additivity.qpid.protocol=false
 log4j.logger.org.apache.qpid=${amqj.logging.level}, console
 log4j.additivity.org.apache.qpid=false
-log4j.logger.org.apache.qpidity=${amqj.logging.level}, console
-log4j.additivity.org.apache.qpidity=false
 
 
 log4j.appender.console=org.apache.log4j.ConsoleAppender
diff --git a/java/common/src/main/java/org/apache/qpidity/BrokerDetails.java b/java/common/src/main/java/org/apache/qpid/BrokerDetails.java
index 29a4f5a9c0..63f67a7857 100644
--- a/java/common/src/main/java/org/apache/qpidity/BrokerDetails.java
+++ b/java/common/src/main/java/org/apache/qpid/BrokerDetails.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity;
+package org.apache.qpid;
 
 import java.util.Map;
 
diff --git a/java/common/src/main/java/org/apache/qpidity/BrokerDetailsImpl.java b/java/common/src/main/java/org/apache/qpid/BrokerDetailsImpl.java
index 6de6055f1c..201d43e21f 100644
--- a/java/common/src/main/java/org/apache/qpidity/BrokerDetailsImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/BrokerDetailsImpl.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity;
+package org.apache.qpid;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/java/common/src/main/java/org/apache/qpidity/ConsoleOutput.java b/java/common/src/main/java/org/apache/qpid/ConsoleOutput.java
index 6262bd25c6..f17782ebf4 100644
--- a/java/common/src/main/java/org/apache/qpidity/ConsoleOutput.java
+++ b/java/common/src/main/java/org/apache/qpid/ConsoleOutput.java
@@ -18,13 +18,13 @@
  * under the License.
  *
  */
-package org.apache.qpidity;
+package org.apache.qpid;
 
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.transport.Sender;
+import org.apache.qpid.transport.Sender;
 
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.util.Functions.*;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/ErrorCode.java b/java/common/src/main/java/org/apache/qpid/ErrorCode.java
index 4b18c46d16..be1ad16dd5 100644
--- a/java/common/src/main/java/org/apache/qpidity/ErrorCode.java
+++ b/java/common/src/main/java/org/apache/qpid/ErrorCode.java
@@ -1,4 +1,4 @@
-package org.apache.qpidity;
+package org.apache.qpid;
 
 public enum ErrorCode
 {
diff --git a/java/common/src/main/java/org/apache/qpidity/QpidConfig.java b/java/common/src/main/java/org/apache/qpid/QpidConfig.java
index b5aad12f10..e8d42fdf83 100644
--- a/java/common/src/main/java/org/apache/qpidity/QpidConfig.java
+++ b/java/common/src/main/java/org/apache/qpid/QpidConfig.java
@@ -1,4 +1,4 @@
-package org.apache.qpidity;
+package org.apache.qpid;
 
 /**
  * API to configure the Security parameters of the client.
@@ -11,11 +11,11 @@ public class QpidConfig
     private static QpidConfig _instance = new QpidConfig();
     
     private SecurityMechanism[] securityMechanisms = 
-        new SecurityMechanism[]{new SecurityMechanism("PLAIN","org.apache.qpidity.security.UsernamePasswordCallbackHandler"),
-                                new SecurityMechanism("CRAM_MD5","org.apache.qpidity.security.UsernamePasswordCallbackHandler")};
+        new SecurityMechanism[]{new SecurityMechanism("PLAIN","org.apache.qpid.security.UsernamePasswordCallbackHandler"),
+                                new SecurityMechanism("CRAM_MD5","org.apache.qpid.security.UsernamePasswordCallbackHandler")};
 
     private SaslClientFactory[] saslClientFactories =
-        new SaslClientFactory[]{new SaslClientFactory("AMQPLAIN","org.apache.qpidity.security.amqplain.AmqPlainSaslClientFactory")};       
+        new SaslClientFactory[]{new SaslClientFactory("AMQPLAIN","org.apache.qpid.security.amqplain.AmqPlainSaslClientFactory")};       
     
    private  QpidConfig(){}
     
diff --git a/java/common/src/main/java/org/apache/qpidity/QpidException.java b/java/common/src/main/java/org/apache/qpid/QpidException.java
index 81e9145282..8503adaef8 100644
--- a/java/common/src/main/java/org/apache/qpidity/QpidException.java
+++ b/java/common/src/main/java/org/apache/qpid/QpidException.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity;
+package org.apache.qpid;
 
 public class QpidException extends Exception
 {
diff --git a/java/common/src/main/java/org/apache/qpidity/SecurityHelper.java b/java/common/src/main/java/org/apache/qpid/SecurityHelper.java
index a72997813a..dda5a6506d 100644
--- a/java/common/src/main/java/org/apache/qpidity/SecurityHelper.java
+++ b/java/common/src/main/java/org/apache/qpid/SecurityHelper.java
@@ -18,15 +18,15 @@
  * under the License.
  *
  */
-package org.apache.qpidity;
+package org.apache.qpid;
 
 import java.io.UnsupportedEncodingException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.apache.qpidity.security.AMQPCallbackHandler;
-import org.apache.qpidity.security.CallbackHandlerRegistry;
+import org.apache.qpid.security.AMQPCallbackHandler;
+import org.apache.qpid.security.CallbackHandlerRegistry;
 
 public class SecurityHelper
 {
diff --git a/java/common/src/main/java/org/apache/qpidity/ToyBroker.java b/java/common/src/main/java/org/apache/qpid/ToyBroker.java
index 0055855c0a..56286a9b01 100644
--- a/java/common/src/main/java/org/apache/qpidity/ToyBroker.java
+++ b/java/common/src/main/java/org/apache/qpid/ToyBroker.java
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-package org.apache.qpidity;
+package org.apache.qpid;
 
-import org.apache.qpidity.transport.*;
-import org.apache.qpidity.transport.network.mina.MinaHandler;
+import org.apache.qpid.transport.*;
+import org.apache.qpid.transport.network.mina.MinaHandler;
 
-import static org.apache.qpidity.transport.util.Functions.str;
+import static org.apache.qpid.transport.util.Functions.str;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/java/common/src/main/java/org/apache/qpidity/ToyClient.java b/java/common/src/main/java/org/apache/qpid/ToyClient.java
index 0912f3bdd9..27a48fb760 100644
--- a/java/common/src/main/java/org/apache/qpidity/ToyClient.java
+++ b/java/common/src/main/java/org/apache/qpid/ToyClient.java
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-package org.apache.qpidity;
+package org.apache.qpid;
 
 import java.util.*;
 
-import org.apache.qpidity.transport.*;
-import org.apache.qpidity.transport.network.mina.MinaHandler;
+import org.apache.qpid.transport.*;
+import org.apache.qpid.transport.network.mina.MinaHandler;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/ToyExchange.java b/java/common/src/main/java/org/apache/qpid/ToyExchange.java
index eab5f6c078..5c3c0ac0fb 100644
--- a/java/common/src/main/java/org/apache/qpidity/ToyExchange.java
+++ b/java/common/src/main/java/org/apache/qpid/ToyExchange.java
@@ -1,4 +1,4 @@
-package org.apache.qpidity;
+package org.apache.qpid;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -9,7 +9,7 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.qpidity.ToyBroker.Message;
+import org.apache.qpid.ToyBroker.Message;
 
 public class ToyExchange
 {
diff --git a/java/common/src/main/java/org/apache/qpidity/api/Message.java b/java/common/src/main/java/org/apache/qpid/api/Message.java
index f5488fde52..df6f279026 100644
--- a/java/common/src/main/java/org/apache/qpidity/api/Message.java
+++ b/java/common/src/main/java/org/apache/qpid/api/Message.java
@@ -1,11 +1,11 @@
-package org.apache.qpidity.api;
+package org.apache.qpid.api;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.transport.MessageProperties;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.Header;
+import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.Header;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/java/common/src/main/java/org/apache/qpidity/dtx/XidImpl.java b/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java
index 89d7e7917f..49effc2dae 100644
--- a/java/common/src/main/java/org/apache/qpidity/dtx/XidImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java
@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.dtx;
+package org.apache.qpid.dtx;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.QpidException;
 
 import javax.transaction.xa.Xid;
 
@@ -241,9 +241,9 @@ public class XidImpl implements Xid
      * @return The String representation of this Xid
      * @throws QpidException In case of problem when converting this Xid into a string.
      */
-    public static org.apache.qpidity.transport.Xid convert(Xid xid) throws QpidException
+    public static org.apache.qpid.transport.Xid convert(Xid xid) throws QpidException
     {
-        return new org.apache.qpidity.transport.Xid(xid.getFormatId(),
+        return new org.apache.qpid.transport.Xid(xid.getFormatId(),
                                                     xid.getGlobalTransactionId(),
                                                     xid.getBranchQualifier());
     }
diff --git a/java/common/src/main/java/org/apache/qpidity/security/AMQPCallbackHandler.java b/java/common/src/main/java/org/apache/qpid/security/AMQPCallbackHandler.java
index 2e7afa1b87..a3dad9acdc 100644
--- a/java/common/src/main/java/org/apache/qpidity/security/AMQPCallbackHandler.java
+++ b/java/common/src/main/java/org/apache/qpid/security/AMQPCallbackHandler.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.security;
+package org.apache.qpid.security;
 
 import javax.security.auth.callback.CallbackHandler;
 
diff --git a/java/common/src/main/java/org/apache/qpidity/security/CallbackHandlerRegistry.java b/java/common/src/main/java/org/apache/qpid/security/CallbackHandlerRegistry.java
index b23fea7e4a..8c80a1b5b7 100644
--- a/java/common/src/main/java/org/apache/qpidity/security/CallbackHandlerRegistry.java
+++ b/java/common/src/main/java/org/apache/qpid/security/CallbackHandlerRegistry.java
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-package org.apache.qpidity.security;
+package org.apache.qpid.security;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.qpidity.QpidConfig;
+import org.apache.qpid.QpidConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/java/common/src/main/java/org/apache/qpidity/security/DynamicSaslRegistrar.java b/java/common/src/main/java/org/apache/qpid/security/DynamicSaslRegistrar.java
index 1798f0c210..9f48ac96a3 100644
--- a/java/common/src/main/java/org/apache/qpidity/security/DynamicSaslRegistrar.java
+++ b/java/common/src/main/java/org/apache/qpid/security/DynamicSaslRegistrar.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.security;
+package org.apache.qpid.security;
 
 import java.security.Security;
 import java.util.Map;
@@ -26,7 +26,7 @@ import java.util.TreeMap;
 
 import javax.security.sasl.SaslClientFactory;
 
-import org.apache.qpidity.QpidConfig;
+import org.apache.qpid.QpidConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/java/common/src/main/java/org/apache/qpidity/security/JCAProvider.java b/java/common/src/main/java/org/apache/qpid/security/JCAProvider.java
index c775171a5f..033deb550c 100644
--- a/java/common/src/main/java/org/apache/qpidity/security/JCAProvider.java
+++ b/java/common/src/main/java/org/apache/qpid/security/JCAProvider.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.security;
+package org.apache.qpid.security;
 
 import java.security.Provider;
 import java.security.Security;
diff --git a/java/common/src/main/java/org/apache/qpidity/security/UsernamePasswordCallbackHandler.java b/java/common/src/main/java/org/apache/qpid/security/UsernamePasswordCallbackHandler.java
index 0fd647e015..89a63abeab 100644
--- a/java/common/src/main/java/org/apache/qpidity/security/UsernamePasswordCallbackHandler.java
+++ b/java/common/src/main/java/org/apache/qpid/security/UsernamePasswordCallbackHandler.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.security;
+package org.apache.qpid.security;
 
 import java.io.IOException;
 
diff --git a/java/common/src/main/java/org/apache/qpidity/security/amqplain/AmqPlainSaslClient.java b/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClient.java
index 6e4a0218d2..81acc66de4 100644
--- a/java/common/src/main/java/org/apache/qpidity/security/amqplain/AmqPlainSaslClient.java
+++ b/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClient.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.security.amqplain;
+package org.apache.qpid.security.amqplain;
 
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.FieldTableFactory;
diff --git a/java/common/src/main/java/org/apache/qpidity/security/amqplain/AmqPlainSaslClientFactory.java b/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClientFactory.java
index abc881f433..6c66c87f4c 100644
--- a/java/common/src/main/java/org/apache/qpidity/security/amqplain/AmqPlainSaslClientFactory.java
+++ b/java/common/src/main/java/org/apache/qpid/security/amqplain/AmqPlainSaslClientFactory.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.security.amqplain;
+package org.apache.qpid.security.amqplain;
 
 import javax.security.sasl.SaslClientFactory;
 import javax.security.sasl.SaslClient;
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/Binary.java b/java/common/src/main/java/org/apache/qpid/transport/Binary.java
index 1a1112d424..e6dedc536f 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/Binary.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Binary.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/Binding.java b/java/common/src/main/java/org/apache/qpid/transport/Binding.java
index 18ed97098d..8418c42189 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/Binding.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Binding.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/Channel.java b/java/common/src/main/java/org/apache/qpid/transport/Channel.java
index 50341d2c20..7a967adbba 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/Channel.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Channel.java
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
-import org.apache.qpidity.transport.network.Frame;
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.transport.util.Logger;
 
 import java.nio.ByteBuffer;
 
@@ -30,8 +30,8 @@ import java.util.List;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import static org.apache.qpidity.transport.network.Frame.*;
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.network.Frame.*;
+import static org.apache.qpid.transport.util.Functions.*;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/ChannelDelegate.java b/java/common/src/main/java/org/apache/qpid/transport/ChannelDelegate.java
index 96578ffeb8..8475fbf174 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/ChannelDelegate.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/ChannelDelegate.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 import java.util.UUID;
 
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/ClientDelegate.java b/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
index e770157af4..bbdadfadb9 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/ClientDelegate.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/Connection.java b/java/common/src/main/java/org/apache/qpid/transport/Connection.java
index d83bc7d2f5..f1db5a6866 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/Connection.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Connection.java
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.util.Logger;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/ConnectionDelegate.java b/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
index 14bde3f18d..90b22983d9 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/ConnectionDelegate.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.util.Logger;
 
-import org.apache.qpidity.SecurityHelper;
-import org.apache.qpidity.QpidException;
+import org.apache.qpid.SecurityHelper;
+import org.apache.qpid.QpidException;
 
 import java.io.UnsupportedEncodingException;
 
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/Data.java b/java/common/src/main/java/org/apache/qpid/transport/Data.java
index 31e5a99935..fbf7428864 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/Data.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Data.java
@@ -18,15 +18,15 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
-import org.apache.qpidity.transport.network.Frame;
+import org.apache.qpid.transport.network.Frame;
 
 import java.nio.ByteBuffer;
 
 import java.util.Collections;
 
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.util.Functions.*;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/Echo.java b/java/common/src/main/java/org/apache/qpid/transport/Echo.java
index ed323c7eac..f8debcf923 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/Echo.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Echo.java
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.transport.network.mina.MinaHandler;
+import org.apache.qpid.transport.network.mina.MinaHandler;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/Field.java b/java/common/src/main/java/org/apache/qpid/transport/Field.java
index ebbd59288b..bc6bf10041 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/Field.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Field.java
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
-import org.apache.qpidity.transport.codec.Decoder;
-import org.apache.qpidity.transport.codec.Encoder;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encoder;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/Future.java b/java/common/src/main/java/org/apache/qpid/transport/Future.java
index 8936f06831..d8cde61af5 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/Future.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Future.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/Header.java b/java/common/src/main/java/org/apache/qpid/transport/Header.java
index 221fc37f58..3b351ee828 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/Header.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Header.java
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
-import org.apache.qpidity.transport.network.Frame;
+import org.apache.qpid.transport.network.Frame;
 
 import java.util.List;
 import java.nio.ByteBuffer;
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/Method.java b/java/common/src/main/java/org/apache/qpid/transport/Method.java
index 6589cc79b4..1c80d8c00c 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/Method.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Method.java
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
-import org.apache.qpidity.transport.network.Frame;
+import org.apache.qpid.transport.network.Frame;
 
 /**
  * Method
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/ProtocolDelegate.java b/java/common/src/main/java/org/apache/qpid/transport/ProtocolDelegate.java
index 028d570416..9fa28fbe23 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/ProtocolDelegate.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/ProtocolDelegate.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/ProtocolError.java b/java/common/src/main/java/org/apache/qpid/transport/ProtocolError.java
index 586695af22..bd6ab81997 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/ProtocolError.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/ProtocolError.java
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
-import org.apache.qpidity.transport.network.NetworkDelegate;
-import org.apache.qpidity.transport.network.NetworkEvent;
+import org.apache.qpid.transport.network.NetworkDelegate;
+import org.apache.qpid.transport.network.NetworkEvent;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/ProtocolEvent.java b/java/common/src/main/java/org/apache/qpid/transport/ProtocolEvent.java
index 03439be9ce..60234c1537 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/ProtocolEvent.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/ProtocolEvent.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/ProtocolHeader.java b/java/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java
index eea945c7c6..fa0c1e9c63 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/ProtocolHeader.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java
@@ -18,13 +18,13 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.transport.network.NetworkDelegate;
-import org.apache.qpidity.transport.network.NetworkEvent;
-import org.apache.qpidity.transport.network.Frame;
+import org.apache.qpid.transport.network.NetworkDelegate;
+import org.apache.qpid.transport.network.NetworkEvent;
+import org.apache.qpid.transport.network.Frame;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/ProtocolVersionException.java b/java/common/src/main/java/org/apache/qpid/transport/ProtocolVersionException.java
index 86fe7a3f3f..2de0c169a5 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/ProtocolVersionException.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/ProtocolVersionException.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/Range.java b/java/common/src/main/java/org/apache/qpid/transport/Range.java
index 14522cd45f..f4335dc8a6 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/Range.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Range.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/RangeSet.java b/java/common/src/main/java/org/apache/qpid/transport/RangeSet.java
index e05e399262..217b81f43f 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/RangeSet.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/RangeSet.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 import java.util.Iterator;
 import java.util.ListIterator;
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/Receiver.java b/java/common/src/main/java/org/apache/qpid/transport/Receiver.java
index 8952ebf2a5..2a994580dc 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/Receiver.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Receiver.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/Result.java b/java/common/src/main/java/org/apache/qpid/transport/Result.java
index 2126a76a53..1116492a8d 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/Result.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Result.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/Sender.java b/java/common/src/main/java/org/apache/qpid/transport/Sender.java
index ba3e67e578..9a6f675d7f 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/Sender.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Sender.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/Session.java b/java/common/src/main/java/org/apache/qpid/transport/Session.java
index 75dd9fc2ff..8ec13c0ee7 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/Session.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Session.java
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 
-import org.apache.qpidity.transport.network.Frame;
+import org.apache.qpid.transport.network.Frame;
 
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.util.Logger;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -33,8 +33,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static org.apache.qpidity.transport.Option.*;
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.Option.*;
+import static org.apache.qpid.transport.util.Functions.*;
 import static org.apache.qpid.util.Serial.*;
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/SessionDelegate.java b/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java
index 0e289c54e9..dc400d3098 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/SessionDelegate.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
-import org.apache.qpidity.transport.network.Frame;
+import org.apache.qpid.transport.network.Frame;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/SessionException.java b/java/common/src/main/java/org/apache/qpid/transport/SessionException.java
index fc866f3694..dc294b2206 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/SessionException.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/SessionException.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 import java.util.List;
 
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/Struct.java b/java/common/src/main/java/org/apache/qpid/transport/Struct.java
index a15d0a1fb8..22bd9f34ad 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/Struct.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Struct.java
@@ -18,14 +18,14 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 import java.util.List;
 import java.util.Map;
 
-import org.apache.qpidity.transport.codec.Decoder;
-import org.apache.qpidity.transport.codec.Encodable;
-import org.apache.qpidity.transport.codec.Encoder;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encodable;
+import org.apache.qpid.transport.codec.Encoder;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/TransportException.java b/java/common/src/main/java/org/apache/qpid/transport/TransportException.java
index 593209df82..5ef15154fc 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/TransportException.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/TransportException.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java b/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java
index 77899ad712..a8a4997ae7 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.codec;
+package org.apache.qpid.transport.codec;
 
 import java.io.UnsupportedEncodingException;
 
@@ -29,12 +29,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.qpidity.transport.Binary;
-import org.apache.qpidity.transport.RangeSet;
-import org.apache.qpidity.transport.Struct;
-import org.apache.qpidity.transport.Type;
+import org.apache.qpid.transport.Binary;
+import org.apache.qpid.transport.RangeSet;
+import org.apache.qpid.transport.Struct;
+import org.apache.qpid.transport.Type;
 
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.util.Functions.*;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java b/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractEncoder.java
index 8908b94ed3..908d14a307 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractEncoder.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.codec;
+package org.apache.qpid.transport.codec;
 
 import java.io.UnsupportedEncodingException;
 
@@ -31,12 +31,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.qpidity.transport.Range;
-import org.apache.qpidity.transport.RangeSet;
-import org.apache.qpidity.transport.Struct;
-import org.apache.qpidity.transport.Type;
+import org.apache.qpid.transport.Range;
+import org.apache.qpid.transport.RangeSet;
+import org.apache.qpid.transport.Struct;
+import org.apache.qpid.transport.Type;
 
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.util.Functions.*;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/codec/BBDecoder.java b/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java
index f036fd8dee..dd634eb94a 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/codec/BBDecoder.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.codec;
+package org.apache.qpid.transport.codec;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-import org.apache.qpidity.transport.Binary;
+import org.apache.qpid.transport.Binary;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/codec/BBEncoder.java b/java/common/src/main/java/org/apache/qpid/transport/codec/BBEncoder.java
index a976d38efc..788b6a55e3 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/codec/BBEncoder.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/codec/BBEncoder.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.codec;
+package org.apache.qpid.transport.codec;
 
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/codec/Decoder.java b/java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java
index dec901748d..50e787ccb2 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/codec/Decoder.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java
@@ -18,14 +18,14 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.codec;
+package org.apache.qpid.transport.codec;
 
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.qpidity.transport.RangeSet;
-import org.apache.qpidity.transport.Struct;
+import org.apache.qpid.transport.RangeSet;
+import org.apache.qpid.transport.Struct;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/codec/Encodable.java b/java/common/src/main/java/org/apache/qpid/transport/codec/Encodable.java
index 60c2ea97b8..2aefafd19c 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/codec/Encodable.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/codec/Encodable.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.codec;
+package org.apache.qpid.transport.codec;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/codec/Encoder.java b/java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java
index 9d7a1a695d..2d8d13e80a 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/codec/Encoder.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java
@@ -18,14 +18,14 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.codec;
+package org.apache.qpid.transport.codec;
 
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.qpidity.transport.RangeSet;
-import org.apache.qpidity.transport.Struct;
+import org.apache.qpid.transport.RangeSet;
+import org.apache.qpid.transport.Struct;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/codec/Validator.java b/java/common/src/main/java/org/apache/qpid/transport/codec/Validator.java
index 743e9f3cae..ae12d35209 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/codec/Validator.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/codec/Validator.java
@@ -18,14 +18,14 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.codec;
+package org.apache.qpid.transport.codec;
 
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.qpidity.transport.RangeSet;
-import org.apache.qpidity.transport.Struct;
+import org.apache.qpid.transport.RangeSet;
+import org.apache.qpid.transport.Struct;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java b/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
index 45e2576e7b..2c09776c3d 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.network;
+package org.apache.qpid.transport.network;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,18 +27,18 @@ import java.util.Map;
 
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.transport.codec.BBDecoder;
-import org.apache.qpidity.transport.codec.Decoder;
-
-import org.apache.qpidity.transport.Data;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.transport.Method;
-import org.apache.qpidity.transport.ProtocolError;
-import org.apache.qpidity.transport.ProtocolEvent;
-import org.apache.qpidity.transport.ProtocolHeader;
-import org.apache.qpidity.transport.Receiver;
-import org.apache.qpidity.transport.SegmentType;
-import org.apache.qpidity.transport.Struct;
+import org.apache.qpid.transport.codec.BBDecoder;
+import org.apache.qpid.transport.codec.Decoder;
+
+import org.apache.qpid.transport.Data;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.transport.Method;
+import org.apache.qpid.transport.ProtocolError;
+import org.apache.qpid.transport.ProtocolEvent;
+import org.apache.qpid.transport.ProtocolHeader;
+import org.apache.qpid.transport.Receiver;
+import org.apache.qpid.transport.SegmentType;
+import org.apache.qpid.transport.Struct;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java b/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
index fe7939c0d8..1ed446af2f 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
@@ -18,25 +18,25 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.network;
+package org.apache.qpid.transport.network;
 
-import org.apache.qpidity.transport.codec.BBEncoder;
+import org.apache.qpid.transport.codec.BBEncoder;
 
-import org.apache.qpidity.transport.Data;
-import org.apache.qpidity.transport.Header;
-import org.apache.qpidity.transport.Method;
-import org.apache.qpidity.transport.ProtocolDelegate;
-import org.apache.qpidity.transport.ProtocolError;
-import org.apache.qpidity.transport.ProtocolEvent;
-import org.apache.qpidity.transport.ProtocolHeader;
-import org.apache.qpidity.transport.SegmentType;
-import org.apache.qpidity.transport.Sender;
-import org.apache.qpidity.transport.Struct;
+import org.apache.qpid.transport.Data;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.transport.Method;
+import org.apache.qpid.transport.ProtocolDelegate;
+import org.apache.qpid.transport.ProtocolError;
+import org.apache.qpid.transport.ProtocolEvent;
+import org.apache.qpid.transport.ProtocolHeader;
+import org.apache.qpid.transport.SegmentType;
+import org.apache.qpid.transport.Sender;
+import org.apache.qpid.transport.Struct;
 
 import java.nio.ByteBuffer;
 import java.util.Iterator;
 
-import static org.apache.qpidity.transport.network.Frame.*;
+import static org.apache.qpid.transport.network.Frame.*;
 
 import static java.lang.Math.*;
 
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/Frame.java b/java/common/src/main/java/org/apache/qpid/transport/network/Frame.java
index 7b8675b39d..849355276e 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/Frame.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/Frame.java
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.network;
+package org.apache.qpid.transport.network;
 
-import org.apache.qpidity.transport.SegmentType;
-import org.apache.qpidity.transport.util.SliceIterator;
+import org.apache.qpid.transport.SegmentType;
+import org.apache.qpid.transport.util.SliceIterator;
 
 import java.nio.ByteBuffer;
 
@@ -29,7 +29,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Iterator;
 
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.util.Functions.*;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java b/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java
index 8963f831da..408c95e075 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java
@@ -18,19 +18,19 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.network;
+package org.apache.qpid.transport.network;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-import org.apache.qpidity.transport.ProtocolError;
-import org.apache.qpidity.transport.ProtocolHeader;
-import org.apache.qpidity.transport.Receiver;
-import org.apache.qpidity.transport.SegmentType;
+import org.apache.qpid.transport.ProtocolError;
+import org.apache.qpid.transport.ProtocolHeader;
+import org.apache.qpid.transport.Receiver;
+import org.apache.qpid.transport.SegmentType;
 
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.util.Functions.*;
 
-import static org.apache.qpidity.transport.network.InputHandler.State.*;
+import static org.apache.qpid.transport.network.InputHandler.State.*;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/NetworkDelegate.java b/java/common/src/main/java/org/apache/qpid/transport/network/NetworkDelegate.java
index 48655edd0c..fbdfe6e84c 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/NetworkDelegate.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/NetworkDelegate.java
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.network;
+package org.apache.qpid.transport.network;
 
-import org.apache.qpidity.transport.ProtocolError;
-import org.apache.qpidity.transport.ProtocolHeader;
+import org.apache.qpid.transport.ProtocolError;
+import org.apache.qpid.transport.ProtocolHeader;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/NetworkEvent.java b/java/common/src/main/java/org/apache/qpid/transport/network/NetworkEvent.java
index 080efee704..91314cd4ad 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/NetworkEvent.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/NetworkEvent.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.network;
+package org.apache.qpid.transport.network;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/OutputHandler.java b/java/common/src/main/java/org/apache/qpid/transport/network/OutputHandler.java
index e2ef8ca0d5..b3f400a6e7 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/OutputHandler.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/OutputHandler.java
@@ -18,19 +18,19 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.network;
+package org.apache.qpid.transport.network;
 
 import java.nio.ByteBuffer;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.qpidity.transport.Constant;
-import org.apache.qpidity.transport.ProtocolError;
-import org.apache.qpidity.transport.ProtocolHeader;
-import org.apache.qpidity.transport.Sender;
+import org.apache.qpid.transport.Constant;
+import org.apache.qpid.transport.ProtocolError;
+import org.apache.qpid.transport.ProtocolHeader;
+import org.apache.qpid.transport.Sender;
 
-import static org.apache.qpidity.transport.network.Frame.*;
+import static org.apache.qpid.transport.network.Frame.*;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/io/IoReceiver.java b/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
index 426c41dd55..5e64bdfba1 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/io/IoReceiver.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
@@ -18,11 +18,11 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.network.io;
+package org.apache.qpid.transport.network.io;
 
-import org.apache.qpidity.transport.Receiver;
-import org.apache.qpidity.transport.TransportException;
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.Receiver;
+import org.apache.qpid.transport.TransportException;
+import org.apache.qpid.transport.util.Logger;
 
 import java.io.InputStream;
 import java.io.IOException;
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/io/IoSender.java b/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
index 0c65b583ff..591b4bba3e 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/io/IoSender.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity.transport.network.io;
+package org.apache.qpid.transport.network.io;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -26,11 +26,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.qpidity.transport.Sender;
-import org.apache.qpidity.transport.TransportException;
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.Sender;
+import org.apache.qpid.transport.TransportException;
+import org.apache.qpid.transport.util.Logger;
 
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.util.Functions.*;
 
 
 final class IoSender extends Thread implements Sender<ByteBuffer>
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/io/IoTransport.java b/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java
index 07a2c70965..2f05cf5e55 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/io/IoTransport.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.qpidity.transport.network.io;
+package org.apache.qpid.transport.network.io;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -26,15 +26,15 @@ import java.net.Socket;
 import java.net.SocketException;
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.transport.Connection;
-import org.apache.qpidity.transport.ConnectionDelegate;
-import org.apache.qpidity.transport.Receiver;
-import org.apache.qpidity.transport.TransportException;
-import org.apache.qpidity.transport.network.Assembler;
-import org.apache.qpidity.transport.network.Disassembler;
-import org.apache.qpidity.transport.network.InputHandler;
-import org.apache.qpidity.transport.network.OutputHandler;
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.Connection;
+import org.apache.qpid.transport.ConnectionDelegate;
+import org.apache.qpid.transport.Receiver;
+import org.apache.qpid.transport.TransportException;
+import org.apache.qpid.transport.network.Assembler;
+import org.apache.qpid.transport.network.Disassembler;
+import org.apache.qpid.transport.network.InputHandler;
+import org.apache.qpid.transport.network.OutputHandler;
+import org.apache.qpid.transport.util.Logger;
 
 /**
  * This class provides a socket based transport using the java.io
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java b/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaHandler.java
index c6855e3d48..bcac7c4e16 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaHandler.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.network.mina;
+package org.apache.qpid.transport.network.mina;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -33,20 +33,20 @@ import org.apache.mina.filter.ReadThrottleFilterBuilder;
 import org.apache.mina.filter.WriteBufferLimitFilterBuilder;
 import org.apache.mina.filter.executor.ExecutorFilter;
 
-import org.apache.qpidity.transport.Binding;
-import org.apache.qpidity.transport.Connection;
-import org.apache.qpidity.transport.ConnectionDelegate;
-import org.apache.qpidity.transport.Receiver;
-import org.apache.qpidity.transport.Sender;
+import org.apache.qpid.transport.Binding;
+import org.apache.qpid.transport.Connection;
+import org.apache.qpid.transport.ConnectionDelegate;
+import org.apache.qpid.transport.Receiver;
+import org.apache.qpid.transport.Sender;
 
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.util.Logger;
 
-import org.apache.qpidity.transport.network.Assembler;
-import org.apache.qpidity.transport.network.Disassembler;
-import org.apache.qpidity.transport.network.InputHandler;
-import org.apache.qpidity.transport.network.OutputHandler;
+import org.apache.qpid.transport.network.Assembler;
+import org.apache.qpid.transport.network.Disassembler;
+import org.apache.qpid.transport.network.InputHandler;
+import org.apache.qpid.transport.network.OutputHandler;
 
-import static org.apache.qpidity.transport.util.Functions.*;
+import static org.apache.qpid.transport.util.Functions.*;
 
 /**
  * MinaHandler
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaSender.java b/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java
index a53c36ae2e..69d4061e0c 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaSender.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java
@@ -18,15 +18,15 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.network.mina;
+package org.apache.qpid.transport.network.mina;
 
 import org.apache.mina.common.ByteBuffer;
 import org.apache.mina.common.CloseFuture;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.common.WriteFuture;
 
-import org.apache.qpidity.transport.Sender;
-import org.apache.qpidity.transport.TransportException;
+import org.apache.qpid.transport.Sender;
+import org.apache.qpid.transport.TransportException;
 
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/nio/NioHandler.java b/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java
index a7339427c7..f0161efe97 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/nio/NioHandler.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java
@@ -1,4 +1,4 @@
-package org.apache.qpidity.transport.network.nio;
+package org.apache.qpid.transport.network.nio;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -11,13 +11,13 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.qpidity.transport.Connection;
-import org.apache.qpidity.transport.ConnectionDelegate;
-import org.apache.qpidity.transport.Receiver;
-import org.apache.qpidity.transport.network.Assembler;
-import org.apache.qpidity.transport.network.Disassembler;
-import org.apache.qpidity.transport.network.InputHandler;
-import org.apache.qpidity.transport.network.OutputHandler;
+import org.apache.qpid.transport.Connection;
+import org.apache.qpid.transport.ConnectionDelegate;
+import org.apache.qpid.transport.Receiver;
+import org.apache.qpid.transport.network.Assembler;
+import org.apache.qpid.transport.network.Disassembler;
+import org.apache.qpid.transport.network.InputHandler;
+import org.apache.qpid.transport.network.OutputHandler;
 
 public class NioHandler implements Runnable
 {
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/nio/NioSender.java b/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java
index 798f24b528..33e888cc56 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/nio/NioSender.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java
@@ -1,9 +1,9 @@
-package org.apache.qpidity.transport.network.nio;
+package org.apache.qpid.transport.network.nio;
 
 import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
 
-import org.apache.qpidity.transport.Sender;
+import org.apache.qpid.transport.Sender;
 
 public class NioSender implements Sender<java.nio.ByteBuffer>
 {
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/util/Functions.java b/java/common/src/main/java/org/apache/qpid/transport/util/Functions.java
index 0038cdf118..2c6984e302 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/util/Functions.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/util/Functions.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.util;
+package org.apache.qpid.transport.util;
 
 import java.nio.ByteBuffer;
 
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/util/Logger.java b/java/common/src/main/java/org/apache/qpid/transport/util/Logger.java
index 0159036a34..77f592b6c6 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/util/Logger.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/util/Logger.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.util;
+package org.apache.qpid.transport.util;
 
 import org.slf4j.LoggerFactory;
 
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/util/SliceIterator.java b/java/common/src/main/java/org/apache/qpid/transport/util/SliceIterator.java
index 32392a3561..3db29847b2 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/util/SliceIterator.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/util/SliceIterator.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport.util;
+package org.apache.qpid.transport.util;
 
 import java.nio.ByteBuffer;
 
diff --git a/java/common/src/main/java/org/apache/qpid/url/BindingURLImpl.java b/java/common/src/main/java/org/apache/qpid/url/BindingURLImpl.java
index 2cf035f601..f12fb2cff2 100644
--- a/java/common/src/main/java/org/apache/qpid/url/BindingURLImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/url/BindingURLImpl.java
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.url;
 
-import org.apache.qpidity.exchange.ExchangeDefaults;
+import org.apache.qpid.exchange.ExchangeDefaults;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
 
diff --git a/java/common/src/main/java/org/apache/qpid/url/QpidURL.java b/java/common/src/main/java/org/apache/qpid/url/QpidURL.java
index 1d94b31de2..5ab4425323 100644
--- a/java/common/src/main/java/org/apache/qpid/url/QpidURL.java
+++ b/java/common/src/main/java/org/apache/qpid/url/QpidURL.java
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.url;
 
-import org.apache.qpidity.BrokerDetails;
+import org.apache.qpid.BrokerDetails;
 
 import java.util.List;
 
diff --git a/java/common/src/main/java/org/apache/qpid/url/QpidURLImpl.java b/java/common/src/main/java/org/apache/qpid/url/QpidURLImpl.java
index b4a55e2bf4..f92934db7f 100644
--- a/java/common/src/main/java/org/apache/qpid/url/QpidURLImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/url/QpidURLImpl.java
@@ -17,8 +17,8 @@
  */
 package org.apache.qpid.url;
 
-import org.apache.qpidity.BrokerDetails;
-import org.apache.qpidity.BrokerDetailsImpl;
+import org.apache.qpid.BrokerDetails;
+import org.apache.qpid.BrokerDetailsImpl;
 
 import java.net.MalformedURLException;
 import java.util.ArrayList;
diff --git a/java/common/src/main/java/org/apache/qpidity/exchange/ExchangeDefaults.java b/java/common/src/main/java/org/apache/qpidity/exchange/ExchangeDefaults.java
deleted file mode 100644
index a99ea56d69..0000000000
--- a/java/common/src/main/java/org/apache/qpidity/exchange/ExchangeDefaults.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpidity.exchange;
-
-/**
- * Default exchange names
- */
-public class ExchangeDefaults
-{
-    /** The default direct exchange, which is a special internal exchange that cannot be explicitly bound to. */
-    public static final String DEFAULT_EXCHANGE_NAME = "<<default>>";
-
-    /** The pre-defined topic exchange, the broker SHOULD provide this. */
-    public static final String TOPIC_EXCHANGE_NAME =  "amq.topic";
-
-    /** Defines the identifying type name of topic exchanges. */
-    public static final String TOPIC_EXCHANGE_CLASS =  "topic";
-
-    /** The pre-defined direct exchange, the broker MUST provide this. */
-    public static final String DIRECT_EXCHANGE_NAME =  "amq.direct";
-
-    /** Defines the identifying type name of direct exchanges. */
-    public static final String DIRECT_EXCHANGE_CLASS =  "direct";
-
-    /** The pre-defined headers exchange, the specification does not say this needs to be provided. */
-    public static final String HEADERS_EXCHANGE_NAME =  "amq.match";
-
-    /** Defines the identifying type name of headers exchanges. */
-    public static final String HEADERS_EXCHANGE_CLASS =  "headers";
-
-    /** The pre-defined fanout exchange, the boker MUST provide this. */
-    public static final String FANOUT_EXCHANGE_NAME =  "amq.fanout";
-
-    /** Defines the identifying type name of fanout exchanges. */
-    public static final String FANOUT_EXCHANGE_CLASS =  "fanout";
-}
diff --git a/java/common/src/test/java/org/apache/qpidity/transport/ConnectionTest.java b/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
index c604aaf3e4..a211b1d937 100644
--- a/java/common/src/test/java/org/apache/qpidity/transport/ConnectionTest.java
+++ b/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
@@ -18,15 +18,15 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 import org.apache.mina.util.AvailablePortFinder;
 
 import org.apache.qpid.util.concurrent.Condition;
 
-import org.apache.qpidity.transport.network.io.IoTransport;
-import org.apache.qpidity.transport.network.mina.MinaHandler;
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.network.io.IoTransport;
+import org.apache.qpid.transport.network.mina.MinaHandler;
+import org.apache.qpid.transport.util.Logger;
 
 import junit.framework.TestCase;
 
diff --git a/java/common/src/test/java/org/apache/qpidity/transport/RangeSetTest.java b/java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java
index 474d47d8d7..ad45d00e46 100644
--- a/java/common/src/test/java/org/apache/qpidity/transport/RangeSetTest.java
+++ b/java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpidity.transport;
+package org.apache.qpid.transport;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/java/log4j-test.xml b/java/log4j-test.xml
index a27d9fef2e..c242286b70 100644
--- a/java/log4j-test.xml
+++ b/java/log4j-test.xml
@@ -38,10 +38,6 @@
     <level value="${amqj.logging.level}"/>
   </logger>
 
-  <logger name="org.apache.qpidity">
-    <level value="${amqj.logging.level}"/>
-  </logger>
-
   <logger name="qpid.protocol">
     <level value="${amqj.protocol.logging.level}"/>
   </logger>
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java
index 410939f583..b932b1d784 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java
@@ -21,7 +21,7 @@
 package org.apache.qpid.test.unit.client.connection;
 
 import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpidity.transport.util.Logger;
+import org.apache.qpid.transport.util.Logger;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java b/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
index 42811ed390..3906be2cc7 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.test.unit.xa;
 
-import org.apache.qpidity.dtx.XidImpl;
+import org.apache.qpid.dtx.XidImpl;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 import javax.transaction.xa.Xid;
diff --git a/java/testkit/etc/test.log4j b/java/testkit/etc/test.log4j
index 7d7ebcc802..b574a7b5b7 100644
--- a/java/testkit/etc/test.log4j
+++ b/java/testkit/etc/test.log4j
@@ -21,9 +21,6 @@ log4j.rootLogger=${root.logging.level}
 log4j.logger.org.apache.qpid=ERROR, console
 log4j.additivity.org.apache.qpid=false
 
-log4j.logger.org.apache.qpidity=TRACE, console
-log4j.additivity.org.apache.qpidity=false
-
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.Threshold=all
 log4j.appender.console.layout=org.apache.log4j.PatternLayout