diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 3e302d81a1..4126ff47ad 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -154,10 +154,10 @@ namespace OpenSim.Grid.AssetServer
 
         public void setupDB()
         {
-            bool yapfile = File.Exists("assets.yap");
+            bool yapfile = File.Exists("gridassets.yap");
             try
             {
-                db = Db4oFactory.OpenFile("assets.yap");
+                db = Db4oFactory.OpenFile("gridassets.yap");
                 MainLog.Instance.Verbose("Main.cs:setupDB() - creation");
             }
             catch (Exception e)
diff --git a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
index 54d43a1721..1023820827 100644
--- a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
@@ -62,12 +62,12 @@ namespace OpenSim.Region.GridInterfaces.Local
         {
             bool yapfile;
             this._assetRequests = new BlockingQueue<ARequest>();
-            yapfile = File.Exists("assets.yap");
+            yapfile = File.Exists("regionassets.yap");
 
             MainLog.Instance.Verbose( "Local Asset Server class created");
             try
             {
-                db = Db4oFactory.OpenFile("assets.yap");
+                db = Db4oFactory.OpenFile("regionassets.yap");
                 MainLog.Instance.Verbose( "Db4 Asset database  creation");
             }
             catch (Exception e)