diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 74fdc0df7c..7d0d327767 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -31,8 +31,8 @@
         <RegionModule id="LocalLandServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Land.LocalLandServicesConnector" />
         <RegionModule id="RemoteLandServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Land.RemoteLandServicesConnector" />
       <!-- Service connectors IN modules -->
-        <RegionModule id="RegionAssetService" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset.RegionAssetService" />
-        <RegionModule id="RegionInventoryService" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.RegionInventoryService" />
+        <RegionModule id="AssetServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset.AssetServiceInConnectorModule" />
+        <RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" />
         <RegionModule id="LandServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" />
         <RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" />    \  
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/RegionAssetService.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
similarity index 95%
rename from OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/RegionAssetService.cs
rename to OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
index d4bd299455..7b32f45e35 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/RegionAssetService.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Server.Handlers.Base;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
 {
-    public class RegionAssetService : ISharedRegionModule
+    public class AssetServiceInConnectorModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool m_Enabled = false;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/RegionInventoryService.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
similarity index 95%
rename from OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/RegionInventoryService.cs
rename to OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
index 129b40c19f..8ca49383d7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/RegionInventoryService.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Server.Handlers.Base;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
 {
-    public class RegionInventoryService : ISharedRegionModule
+    public class InventoryServiceInConnectorModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool m_Enabled = false;