diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
similarity index 99%
rename from OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
rename to OpenSim/Data/MSSQL/MSSQLSimulationData.cs
index 77b8a10f07..ae105d594a 100644
--- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Data.MSSQL
     /// <summary>
     /// A MSSQL Interface for the Region Server.
     /// </summary>
-    public class MSSQLRegionDataStore : IRegionDataStore
+    public class MSSQLSimulationData : ISimulationDataStore
     {
         private const string _migrationStore = "RegionStore";
 
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
similarity index 99%
rename from OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
rename to OpenSim/Data/MySQL/MySQLSimulationData.cs
index a39e68d3ad..36f73ef49d 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Data.MySQL
     /// <summary>
     /// A MySQL Interface for the Region Server
     /// </summary>
-    public class MySQLDataStore : IRegionDataStore
+    public class MySQLSimulationData : ISimulationDataStore
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
diff --git a/OpenSim/Data/Null/NullDataStore.cs b/OpenSim/Data/Null/NullSimulationData.cs
similarity index 98%
rename from OpenSim/Data/Null/NullDataStore.cs
rename to OpenSim/Data/Null/NullSimulationData.cs
index 3ba44bb54b..9c7da8e973 100644
--- a/OpenSim/Data/Null/NullDataStore.cs
+++ b/OpenSim/Data/Null/NullSimulationData.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Data.Null
     /// <summary>
     /// NULL DataStore, do not store anything
     /// </summary>
-    public class NullDataStore : IRegionDataStore
+    public class NullSimulationData : ISimulationDataStore
     {
         public void Initialise(string dbfile)
         {
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
similarity index 99%
rename from OpenSim/Data/SQLite/SQLiteRegionData.cs
rename to OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 88699a767f..55c27b260a 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Data.SQLite
     /// <summary>
     /// A RegionData Interface to the SQLite database
     /// </summary>
-    public class SQLiteRegionData : IRegionDataStore
+    public class SQLiteSimulationData : ISimulationDataStore
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
similarity index 99%
rename from OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs
rename to OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
index b5ce4c0080..878117e2fc 100644
--- a/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Data.SQLiteLegacy
     /// <summary>
     /// A RegionData Interface to the SQLite database
     /// </summary>
-    public class SQLiteRegionData : IRegionDataStore
+    public class SQLiteSimulationData : ISimulationDataStore
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs
index 29bf5a3418..a081462b73 100644
--- a/OpenSim/Data/Tests/RegionTests.cs
+++ b/OpenSim/Data/Tests/RegionTests.cs
@@ -61,17 +61,17 @@ namespace OpenSim.Data.Tests
 #else
 
     [TestFixture(Description = "Region store tests (SQLite)")]
-    public class SQLiteRegionTests : RegionTests<SqliteConnection, SQLiteRegionData>
+    public class SQLiteRegionTests : RegionTests<SqliteConnection, SQLiteSimulationData>
     {
     }
 
     [TestFixture(Description = "Region store tests (MySQL)")]
-    public class MySqlRegionTests : RegionTests<MySqlConnection, MySQLDataStore>
+    public class MySqlRegionTests : RegionTests<MySqlConnection, MySQLSimulationData>
     {
     }
 
     [TestFixture(Description = "Region store tests (MS SQL Server)")]
-    public class MSSQLRegionTests : RegionTests<SqlConnection, MSSQLRegionDataStore>
+    public class MSSQLRegionTests : RegionTests<SqlConnection, MSSQLSimulationData>
     {
     }
 
@@ -79,11 +79,11 @@ namespace OpenSim.Data.Tests
 
     public class RegionTests<TConn, TRegStore> : BasicDataServiceTest<TConn, TRegStore>
         where TConn : DbConnection, new()
-        where TRegStore : class, IRegionDataStore, new()
+        where TRegStore : class, ISimulationDataStore, new()
     {
         bool m_rebuildDB;
 
-        public IRegionDataStore db;
+        public ISimulationDataStore db;
         public UUID zero = UUID.Zero;
         public UUID region1 = UUID.Random();
         public UUID region2 = UUID.Random();
@@ -122,7 +122,7 @@ namespace OpenSim.Data.Tests
         protected override void InitService(object service)
         {
             ClearDB();
-            db = (IRegionDataStore)service;
+            db = (ISimulationDataStore)service;
             db.Initialise(m_connStr);
         }
 
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index ae2e8443fc..54845fd96d 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -200,7 +200,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// Backup the inventory to the given data store
         /// </summary>
         /// <param name="datastore"></param>
-        void ProcessInventoryBackup(IRegionDataStore datastore);
+        void ProcessInventoryBackup(ISimulationDataStore datastore);
 
         uint MaskEffectivePermissions();
 
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
similarity index 99%
rename from OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs
rename to OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
index 3e8e19670c..0a4d531b91 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
@@ -32,7 +32,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
-    public interface IRegionDataStore
+    public interface ISimulationDataStore
     {
         /// <summary>
         /// Initialises the data storage engine
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index c434e4fa1e..6b2e03ec75 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public event OnTerrainTickDelegate OnTerrainTick;
 
-        public delegate void OnBackupDelegate(IRegionDataStore datastore, bool forceBackup);
+        public delegate void OnBackupDelegate(ISimulationDataStore datastore, bool forceBackup);
 
         public event OnBackupDelegate OnBackup;
 
@@ -684,7 +684,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public void TriggerOnBackup(IRegionDataStore dstore, bool forced)
+        public void TriggerOnBackup(ISimulationDataStore dstore, bool forced)
         {
             OnBackupDelegate handlerOnAttach = OnBackup;
             if (handlerOnAttach != null)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index ba5e33cd37..4024328afb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1378,7 +1378,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Processes backup.
         /// </summary>
         /// <param name="datastore"></param>
-        public virtual void ProcessBackup(IRegionDataStore datastore, bool forcedBackup)
+        public virtual void ProcessBackup(ISimulationDataStore datastore, bool forcedBackup)
         {
             if (!m_isBackedUp)
             {
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 87c48608aa..1984d45f06 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -848,7 +848,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Process inventory backup
         /// </summary>
         /// <param name="datastore"></param>
-        public void ProcessInventoryBackup(IRegionDataStore datastore)
+        public void ProcessInventoryBackup(ISimulationDataStore datastore)
         {
             if (HasInventoryChanged)
             {
diff --git a/OpenSim/Region/Framework/StorageManager.cs b/OpenSim/Region/Framework/StorageManager.cs
index 9375b4add2..06caa18243 100644
--- a/OpenSim/Region/Framework/StorageManager.cs
+++ b/OpenSim/Region/Framework/StorageManager.cs
@@ -36,9 +36,9 @@ namespace OpenSim.Region.Framework
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected IRegionDataStore m_dataStore;
+        protected ISimulationDataStore m_dataStore;
 
-        public IRegionDataStore DataStore
+        public ISimulationDataStore DataStore
         {
             get { return m_dataStore; }
         }
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework
             get { return m_estateDataStore; }
         }
 
-        public StorageManager(IRegionDataStore storage)
+        public StorageManager(ISimulationDataStore storage)
         {
             m_dataStore = storage;
         }
@@ -68,8 +68,8 @@ namespace OpenSim.Region.Framework
 
                     if (typeInterface != null)
                     {
-                        IRegionDataStore plug =
-                            (IRegionDataStore) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                        ISimulationDataStore plug =
+                            (ISimulationDataStore)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
                         plug.Initialise(connectionstring);
 
                         m_dataStore = plug;
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
index 2a055cc3c1..e95d26a6d0 100644
--- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Data.Null
     /// Mock region data plugin.  This obeys the api contract for persistence but stores everything in memory, so that
     /// tests can check correct persistence.
     /// </summary>
-    public class NullDataStore : IRegionDataStore
+    public class NullDataStore : ISimulationDataStore
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);