diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
index b53a868c1a..bda9184797 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
@@ -33,7 +33,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CommsManager.cs" />
+    <Compile Include="RegionServerCommsManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Common/OpenGrid.Framework.Communications/CommsManager.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
similarity index 83%
rename from Common/OpenGrid.Framework.Communications/CommsManager.cs
rename to Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
index 0cc22531fb..960bbefa41 100644
--- a/Common/OpenGrid.Framework.Communications/CommsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
@@ -7,10 +7,10 @@ using OpenSim.Framework.Types;
 
 namespace OpenGrid.Framework.Communications
 {
-    public class CommsManager
+    public class RegionServerCommsManager
     {
 
-        public CommsManager()
+        public RegionServerCommsManager()
         {
 
         }
diff --git a/OpenGridServices.suo b/OpenGridServices.suo
index 18d72f4376..e9a533d7e5 100644
Binary files a/OpenGridServices.suo and b/OpenGridServices.suo differ