diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index fa323bafd8..1af96e7f13 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -108,9 +108,9 @@ namespace OpenSim.Framework.Interfaces
         event GenericCall OnRequestAvatarsData;
         event AddNewPrim OnAddPrim;
         event ObjectDuplicate OnObjectDuplicate;
-        event UpdateVector OnGrapObject;
-        event ObjectSelect OnDeGrapObject;
-        event MoveObject OnGrapUpdate;
+        event UpdateVector OnGrabObject;
+        event ObjectSelect OnDeGrabObject;
+        event MoveObject OnGrabUpdate;
 
         event UpdateShape OnUpdatePrimShape;
         event ObjectExtraParams OnUpdateExtraParams;
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs
index 459e12b82d..864ea6028e 100644
--- a/OpenSim/Framework/General/NullClientAPI.cs
+++ b/OpenSim/Framework/General/NullClientAPI.cs
@@ -31,9 +31,9 @@ namespace OpenSim.Framework
        public event GenericCall OnRequestAvatarsData;
        public event AddNewPrim OnAddPrim;
        public event ObjectDuplicate OnObjectDuplicate;
-       public event UpdateVector OnGrapObject;
-       public event ObjectSelect OnDeGrapObject;
-       public event MoveObject OnGrapUpdate;
+       public event UpdateVector OnGrabObject;
+       public event ObjectSelect OnDeGrabObject;
+       public event MoveObject OnGrabUpdate;
 
        public event UpdateShape OnUpdatePrimShape;
        public event ObjectExtraParams OnUpdateExtraParams;
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 81c20e8a5a..d9c7508132 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -55,10 +55,10 @@ namespace OpenSim.Region.ClientStack
         public event StartAnim OnStartAnim;
         public event GenericCall OnRequestAvatarsData;
         public event LinkObjects OnLinkObjects;
-        public event UpdateVector OnGrapObject;
-        public event ObjectSelect OnDeGrapObject;
+        public event UpdateVector OnGrabObject;
+        public event ObjectSelect OnDeGrabObject;
         public event ObjectDuplicate OnObjectDuplicate;
-        public event MoveObject OnGrapUpdate;
+        public event MoveObject OnGrabUpdate;
         public event AddNewPrim OnAddPrim;
         public event ObjectExtraParams OnUpdateExtraParams;
         public event UpdateShape OnUpdatePrimShape;
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index a50a3bd5bd..401f500032 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -290,24 +290,24 @@ namespace OpenSim.Region.ClientStack
                         }
                         break;
                     case PacketType.ObjectGrab:
-                        ObjectGrabPacket grap = (ObjectGrabPacket)Pack;
-                        if (OnGrapObject != null)
+                        ObjectGrabPacket grab = (ObjectGrabPacket)Pack; 
+                        if (OnGrabObject != null)
                         {
-                            OnGrapObject(grap.ObjectData.LocalID, grap.ObjectData.GrabOffset, this);
+                            OnGrabObject(grab.ObjectData.LocalID, grab.ObjectData.GrabOffset, this);
                         }
                         break;
                     case PacketType.ObjectGrabUpdate:
-                        ObjectGrabUpdatePacket grapUpdate = (ObjectGrabUpdatePacket)Pack;
-                        if (OnGrapUpdate != null)
+                        ObjectGrabUpdatePacket grabUpdate = (ObjectGrabUpdatePacket)Pack;
+                        if (OnGrabUpdate != null)
                         {
-                            OnGrapUpdate(grapUpdate.ObjectData.ObjectID, grapUpdate.ObjectData.GrabOffsetInitial, grapUpdate.ObjectData.GrabPosition, this);
+                            OnGrabUpdate(grabUpdate.ObjectData.ObjectID, grabUpdate.ObjectData.GrabOffsetInitial, grabUpdate.ObjectData.GrabPosition, this);
                         }
                         break;
                     case PacketType.ObjectDeGrab:
-                        ObjectDeGrabPacket deGrap = (ObjectDeGrabPacket)Pack;
-                        if (OnDeGrapObject != null)
+                        ObjectDeGrabPacket deGrab = (ObjectDeGrabPacket)Pack;
+                        if (OnDeGrabObject != null)
                         {
-                            OnDeGrapObject(deGrap.ObjectData.LocalID, this);
+                            OnDeGrabObject(deGrab.ObjectData.LocalID, this);
                         }
                         break;
                     case PacketType.ObjectDescription:
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 4300ce4e19..4ea5f2073a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -509,7 +509,7 @@ namespace OpenSim.Region.Environment.Scenes
                     hasPrim = ((SceneObjectGroup)ent).HasChildPrim(objectID);
                     if (hasPrim != false)
                     {
-                        ((SceneObjectGroup)ent).GrapMovement(offset, pos, remoteClient);
+                        ((SceneObjectGroup)ent).GrabMovement(offset, pos, remoteClient);
                         break;
                     }
                 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index d3c7f776d0..e7f5f56c24 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -588,7 +588,7 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnTeleportLocationRequest += RequestTeleportLocation;
             client.OnObjectSelect += SelectPrim;
             client.OnObjectDeselect += DeselectPrim;
-            client.OnGrapUpdate += MoveObject;
+            client.OnGrabUpdate += MoveObject;
             client.OnDeRezObject += DeRezObject;
             client.OnNameFromUUIDRequest += commsManager.HandleUUIDNameRequest;
             client.OnObjectDescription += PrimDescription;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 8b761f6068..39b7fb0347 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -365,7 +365,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="offset"></param>
         /// <param name="pos"></param>
         /// <param name="remoteClient"></param>
-        public void GrapMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
+        public void GrabMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
         {
             this.Pos = pos;
             this.m_rootPart.SendTerseUpdateToAllClients();
diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
index 3e9b669458..af3d77b933 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
@@ -44,9 +44,9 @@ namespace SimpleApp
         public event GenericCall OnRequestAvatarsData;
         public event AddNewPrim OnAddPrim;
         public event ObjectDuplicate OnObjectDuplicate;
-        public event UpdateVector OnGrapObject;
-        public event ObjectSelect OnDeGrapObject;
-        public event MoveObject OnGrapUpdate;
+        public event UpdateVector OnGrabObject;
+        public event ObjectSelect OnDeGrabObject;
+        public event MoveObject OnGrabUpdate;
 
 
         public event UpdateShape OnUpdatePrimShape;
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index 1a69e74128..92dd61b706 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -61,7 +61,7 @@ namespace SimpleApp
             client.OnUpdatePrimGroupPosition += this.UpdatePrimPosition;
             client.OnRequestMapBlocks += this.RequestMapBlocks;
             client.OnTeleportLocationRequest += this.RequestTeleportLocation;
-            client.OnGrapUpdate += this.MoveObject;
+            client.OnGrabUpdate += this.MoveObject;
             client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
             
             client.OnCompleteMovementToRegion += delegate()