diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index cb2c4cd40a..da99d4fc77 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -233,19 +233,19 @@ namespace OpenSim.Region.Framework.Scenes
         public bool SendPeriodicAppearanceUpdates { get; set; }               
                 
         /// <summary>
-        /// How much a client has to change position before updates are sent to viewers.
+        /// How much a root agent has to change position before updates are sent to viewers.
         /// </summary>
-        public float ClientPositionUpdateTolerance { get; set; }
+        public float RootPositionUpdateTolerance { get; set; }
 
         /// <summary>
-        /// How much a client has to rotate before updates are sent to viewers.
+        /// How much a root agent has to rotate before updates are sent to viewers.
         /// </summary>
-        public float ClientRotationUpdateTolerance { get; set; }
+        public float RootRotationUpdateTolerance { get; set; }
 
         /// <summary>
-        /// How much a client has to change velocity before updates are sent to viewers.
+        /// How much a root agent has to change velocity before updates are sent to viewers.
         /// </summary>
-        public float ClientVelocityUpdateTolerance { get; set; }
+        public float RootVelocityUpdateTolerance { get; set; }
 
         /// <summary>
         /// If greater than 1, we only send terse updates to other root agents on every n updates.
@@ -1071,9 +1071,9 @@ namespace OpenSim.Region.Framework.Scenes
             PeriodicBackup = true;
             UseBackup = true;
 
-            ClientRotationUpdateTolerance = 0.01f;
-            ClientVelocityUpdateTolerance = 0.001f;
-            ClientPositionUpdateTolerance = 0.05f;
+            RootRotationUpdateTolerance = 0.01f;
+            RootVelocityUpdateTolerance = 0.001f;
+            RootPositionUpdateTolerance = 0.05f;
             ChildReprioritizationDistance = 20.0;
 
             m_eventManager = new EventManager();
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c7db306f45..e792d3fc14 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3200,12 +3200,12 @@ namespace OpenSim.Region.Framework.Scenes
                 // checks on all updates but the ramifications of this would need careful consideration.
                 bool updateClients 
                     = IsSatOnObject && (Rotation != m_lastRotation || Velocity != m_lastVelocity || m_pos != m_lastPosition);
-
+                                 
                 if (!updateClients)
                     updateClients 
-                        = !Rotation.ApproxEquals(m_lastRotation, Scene.ClientRotationUpdateTolerance) 
-                            || !Velocity.ApproxEquals(m_lastVelocity, Scene.ClientVelocityUpdateTolerance)
-                            || !m_pos.ApproxEquals(m_lastPosition, Scene.ClientPositionUpdateTolerance);
+                        = !Rotation.ApproxEquals(m_lastRotation, Scene.RootRotationUpdateTolerance) 
+                            || !Velocity.ApproxEquals(m_lastVelocity, Scene.RootVelocityUpdateTolerance)
+                            || !m_pos.ApproxEquals(m_lastPosition, Scene.RootPositionUpdateTolerance);
 
                 if (updateClients)
                 {
diff --git a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
index 0dc47f902e..f2595c8517 100644
--- a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
@@ -154,9 +154,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
             cdl.AddRow("animations", m_scene.DebugAnimations);
             cdl.AddRow("appear-refresh", m_scene.SendPeriodicAppearanceUpdates);
             cdl.AddRow("child-repri", m_scene.ChildReprioritizationDistance);
-            cdl.AddRow("client-pos-upd", m_scene.ClientPositionUpdateTolerance);
-            cdl.AddRow("client-rot-upd", m_scene.ClientRotationUpdateTolerance);
-            cdl.AddRow("client-vel-upd", m_scene.ClientVelocityUpdateTolerance);
+            cdl.AddRow("client-pos-upd", m_scene.RootPositionUpdateTolerance);
+            cdl.AddRow("client-rot-upd", m_scene.RootRotationUpdateTolerance);
+            cdl.AddRow("client-vel-upd", m_scene.RootVelocityUpdateTolerance);
             cdl.AddRow("root-upd-per", m_scene.RootTerseUpdatePeriod);
             cdl.AddRow("child-upd-per", m_scene.ChildTerseUpdatePeriod);
             cdl.AddRow("pbackup", m_scene.PeriodicBackup);
@@ -230,7 +230,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
 
                 // FIXME: This can only come from the console at the moment but might not always be true.
                 if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-pos-upd"], out newValue))
-                    m_scene.ClientPositionUpdateTolerance = newValue;    
+                    m_scene.RootPositionUpdateTolerance = newValue;    
             }
 
             if (options.ContainsKey("client-rot-upd"))
@@ -239,7 +239,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
 
                 // FIXME: This can only come from the console at the moment but might not always be true.
                 if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-rot-upd"], out newValue))
-                    m_scene.ClientRotationUpdateTolerance = newValue;    
+                    m_scene.RootRotationUpdateTolerance = newValue;    
             }
 
             if (options.ContainsKey("client-vel-upd"))
@@ -248,7 +248,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
 
                 // FIXME: This can only come from the console at the moment but might not always be true.
                 if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-vel-upd"], out newValue))
-                    m_scene.ClientVelocityUpdateTolerance = newValue;    
+                    m_scene.RootVelocityUpdateTolerance = newValue;    
             }
 
             if (options.ContainsKey("root-upd-per"))