diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQBytesMessage.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQBytesMessage.cs
index 9f4188160f..142cac7b08 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQBytesMessage.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQBytesMessage.cs
@@ -17,10 +17,9 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     public class ActiveMQBytesMessage : ActiveMQMessage, IBytesMessage
     {
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQDestination.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQDestination.cs
index d4ade9f169..ca71008895 100755
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQDestination.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQDestination.cs
@@ -15,10 +15,8 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     
     /// <summary>
@@ -427,7 +425,7 @@ namespace OpenWire.Client.Commands
             return physicalName.IndexOf(COMPOSITE_SEPARATOR) > 0;
         }
         
-        /**
+        /*
          * Returns a list of child destinations if this destination represents a composite
          * destination.
          *
@@ -470,7 +468,6 @@ namespace OpenWire.Client.Commands
         /**
          * @return hashCode for this instance
          */
-        
         public override int GetHashCode()
         {
             int answer = 37;
@@ -492,7 +489,6 @@ namespace OpenWire.Client.Commands
          * @param obj the object to compare
          * @return true if this instance and obj are equivalent
          */
-        
         public override bool Equals(Object obj)
         {
             bool result = this == obj;
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQMapMessage.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQMapMessage.cs
index cdff0f11d7..b7cc998391 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQMapMessage.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQMapMessage.cs
@@ -17,10 +17,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ;
+using ActiveMQ.OpenWire;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     public class ActiveMQMapMessage : ActiveMQMessage, IMapMessage
     {
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQMessage.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQMessage.cs
index a67a6d4e3e..9d7b42ade1 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQMessage.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQMessage.cs
@@ -17,10 +17,7 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
-
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     public delegate void AcknowledgeHandler(ActiveMQMessage message);
     
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQObjectMessage.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQObjectMessage.cs
index 4811109957..faa62fc095 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQObjectMessage.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQObjectMessage.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ActiveMQObjectMessage
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQQueue.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQQueue.cs
index dc89e1fd48..25674f66cc 100755
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQQueue.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQQueue.cs
@@ -15,11 +15,8 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     /// <summary>
     /// Summary description for ActiveMQQueue.
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQStreamMessage.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQStreamMessage.cs
index 56d5684feb..8e42bd8606 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQStreamMessage.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQStreamMessage.cs
@@ -17,10 +17,7 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
-
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     public class ActiveMQStreamMessage : ActiveMQMessage
     {
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempDestination.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempDestination.cs
index 0fc3402932..a9d6ddfc23 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempDestination.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempDestination.cs
@@ -1,51 +1,48 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed 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.
- */
-
-using System;
-using System.Collections;
-
-using OpenWire.Client;
-using OpenWire.Client.Core;
-
-namespace OpenWire.Client.Commands
-{
-    //
-    //  Marshalling code for Open Wire Format for ActiveMQTempDestination
-    //
-    //
-    //  NOTE!: This file is autogenerated - do not modify!
-    //         if you need to make a change, please see the Groovy scripts in the
-    //         activemq-core module
-    //
-    public abstract class ActiveMQTempDestination : ActiveMQDestination
-    {
-        public const byte ID_ActiveMQTempDestination = 0;
-        
-        public ActiveMQTempDestination() : base()
-        {
-        }
-        
-        public ActiveMQTempDestination(String name) : base(name)
-        {
-        }
-        
-        public override byte GetDataStructureType()
-        {
-            return ID_ActiveMQTempDestination;
-        }
-    }
-}
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed 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.
+ */
+
+using System;
+using System.Collections;
+
+namespace ActiveMQ.OpenWire.Commands
+{
+    //
+    //  Marshalling code for Open Wire Format for ActiveMQTempDestination
+    //
+    //
+    //  NOTE!: This file is autogenerated - do not modify!
+    //         if you need to make a change, please see the Groovy scripts in the
+    //         activemq-core module
+    //
+    public abstract class ActiveMQTempDestination : ActiveMQDestination
+    {
+        public const byte ID_ActiveMQTempDestination = 0;
+        
+        public ActiveMQTempDestination() : base()
+        {
+        }
+        
+        public ActiveMQTempDestination(String name) : base(name)
+        {
+        }
+        
+        public override byte GetDataStructureType()
+        {
+            return ID_ActiveMQTempDestination;
+        }
+    }
+}
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempQueue.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempQueue.cs
index 9e2599ef28..e444048952 100755
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempQueue.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempQueue.cs
@@ -15,11 +15,8 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     /// <summary>
     /// A Temporary Queue
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempTopic.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempTopic.cs
index adc3fa5d2d..cf741d9900 100755
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempTopic.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTempTopic.cs
@@ -15,11 +15,8 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     /// <summary>
     /// A Temporary Topic
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTextMessage.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTextMessage.cs
index 8864a7a6f5..b8ebf54af0 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTextMessage.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTextMessage.cs
@@ -17,10 +17,7 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
-
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     public class ActiveMQTextMessage : ActiveMQMessage, ITextMessage
     {
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTopic.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTopic.cs
index e44ecbbac9..d0f3a16799 100755
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTopic.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ActiveMQTopic.cs
@@ -15,11 +15,8 @@
  * limitations under the License.
  */
 using System;
-using OpenWire.Client;
-using OpenWire.Client.Commands;
-using OpenWire.Client.Core;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     /// <summary>
     /// Summary description for ActiveMQTopic.
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BaseCommand.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BaseCommand.cs
index 9328c147a4..01990c1374 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BaseCommand.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BaseCommand.cs
@@ -10,10 +10,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     
     public abstract class BaseCommand : AbstractCommand
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BrokerId.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BrokerId.cs
index a463dfac35..3b3809eaf6 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BrokerId.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BrokerId.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for BrokerId
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BrokerInfo.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BrokerInfo.cs
index 0c1827dae6..5e0122f56b 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BrokerInfo.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/BrokerInfo.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for BrokerInfo
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionError.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionError.cs
index ffc3097fde..28f1339d88 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionError.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionError.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ConnectionError
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionId.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionId.cs
index c6d22292b0..6e8cef8e0c 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionId.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionId.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ConnectionId
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionInfo.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionInfo.cs
index 15b2cf2e1d..1c2a6ebf69 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionInfo.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConnectionInfo.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ConnectionInfo
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConsumerId.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConsumerId.cs
index 087dd09cf7..312fc4d26d 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConsumerId.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConsumerId.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ConsumerId
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConsumerInfo.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConsumerInfo.cs
index 0fe3233c3c..92fad09a86 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConsumerInfo.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ConsumerInfo.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ConsumerInfo
@@ -39,6 +39,7 @@ namespace OpenWire.Client.Commands
         bool browser;
         ActiveMQDestination destination;
         int prefetchSize;
+        int maximumPendingMessageLimit;
         bool dispatchAsync;
         string selector;
         string subcriptionName;
@@ -55,6 +56,7 @@ namespace OpenWire.Client.Commands
                 + " Browser=" + Browser
                 + " Destination=" + Destination
                 + " PrefetchSize=" + PrefetchSize
+                + " MaximumPendingMessageLimit=" + MaximumPendingMessageLimit
                 + " DispatchAsync=" + DispatchAsync
                 + " Selector=" + Selector
                 + " SubcriptionName=" + SubcriptionName
@@ -101,6 +103,12 @@ namespace OpenWire.Client.Commands
             set { this.prefetchSize = value; }            
         }
 
+        public int MaximumPendingMessageLimit
+        {
+            get { return maximumPendingMessageLimit; }
+            set { this.maximumPendingMessageLimit = value; }            
+        }
+
         public bool DispatchAsync
         {
             get { return dispatchAsync; }
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ControlCommand.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ControlCommand.cs
index d66bcab038..65e9bc58db 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ControlCommand.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ControlCommand.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ControlCommand
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DataArrayResponse.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DataArrayResponse.cs
index 259ce4ee5b..e6515f8fbc 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DataArrayResponse.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DataArrayResponse.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for DataArrayResponse
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DataResponse.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DataResponse.cs
index 5b54f73f3c..94e06aaf33 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DataResponse.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DataResponse.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for DataResponse
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DestinationInfo.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DestinationInfo.cs
index dff5b3f556..5ceaba4238 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DestinationInfo.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DestinationInfo.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for DestinationInfo
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DiscoveryEvent.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DiscoveryEvent.cs
index 3179473753..9cc6af2c5b 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DiscoveryEvent.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/DiscoveryEvent.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for DiscoveryEvent
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ExceptionResponse.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ExceptionResponse.cs
index efbe1799b4..ce38ad3efd 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ExceptionResponse.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ExceptionResponse.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ExceptionResponse
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/FlushCommand.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/FlushCommand.cs
index 3fb7f42626..f6866a6228 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/FlushCommand.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/FlushCommand.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for FlushCommand
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/IntegerResponse.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/IntegerResponse.cs
index 5d4702d5ea..dad82c1c01 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/IntegerResponse.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/IntegerResponse.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for IntegerResponse
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalQueueAck.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalQueueAck.cs
index 216990058e..4db8a5787b 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalQueueAck.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalQueueAck.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for JournalQueueAck
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTopicAck.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTopicAck.cs
index 07e3a7a51f..6011e54832 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTopicAck.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTopicAck.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for JournalTopicAck
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTrace.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTrace.cs
index 5a61fb7359..ce70e6c709 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTrace.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTrace.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for JournalTrace
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTransaction.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTransaction.cs
index b5559dd706..4c768d5b4e 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTransaction.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/JournalTransaction.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for JournalTransaction
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/KeepAliveInfo.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/KeepAliveInfo.cs
index 140ead6197..4e82d816b0 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/KeepAliveInfo.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/KeepAliveInfo.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for KeepAliveInfo
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/LocalTransactionId.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/LocalTransactionId.cs
index bf551ad767..7ac5a88f41 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/LocalTransactionId.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/LocalTransactionId.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for LocalTransactionId
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/Message.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/Message.cs
index 8f9e3e3a0e..a97d71718b 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/Message.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/Message.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for Message
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageAck.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageAck.cs
index 8782a6b498..5a229489a6 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageAck.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageAck.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for MessageAck
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageDispatch.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageDispatch.cs
index 296317a914..98e80b9614 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageDispatch.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageDispatch.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for MessageDispatch
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageDispatchNotification.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageDispatchNotification.cs
index e195c8d555..227c95c8e8 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageDispatchNotification.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageDispatchNotification.cs
@@ -1,87 +1,87 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* Licensed 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.
-*/
-
-using System;
-using System.Collections;
-
-using OpenWire.Client;
-using OpenWire.Client.Core;
-
-namespace OpenWire.Client.Commands
-{
-    //
-    //  Marshalling code for Open Wire Format for MessageDispatchNotification
-    //
-    //
-    //  NOTE!: This file is autogenerated - do not modify!
-    //         if you need to make a change, please see the Groovy scripts in the
-    //         activemq-core module
-    //
-    public class MessageDispatchNotification : BaseCommand
-    {
-        public const byte ID_MessageDispatchNotification = 90;
-    			
-        ConsumerId consumerId;
-        ActiveMQDestination destination;
-        long deliverySequenceId;
-        MessageId messageId;
-
-		public override string ToString() {
-            return GetType().Name + "["
-                + " ConsumerId=" + ConsumerId
-                + " Destination=" + Destination
-                + " DeliverySequenceId=" + DeliverySequenceId
-                + " MessageId=" + MessageId
-                + " ]";
-
-		}
-	
-
-
-        public override byte GetDataStructureType() {
-            return ID_MessageDispatchNotification;
-        }
-
-
-        // Properties
-
-        public ConsumerId ConsumerId
-        {
-            get { return consumerId; }
-            set { this.consumerId = value; }            
-        }
-
-        public ActiveMQDestination Destination
-        {
-            get { return destination; }
-            set { this.destination = value; }            
-        }
-
-        public long DeliverySequenceId
-        {
-            get { return deliverySequenceId; }
-            set { this.deliverySequenceId = value; }            
-        }
-
-        public MessageId MessageId
-        {
-            get { return messageId; }
-            set { this.messageId = value; }            
-        }
-
-    }
-}
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* Licensed 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
+
+namespace ActiveMQ.OpenWire.Commands
+{
+    //
+    //  Marshalling code for Open Wire Format for MessageDispatchNotification
+    //
+    //
+    //  NOTE!: This file is autogenerated - do not modify!
+    //         if you need to make a change, please see the Groovy scripts in the
+    //         activemq-core module
+    //
+    public class MessageDispatchNotification : BaseCommand
+    {
+        public const byte ID_MessageDispatchNotification = 90;
+    			
+        ConsumerId consumerId;
+        ActiveMQDestination destination;
+        long deliverySequenceId;
+        MessageId messageId;
+
+		public override string ToString() {
+            return GetType().Name + "["
+                + " ConsumerId=" + ConsumerId
+                + " Destination=" + Destination
+                + " DeliverySequenceId=" + DeliverySequenceId
+                + " MessageId=" + MessageId
+                + " ]";
+
+		}
+	
+
+
+        public override byte GetDataStructureType() {
+            return ID_MessageDispatchNotification;
+        }
+
+
+        // Properties
+
+        public ConsumerId ConsumerId
+        {
+            get { return consumerId; }
+            set { this.consumerId = value; }            
+        }
+
+        public ActiveMQDestination Destination
+        {
+            get { return destination; }
+            set { this.destination = value; }            
+        }
+
+        public long DeliverySequenceId
+        {
+            get { return deliverySequenceId; }
+            set { this.deliverySequenceId = value; }            
+        }
+
+        public MessageId MessageId
+        {
+            get { return messageId; }
+            set { this.messageId = value; }            
+        }
+
+    }
+}
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageId.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageId.cs
index 3be0a96c34..36085fb7fd 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageId.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/MessageId.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for MessageId
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ProducerId.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ProducerId.cs
index 91adde6f3f..8df6b95ddc 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ProducerId.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ProducerId.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ProducerId
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ProducerInfo.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ProducerInfo.cs
index 277768f415..f217bb084e 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ProducerInfo.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ProducerInfo.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ProducerInfo
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/RemoveInfo.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/RemoveInfo.cs
index 0d61f360b7..4cf279b7ff 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/RemoveInfo.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/RemoveInfo.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for RemoveInfo
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/RemoveSubscriptionInfo.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/RemoveSubscriptionInfo.cs
index 71ad702d90..e6a57aaf8f 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/RemoveSubscriptionInfo.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/RemoveSubscriptionInfo.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for RemoveSubscriptionInfo
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/Response.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/Response.cs
index 8a92bc8701..118fb7e085 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/Response.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/Response.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for Response
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SessionId.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SessionId.cs
index 70ce9c5cdd..61465f9de1 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SessionId.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SessionId.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for SessionId
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SessionInfo.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SessionInfo.cs
index bf9fb6189c..ed3b84ce36 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SessionInfo.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SessionInfo.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for SessionInfo
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ShutdownInfo.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ShutdownInfo.cs
index 5054c8816f..8843236e9c 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ShutdownInfo.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/ShutdownInfo.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for ShutdownInfo
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SubscriptionInfo.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SubscriptionInfo.cs
index 1279e8f7d7..66857cd680 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SubscriptionInfo.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/SubscriptionInfo.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for SubscriptionInfo
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/TransactionId.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/TransactionId.cs
index 55e4bcb7b0..782e5961b2 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/TransactionId.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/TransactionId.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for TransactionId
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/TransactionInfo.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/TransactionInfo.cs
index 644106d412..85068cdac6 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/TransactionInfo.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/TransactionInfo.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for TransactionInfo
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/WireFormatInfo.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/WireFormatInfo.cs
index af05cb31ab..7646df65e5 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/WireFormatInfo.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/WireFormatInfo.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for WireFormatInfo
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/XATransactionId.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/XATransactionId.cs
index 43fbdcc8da..c2498aad58 100644
--- a/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/XATransactionId.cs
+++ b/openwire-dotnet/src/ActiveMQ/OpenWire/Commands/XATransactionId.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections;
 
-using OpenWire.Client;
-using OpenWire.Client.Core;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.Commands;
 
-namespace OpenWire.Client.Commands
+namespace ActiveMQ.OpenWire.Commands
 {
     //
     //  Marshalling code for Open Wire Format for XATransactionId