11 files changed, 19 insertions, 14 deletions
diff --git a/dotnet/Qpid.Buffer/BufferOverflowException.cs b/dotnet/Qpid.Buffer/BufferOverflowException.cs
index 2a7ad064d5..5a2fff74a7 100644
--- a/dotnet/Qpid.Buffer/BufferOverflowException.cs
+++ b/dotnet/Qpid.Buffer/BufferOverflowException.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
 {
     [Serializable]
     public class BufferOverflowException : Exception
@@ -38,3 +38,4 @@ namespace Qpid.Buffer
 }
 
 
+
diff --git a/dotnet/Qpid.Buffer/BufferUnderflowException.cs b/dotnet/Qpid.Buffer/BufferUnderflowException.cs
index c0cb850e63..13939b77a8 100644
--- a/dotnet/Qpid.Buffer/BufferUnderflowException.cs
+++ b/dotnet/Qpid.Buffer/BufferUnderflowException.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
 {
     [Serializable]
     public class BufferUnderflowException : Exception
@@ -39,3 +39,4 @@ namespace Qpid.Buffer
 }
 
 
+
diff --git a/dotnet/Qpid.Buffer/ByteBuffer.cs b/dotnet/Qpid.Buffer/ByteBuffer.cs
index b341fa7632..67f0edd440 100644
--- a/dotnet/Qpid.Buffer/ByteBuffer.cs
+++ b/dotnet/Qpid.Buffer/ByteBuffer.cs
@@ -20,7 +20,7 @@
  */
 using System;
 
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
 {
    /// <summary>
    /// Abstract class implementing a byte buffer
diff --git a/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs b/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs
index bf7c738041..4c2856c333 100644
--- a/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs
+++ b/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs
@@ -20,7 +20,7 @@
  */
 using System.Text;
 
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
 {
     public class ByteBufferHexDumper
     {
@@ -76,3 +76,4 @@ namespace Qpid.Buffer
 }
 
 
+
diff --git a/dotnet/Qpid.Buffer/IByteBufferAllocator.cs b/dotnet/Qpid.Buffer/IByteBufferAllocator.cs
index 0cc0811a5c..0f457df065 100644
--- a/dotnet/Qpid.Buffer/IByteBufferAllocator.cs
+++ b/dotnet/Qpid.Buffer/IByteBufferAllocator.cs
@@ -21,7 +21,7 @@
 
 using System;
 
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
 {
    /// <summary>
    /// Allocates <see cref="ByteBuffer"/>'s and manages them. Please 
@@ -47,3 +47,4 @@ namespace Qpid.Buffer
 }
 
 
+
diff --git a/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs b/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
index 971d78b27c..4dd92ccdc2 100644
--- a/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
@@ -23,11 +23,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Qpid.ByteBuffer")]
+[assembly: AssemblyTitle("Apache.Qpid.ByteBuffer")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Apache Qpid")]
-[assembly: AssemblyProduct("Qpid.ByteBuffer")]
+[assembly: AssemblyProduct("Apache.Qpid.ByteBuffer")]
 [assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/dotnet/Qpid.Buffer/Qpid.Buffer.csproj b/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
index 97346bd9fd..9320438f6f 100644
--- a/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
+++ b/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Qpid.Buffer</RootNamespace>
-    <AssemblyName>Qpid.Buffer</AssemblyName>
+    <RootNamespace>Apache.Qpid.Buffer</RootNamespace>
+    <AssemblyName>Apache.Qpid.Buffer</AssemblyName>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>
     </AssemblyOriginatorKeyFile>
@@ -56,4 +56,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/dotnet/Qpid.Buffer/SimpleByteBuffer.cs b/dotnet/Qpid.Buffer/SimpleByteBuffer.cs
index d91f7747d2..d3b7245cb1 100644
--- a/dotnet/Qpid.Buffer/SimpleByteBuffer.cs
+++ b/dotnet/Qpid.Buffer/SimpleByteBuffer.cs
@@ -20,7 +20,7 @@
  */
 using System;
 
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
 {
    internal sealed class SimpleByteBuffer : ByteBuffer
    {
diff --git a/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs b/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs
index 6933480c92..e772e59ae3 100644
--- a/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs
+++ b/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs
@@ -19,7 +19,7 @@
  *
  */
 
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
 {
    /// <summary>
    /// Allocates <see cref="ByteBuffer"/>'s and manages them. 
@@ -55,3 +55,4 @@ namespace Qpid.Buffer
 }
 
 
+
diff --git a/dotnet/Qpid.Buffer/SlicedByteBuffer.cs b/dotnet/Qpid.Buffer/SlicedByteBuffer.cs
index 414da94a8d..c27b7949b6 100644
--- a/dotnet/Qpid.Buffer/SlicedByteBuffer.cs
+++ b/dotnet/Qpid.Buffer/SlicedByteBuffer.cs
@@ -20,7 +20,7 @@
  */
 using System;
 
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
 {
    internal sealed class SlicedByteBuffer : ByteBuffer
    {
diff --git a/dotnet/Qpid.Buffer/default.build b/dotnet/Qpid.Buffer/default.build
index e7002e7eb9..c2d36d15e6 100644
--- a/dotnet/Qpid.Buffer/default.build
+++ b/dotnet/Qpid.Buffer/default.build
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="Qpid.Buffer" default="build">
+<project name="Apache.Qpid.Buffer" default="build">
     <!--
 		Properties that come from master build file
 		- build.dir: root directory for build