diff --git a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
index b76b9c617c..2b6bfe3e07 100644
--- a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
+++ b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
@@ -79,10 +79,10 @@ namespace OpenSim.Grid.AssetInventoryServer
 
             IConfig pluginConfig = ConfigFile.Configs["Plugins"];
 
-            StorageProvider = LoadAssetInventoryServerPlugin("/OpenSim/AssetInventoryServer/StorageProvider", pluginConfig.GetString("asset_storage_provider")) as IAssetStorageProvider;
+            StorageProvider = LoadAssetInventoryServerPlugin("/OpenSim/AssetInventoryServer/AssetStorageProvider", pluginConfig.GetString("asset_storage_provider")) as IAssetStorageProvider;
             m_backends.Add(StorageProvider);
 
-            InventoryProvider = LoadAssetInventoryServerPlugin("/OpenSim/AssetInventoryServer/InventoryProvider", pluginConfig.GetString("inventory_storage_provider")) as IInventoryStorageProvider;
+            InventoryProvider = LoadAssetInventoryServerPlugin("/OpenSim/AssetInventoryServer/InventoryStorageProvider", pluginConfig.GetString("inventory_storage_provider")) as IInventoryStorageProvider;
             m_backends.Add(InventoryProvider);
 
             MetricsProvider = LoadAssetInventoryServerPlugin("/OpenSim/AssetInventoryServer/MetricsProvider", pluginConfig.GetString("metrics_provider")) as IMetricsProvider;
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/Resources/AssetInventoryServerOpenSimPlugins.addin.xml b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/Resources/AssetInventoryServerOpenSimPlugins.addin.xml
index cfdfdb5967..8cd7585a68 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/Resources/AssetInventoryServerOpenSimPlugins.addin.xml
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/Resources/AssetInventoryServerOpenSimPlugins.addin.xml
@@ -12,10 +12,10 @@
         <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.IAssetDataPlugin" />
     </ExtensionPoint>
 
-    <Extension path="/OpenSim/AssetInventoryServer/StorageProvider">
+    <Extension path="/OpenSim/AssetInventoryServer/AssetStorageProvider">
         <Plugin id="OpenSimAssetStorage" provider="OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim.dll" type="OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim.OpenSimAssetStoragePlugin" />
     </Extension>
-    <Extension path="/OpenSim/AssetInventoryServer/InventoryProvider">
+    <Extension path="/OpenSim/AssetInventoryServer/InventoryStorageProvider">
         <Plugin id="OpenSimInventoryStorage" provider="OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim.dll" type="OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim.OpenSimInventoryStoragePlugin" />
     </Extension>
     <Extension path="/OpenSim/AssetInventoryServer/Frontend">
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/Resources/AssetInventoryServerSimplePlugins.addin.xml b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/Resources/AssetInventoryServerSimplePlugins.addin.xml
index f898145b35..cb6959e8c7 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/Resources/AssetInventoryServerSimplePlugins.addin.xml
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/Resources/AssetInventoryServerSimplePlugins.addin.xml
@@ -7,10 +7,10 @@
         <Addin id="OpenSim.Grid.AssetInventoryServer" version="0.1" />
     </Dependencies>
 
-    <Extension path="/OpenSim/AssetInventoryServer/StorageProvider">
+    <Extension path="/OpenSim/AssetInventoryServer/AssetStorageProvider">
         <Plugin id="SimpleAssetStorage" provider="OpenSim.Grid.AssetInventoryServer.Plugins.Simple.dll" type="OpenSim.Grid.AssetInventoryServer.Plugins.Simple.SimpleAssetStoragePlugin" />
     </Extension>
-    <Extension path="/OpenSim/AssetInventoryServer/InventoryProvider">
+    <Extension path="/OpenSim/AssetInventoryServer/InventoryStorageProvider">
         <Plugin id="SimpleInventoryStorage" provider="OpenSim.Grid.AssetInventoryServer.Plugins.Simple.dll" type="OpenSim.Grid.AssetInventoryServer.Plugins.Simple.SimpleInventoryStoragePlugin" />
     </Extension>
 </Addin>
diff --git a/bin/OpenSim.Grid.AssetInventoryServer.addin.xml b/bin/OpenSim.Grid.AssetInventoryServer.addin.xml
index 1ba5c8d5cc..1f1bdbd442 100644
--- a/bin/OpenSim.Grid.AssetInventoryServer.addin.xml
+++ b/bin/OpenSim.Grid.AssetInventoryServer.addin.xml
@@ -6,10 +6,10 @@
     <ExtensionPoint path="/OpenSim/AssetInventoryServer/Frontend">
         <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Grid.AssetInventoryServer.IAssetInventoryServerPlugin" />
     </ExtensionPoint>
-    <ExtensionPoint path="/OpenSim/AssetInventoryServer/StorageProvider">
+    <ExtensionPoint path="/OpenSim/AssetInventoryServer/AssetStorageProvider">
         <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Grid.AssetInventoryServer.IAssetStorageProvider" />
     </ExtensionPoint>
-    <ExtensionPoint path="/OpenSim/AssetInventoryServer/InventoryProvider">
+    <ExtensionPoint path="/OpenSim/AssetInventoryServer/InventoryStorageProvider">
         <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Grid.AssetInventoryServer.IInventoryStorageProvider" />
     </ExtensionPoint>
     <ExtensionPoint path="/OpenSim/AssetInventoryServer/AuthenticationProvider">