diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index cf781cfe53..8d25d0f15b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);      
         
         protected TarArchiveWriter archive = new TarArchiveWriter();
-        protected AssetGatherer m_assetGatherer;
+        protected UuidGatherer m_assetGatherer;
         protected Dictionary<UUID, int> assetUuids = new Dictionary<UUID, int>();
         
         private InventoryArchiverModule m_module;
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             m_userInfo = userInfo;
             m_invPath = invPath;
             m_saveStream = saveStream;          
-            m_assetGatherer = new AssetGatherer(m_module.CommsManager.AssetCache);
+            m_assetGatherer = new UuidGatherer(m_module.CommsManager.AssetCache);
         }
 
         protected void ReceivedAllAssets(IDictionary<UUID, AssetBase> assetsFound, ICollection<UUID> assetsNotFoundUuids)
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
index 1edd2dc184..accf7e474a 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 }
             }
             
-            AssetGatherer assetGatherer = new AssetGatherer(m_scene.CommsManager.AssetCache);
+            UuidGatherer assetGatherer = new UuidGatherer(m_scene.CommsManager.AssetCache);
 
             foreach (SceneObjectGroup sceneObject in sceneObjects)
             {
diff --git a/OpenSim/Region/Framework/Scenes/AssetGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
similarity index 98%
rename from OpenSim/Region/Framework/Scenes/AssetGatherer.cs
rename to OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 00a4398648..bc8896e4c8 100644
--- a/OpenSim/Region/Framework/Scenes/AssetGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -37,14 +37,14 @@ using OpenSim.Framework;
 namespace OpenSim.Region.Framework.Scenes
 {
     /// <summary>
-    /// Gather assets for a given object.
+    /// Gather uuids for a given entity.
     /// </summary>        
     ///
-    /// This does a deep inspection of the object to retrieve all the assets it uses (whether as textures, as scripts
+    /// This does a deep inspection of the entity to retrieve all the assets it uses (whether as textures, as scripts
     /// contained in inventory, as scripts contained in objects contained in another object's inventory, etc.  Assets
     /// are only retrieved when they are necessary to carry out the inspection (i.e. a serialized object needs to be
     /// retrieved to work out which assets it references).
-    public class AssetGatherer
+    public class UuidGatherer
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         protected bool m_waitingForObjectAsset;
                 
-        public AssetGatherer(IAssetCache assetCache)
+        public UuidGatherer(IAssetCache assetCache)
         {
             m_assetCache = assetCache;
         }