diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 5d0401fa6f..9605263473 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -4817,7 +4817,7 @@ namespace OpenSim.Region.Framework.Scenes
             return 0;
         }
 
-        public int registerRotTargetWaypoint(UUID scriptID, Quaternion target, float tolerance)
+        public int RegisterRotTargetWaypoint(UUID scriptID, Quaternion target, float tolerance)
         {
             int handle = m_scene.AllocateIntId();
             scriptRotTarget waypoint = new scriptRotTarget()
@@ -4850,7 +4850,7 @@ namespace OpenSim.Region.Framework.Scenes
             return handle;
         }
 
-        public void unregisterRotTargetWaypoint(int handle)
+        public void UnRegisterRotTargetWaypoint(int handle)
         {
             lock (m_targets)
             {
@@ -4869,7 +4869,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public int registerTargetWaypoint(UUID scriptID, Vector3 target, float tolerance)
+        public int RegisterTargetWaypoint(UUID scriptID, Vector3 target, float tolerance)
         {
             int handle = m_scene.AllocateIntId();
             scriptPosTarget waypoint = new scriptPosTarget()
@@ -4902,7 +4902,7 @@ namespace OpenSim.Region.Framework.Scenes
             return handle;
         }
 
-        public void unregisterTargetWaypoint(int handle)
+        public void UnregisterTargetWaypoint(int handle)
         {
             lock (m_targets)
             {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 4676569018..f71d5d080d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2974,25 +2974,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Integer llTarget(LSL_Vector position, double range)
         {
             m_host.AddScriptLPS(1);
-            return m_host.ParentGroup.registerTargetWaypoint(m_item.ItemID, position, (float)range);
+            return m_host.ParentGroup.RegisterTargetWaypoint(m_item.ItemID, position, (float)range);
         }
 
         public void llTargetRemove(int number)
         {
             m_host.AddScriptLPS(1);
-            m_host.ParentGroup.unregisterTargetWaypoint(number);
+            m_host.ParentGroup.UnregisterTargetWaypoint(number);
         }
 
         public LSL_Integer llRotTarget(LSL_Rotation rot, double error)
         {
             m_host.AddScriptLPS(1);
-            return m_host.ParentGroup.registerRotTargetWaypoint(m_item.ItemID, rot, (float)error);
+            return m_host.ParentGroup.RegisterRotTargetWaypoint(m_item.ItemID, rot, (float)error);
         }
 
         public void llRotTargetRemove(int number)
         {
             m_host.AddScriptLPS(1);
-            m_host.ParentGroup.unregisterRotTargetWaypoint(number);
+            m_host.ParentGroup.UnRegisterRotTargetWaypoint(number);
         }
 
         public void llMoveToTarget(LSL_Vector target, double tau)