diff --git a/OpenSim/Framework/Data.Base/BaseDataReader.cs b/OpenSim/Framework/Data.Base/BaseDataReader.cs
index 67fb7c191b..70fb86e330 100644
--- a/OpenSim/Framework/Data.Base/BaseDataReader.cs
+++ b/OpenSim/Framework/Data.Base/BaseDataReader.cs
@@ -28,7 +28,7 @@ using System;
 using System.Data;
 using System.IO;
 
-namespace TribalMedia.Framework.Data
+namespace OpenSim.Framework.Data.Base
 {
     public class BaseDataReader
     {
diff --git a/OpenSim/Framework/Data.Base/BaseDatabaseConnector.cs b/OpenSim/Framework/Data.Base/BaseDatabaseConnector.cs
index 45ca650c53..4beb84b91b 100644
--- a/OpenSim/Framework/Data.Base/BaseDatabaseConnector.cs
+++ b/OpenSim/Framework/Data.Base/BaseDatabaseConnector.cs
@@ -29,7 +29,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
 
-namespace TribalMedia.Framework.Data
+namespace OpenSim.Framework.Data.Base
 {
     public abstract class BaseDatabaseConnector
     {
diff --git a/OpenSim/Framework/Data.Base/BaseFieldMapper.cs b/OpenSim/Framework/Data.Base/BaseFieldMapper.cs
index 20f919a7f5..4ba3e258ec 100644
--- a/OpenSim/Framework/Data.Base/BaseFieldMapper.cs
+++ b/OpenSim/Framework/Data.Base/BaseFieldMapper.cs
@@ -28,7 +28,7 @@ using System;
 using System.Collections.Generic;
 using System.Data.Common;
 
-namespace TribalMedia.Framework.Data
+namespace OpenSim.Framework.Data.Base
 {  
     public delegate TField ObjectGetAccessor<TObj, TField>(TObj obj);
     public delegate void ObjectSetAccessor<TObj, TField>(TObj obj, TField value);
diff --git a/OpenSim/Framework/Data.Base/BaseRowMapper.cs b/OpenSim/Framework/Data.Base/BaseRowMapper.cs
index e8292fd1a0..570571f87d 100644
--- a/OpenSim/Framework/Data.Base/BaseRowMapper.cs
+++ b/OpenSim/Framework/Data.Base/BaseRowMapper.cs
@@ -24,9 +24,9 @@
 * 
 */
 
-using TribalMedia.Framework.Data;
+using OpenSim.Framework.Data.Base;
 
-namespace TribalMedia.Framework.Data
+namespace OpenSim.Framework.Data.Base
 {
     public abstract class BaseRowMapper
     {
diff --git a/OpenSim/Framework/Data.Base/BaseSchema.cs b/OpenSim/Framework/Data.Base/BaseSchema.cs
index a6740c2bcd..39c9df8426 100644
--- a/OpenSim/Framework/Data.Base/BaseSchema.cs
+++ b/OpenSim/Framework/Data.Base/BaseSchema.cs
@@ -25,9 +25,9 @@
 */
 
 using System.Collections.Generic;
-using TribalMedia.Framework.Data;
+using OpenSim.Framework.Data.Base;
 
-namespace TribalMedia.Framework.Data
+namespace OpenSim.Framework.Data.Base
 {
     public class BaseSchema
     {
diff --git a/OpenSim/Framework/Data.Base/BaseTableMapper.cs b/OpenSim/Framework/Data.Base/BaseTableMapper.cs
index d69fcbb8ea..7899c892f8 100644
--- a/OpenSim/Framework/Data.Base/BaseTableMapper.cs
+++ b/OpenSim/Framework/Data.Base/BaseTableMapper.cs
@@ -27,9 +27,9 @@
 using System;
 using System.Data;
 using System.Data.Common;
-using TribalMedia.Framework.Data;
+using OpenSim.Framework.Data.Base;
 
-namespace TribalMedia.Framework.Data
+namespace OpenSim.Framework.Data.Base
 {
     public abstract class BaseTableMapper
     {
diff --git a/OpenSim/Framework/Data/OpenSimDataReader.cs b/OpenSim/Framework/Data/OpenSimDataReader.cs
index 716a74ecb9..d47fd12f69 100644
--- a/OpenSim/Framework/Data/OpenSimDataReader.cs
+++ b/OpenSim/Framework/Data/OpenSimDataReader.cs
@@ -32,7 +32,7 @@ using System.Data;
 using System.Text;
 using libsecondlife;
 
-using TribalMedia.Framework.Data;
+using OpenSim.Framework.Data.Base;
 
 namespace OpenSim.Framework.Data
 {
diff --git a/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs b/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
index 5f8a261900..77cd866879 100644
--- a/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
+++ b/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
@@ -31,7 +31,7 @@ using System.Data.Common;
 using libsecondlife;
 using MySql.Data.MySqlClient;
 
-using TribalMedia.Framework.Data;
+using OpenSim.Framework.Data.Base;
 
 namespace OpenSim.Framework.Data
 {
diff --git a/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs b/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs
index 67d9d43fb0..3025e2babb 100644
--- a/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs
+++ b/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs
@@ -32,7 +32,7 @@ using System.Data.Common;
 using System.Text;
 using libsecondlife;
 
-using TribalMedia.Framework.Data;
+using OpenSim.Framework.Data.Base;
 
 namespace OpenSim.Framework.Data
 {
diff --git a/OpenSim/Framework/Data/OpenSimTableMapper.cs b/OpenSim/Framework/Data/OpenSimTableMapper.cs
index e7b2ba67da..1ae7b7b41c 100644
--- a/OpenSim/Framework/Data/OpenSimTableMapper.cs
+++ b/OpenSim/Framework/Data/OpenSimTableMapper.cs
@@ -28,7 +28,7 @@
 
 using System.Data;
 
-using TribalMedia.Framework.Data;
+using OpenSim.Framework.Data.Base;
 
 namespace OpenSim.Framework.Data
 {
diff --git a/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs b/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs
index 9eb43320dd..fe2475bf98 100644
--- a/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs
+++ b/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs
@@ -28,7 +28,7 @@
 
 using System;
 using OpenSim.Framework;
-using TribalMedia.Framework.Data;
+using OpenSim.Framework.Data.Base;
 using libsecondlife;
 
 namespace OpenSim.Framework.Data
diff --git a/OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs b/OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs
index 6a0eef19e2..24e5669b18 100644
--- a/OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs
+++ b/OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
 using System.Text;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework;
-using TribalMedia.Framework.Data;
+using OpenSim.Framework.Data.Base;
 
 namespace OpenSim.Region.Environment.Modules
 {
diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
index 24afdb4dc7..15517078d6 100644
--- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework.Data;
-using TribalMedia.Framework.Data;
+using OpenSim.Framework.Data.Base;
 
 namespace OpenSim.Region.Environment.Modules
 {