diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 4e9cbe3eab..94d1deb480 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -220,9 +220,9 @@ namespace OpenSim.Region.Environment.Scenes
 
         #region Script Handling Methods
 
-        public void SendCommandToScripts(string[] args)
+        public void SendCommandToPlugins(string[] args)
         {
-            m_eventManager.TriggerOnScriptConsole(args);
+            m_eventManager.TriggerOnPluginConsole(args);
         }
 
         #endregion
@@ -275,7 +275,7 @@ namespace OpenSim.Region.Environment.Scenes
 
                 if (m_frame % m_update_physics == 0)
                     UpdatePhysics(
-                        Math.Min(SinceLastFrame.TotalSeconds, 0.001)
+                        Math.Min(SinceLastFrame.TotalSeconds, m_timespan)
                         );
 
                 if (m_frame % m_update_entities == 0)
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index 8e8e9a74a1..4f0ffc7f28 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -37,9 +37,9 @@ namespace OpenSim.Region.Environment.Scenes
 
         public event OnParcelPrimCountAddDelegate OnParcelPrimCountAdd;
 
-        public delegate void OnScriptConsoleDelegate(string[] args);
+        public delegate void OnPluginConsoleDelegate(string[] args);
 
-        public event OnScriptConsoleDelegate OnScriptConsole;
+        public event OnPluginConsoleDelegate OnPluginConsole;
 
         public delegate void OnShutdownDelegate();
 
@@ -66,10 +66,10 @@ namespace OpenSim.Region.Environment.Scenes
                 OnPermissionError(user, reason);
         }
 
-        public void TriggerOnScriptConsole(string[] args)
+        public void TriggerOnPluginConsole(string[] args)
         {
-            if (OnScriptConsole != null)
-                OnScriptConsole(args);
+            if (OnPluginConsole != null)
+                OnPluginConsole(args);
         }
 
         public void TriggerOnFrame()
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 196976cef0..00492823c9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void SendCommandToCurrentSceneScripts(string[] cmdparams)
         {
-            ForEachCurrentScene(delegate(Scene scene) { scene.SendCommandToScripts(cmdparams); });
+            ForEachCurrentScene(delegate(Scene scene) { scene.SendCommandToPlugins(cmdparams); });
         }
 
         public void SetBypassPermissionsOnCurrentScene(bool bypassPermissions)
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
index 466a902438..2043979e4a 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
@@ -21,7 +21,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples
         {
             script = scriptInfo;
             
-            script.events.OnScriptConsole += new EventManager.OnScriptConsoleDelegate(ProcessConsoleMsg);
+            script.events.OnPluginConsole += new EventManager.OnPluginConsoleDelegate(ProcessConsoleMsg);
         }
 
         void ProcessConsoleMsg(string[] args)