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 99%
rename from OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs
rename to OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
index f9438fe31b..8eb38c2aa8 100644
--- a/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
@@ -45,7 +45,7 @@ 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);
 
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;