7 files changed, 18 insertions, 23 deletions
diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs b/qpid/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs
index 8e93bd8fa6..a667265ba4 100644
--- a/qpid/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs
@@ -1,9 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
-using Qpid.Messaging;
+using Apache.Qpid.Messaging;
 
-namespace Qpid.Client.Tests.interop
+namespace Apache.Qpid.Client.Tests.interop
 {
     /// <summary> Defines the possible test case roles that an interop test case can take on. </summary>
     public enum Roles { SENDER, RECEIVER };
diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs
index 2001d14956..7ff686e1cb 100644
--- a/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs
@@ -1,10 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 using log4net;
-using Qpid.Messaging;
+using Apache.Qpid.Messaging;
 
-namespace Qpid.Client.Tests.interop.TestCases
+namespace Apache.Qpid.Client.Tests.interop.TestCases
 {
     /// <summary>
     /// Implements tet case 1, dummy run. This test case sends no test messages, it exists to confirm that the test harness
diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs
index 46c644c243..bc4501dea4 100644
--- a/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs
@@ -1,10 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 using log4net;
-using Qpid.Messaging;
+using Apache.Qpid.Messaging;
 
-namespace Qpid.Client.Tests.interop.TestCases
+namespace Apache.Qpid.Client.Tests.interop.TestCases
 {
     /// <summary>
     /// Implements test case 2, basic P2P. Sends/receives a specified number of messages to a specified route on the
diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs
index 61c02f13d8..4e3dd6e53e 100644
--- a/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs
@@ -1,10 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 using log4net;
-using Qpid.Messaging;
+using Apache.Qpid.Messaging;
 
-namespace Qpid.Client.Tests.interop.TestCases
+namespace Apache.Qpid.Client.Tests.interop.TestCases
 {
     /// <summary>
     /// Implements test case 3, basic pub/sub. Sends/received a specified number of messages to a specified route on the
diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/TestClient.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TestClient.cs
index b502129325..b15f7fbda9 100644
--- a/qpid/dotnet/Qpid.Client.Tests/interop/TestClient.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/interop/TestClient.cs
@@ -1,13 +1,12 @@
 using System;
-using System.Collections.Generic;
 using System.Collections;
 using System.Text;
-using Qpid.Messaging;
-using Qpid.Client.Qms;
+using Apache.Qpid.Messaging;
+using Apache.Qpid.Client.Qms;
 using log4net;
-using Qpid.Client.Tests.interop.TestCases;
+using Apache.Qpid.Client.Tests.interop.TestCases;
 
-namespace Qpid.Client.Tests.interop
+namespace Apache.Qpid.Client.Tests.interop
 {
     /// <summary>
     /// Implements a test client as described in the interop testing spec
diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs
index db9b1a4650..13141d52b8 100644
--- a/qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs
@@ -20,10 +20,10 @@
  */
 using System;
 using log4net;
-using Qpid.Messaging;
-using Qpid.Client.Qms;
+using Apache.Qpid.Messaging;
+using Apache.Qpid.Client.Qms;
 
-namespace Qpid.Client.Tests.interop
+namespace Apache.Qpid.Client.Tests.interop
 {
     public class TopicListener
     {
diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs
index 5004bb28d2..ef5d39f0bc 100644
--- a/qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Threading;
 using log4net;
-using Qpid.Messaging;
-using Qpid.Client.Qms;
+using Apache.Qpid.Messaging;
+using Apache.Qpid.Client.Qms;
 
-namespace Qpid.Client.Tests.interop
+namespace Apache.Qpid.Client.Tests.interop
 {
     public class TopicPublisher
     {