diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs b/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs
similarity index 98%
rename from OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
rename to OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs
index e56bd951da..ad561fd8ef 100644
--- a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs
@@ -45,11 +45,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected XEstateModule m_EstateModule;
+        protected EstateModule m_EstateModule;
         private string token;
         uint port = 0;
 
-        public EstateConnector(XEstateModule module, string _token, uint _port)
+        public EstateConnector(EstateModule module, string _token, uint _port)
         {
             m_EstateModule = module;
             token = _token;
diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
similarity index 96%
rename from OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs
rename to OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
index f9438fe31b..fb4d04f45f 100644
--- a/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
@@ -45,13 +45,14 @@ using Mono.Addins;
 namespace OpenSim.Region.CoreModules.World.Estate
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XEstate")]
-    public class XEstateModule : ISharedRegionModule
+    public class EstateModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected List<Scene> m_Scenes = new List<Scene>();
         protected bool m_InInfoUpdate = false;
         private string token = "7db8eh2gvgg45jj";
+		protected bool m_enabled = false;
 
         public bool InInfoUpdate
         {
@@ -73,10 +74,19 @@ namespace OpenSim.Region.CoreModules.World.Estate
             IConfig estateConfig = config.Configs["Estates"];
             if (estateConfig != null)
             {
+				if (estateConfig.GetString("EstateCommunicationsHandler", Name) == Name)
+					m_enabled = true;
+				else
+					return;
+
                 port = (uint)estateConfig.GetInt("Port", 0);
                 // this will need to came from somewhere else
                 token = estateConfig.GetString("Token", token);
             }
+			else
+			{
+				m_enabled = true;
+			}
 
             m_EstateConnector = new EstateConnector(this, token, port);
 
@@ -98,12 +108,18 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void AddRegion(Scene scene)
         {
+			if (!m_enabled)
+				return;
+
             lock (m_Scenes)
                 m_Scenes.Add(scene);
         }
 
         public void RegionLoaded(Scene scene)
         {
+			if (!m_enabled)
+				return;
+
             IEstateModule em = scene.RequestModuleInterface<IEstateModule>();
 
             em.OnRegionInfoChange += OnRegionInfoChange;
@@ -115,6 +131,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void RemoveRegion(Scene scene)
         {
+			if (!m_enabled)
+				return;
+
             lock (m_Scenes)
                 m_Scenes.Remove(scene);
         }
diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateRequestHandler.cs
similarity index 98%
rename from OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs
rename to OpenSim/Region/CoreModules/World/Estate/EstateRequestHandler.cs
index 756b54dcb1..7ab92d1a47 100644
--- a/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateRequestHandler.cs
@@ -46,11 +46,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected XEstateModule m_EstateModule;
+        protected EstateModule m_EstateModule;
         protected Object m_RequestLock = new Object();
         private string token;
 
-        public EstateRequestHandler(XEstateModule fmodule, string _token)
+        public EstateRequestHandler(EstateModule fmodule, string _token)
                 : base("POST", "/estate")
         {
             m_EstateModule = fmodule;