diff --git a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
index 00313b8eb7..7084ab41de 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
@@ -41,7 +41,7 @@ namespace pCampBot
     /// </remarks>
     public class GrabbingBehaviour : IBehaviour
     {
-        public void Action(PhysicsBot bot)
+        public void Action(Bot bot)
         {
             Dictionary<UUID, Primitive> objects = bot.Objects;
 
diff --git a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
index bd4a7a28a6..8d1d1ce005 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
@@ -49,7 +49,7 @@ namespace pCampBot
             talkarray = readexcuses();
         }
 
-        public void Action(PhysicsBot bot)
+        public void Action(Bot bot)
         {
             int walkorrun = bot.Random.Next(4); // Randomize between walking and running. The greater this number,
                                                 // the greater the bot's chances to walk instead of run.
diff --git a/OpenSim/Tools/pCampBot/PhysicsBot.cs b/OpenSim/Tools/pCampBot/Bot.cs
similarity index 99%
rename from OpenSim/Tools/pCampBot/PhysicsBot.cs
rename to OpenSim/Tools/pCampBot/Bot.cs
index 1b7c9a79e0..bf01065ffc 100644
--- a/OpenSim/Tools/pCampBot/PhysicsBot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -43,11 +43,11 @@ using Timer = System.Timers.Timer;
 
 namespace pCampBot
 {
-    public class PhysicsBot
+    public class Bot
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public delegate void AnEvent(PhysicsBot callbot, EventType someevent); // event delegate for bot events
+        public delegate void AnEvent(Bot callbot, EventType someevent); // event delegate for bot events
 
         public BotManager BotManager { get; private set; }
         private IConfig startupConfig; // bot config, passed from BotManager
@@ -119,7 +119,7 @@ namespace pCampBot
         /// <param name="password"></param>
         /// <param name="loginUri"></param>
         /// <param name="behaviours"></param>
-        public PhysicsBot(
+        public Bot(
             BotManager bm, List<IBehaviour> behaviours,
             string firstName, string lastName, string password, string loginUri)
         {
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index dac6e0e366..704770a960 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -49,7 +49,7 @@ namespace pCampBot
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected CommandConsole m_console;
-        protected List<PhysicsBot> m_lBot;
+        protected List<Bot> m_lBot;
         protected Random somthing = new Random(Environment.TickCount);
         protected int numbots = 0;
         public IConfig Config { get; private set; }
@@ -103,7 +103,7 @@ namespace pCampBot
 //                    "add bots <number>",
 //                    "Add more bots", HandleAddBots);
 
-            m_lBot = new List<PhysicsBot>();
+            m_lBot = new List<Bot>();
         }
 
         /// <summary>
@@ -175,7 +175,7 @@ namespace pCampBot
              int pos, BotManager bm, List<IBehaviour> behaviours,
              string firstName, string lastName, string password, string loginUri)
         {
-            PhysicsBot pb = new PhysicsBot(bm, behaviours, firstName, lastName, password, loginUri);
+            Bot pb = new Bot(bm, behaviours, firstName, lastName, password, loginUri);
 
             pb.OnConnected += handlebotEvent;
             pb.OnDisconnected += handlebotEvent;
@@ -194,7 +194,7 @@ namespace pCampBot
         /// </summary>
         /// <param name="callbot"></param>
         /// <param name="eventt"></param>
-        private void handlebotEvent(PhysicsBot callbot, EventType eventt)
+        private void handlebotEvent(Bot callbot, EventType eventt)
         {
             switch (eventt)
             {
@@ -219,7 +219,7 @@ namespace pCampBot
         public void doBotShutdown()
         {
             lock (m_lBot)
-                foreach (PhysicsBot pb in m_lBot)
+                foreach (Bot pb in m_lBot)
                     pb.shutdown();
         }
 
@@ -245,7 +245,7 @@ namespace pCampBot
 
             lock (m_lBot)
             {
-                foreach (PhysicsBot pb in m_lBot)
+                foreach (Bot pb in m_lBot)
                 {
                     MainConsole.Instance.OutputFormat(
                         outputFormat, pb.Name, (pb.IsConnected ? "Connected" : "Disconnected"));
diff --git a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
index 8a1015d653..d4ae0f064b 100644
--- a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
@@ -31,6 +31,6 @@ namespace pCampBot.Interfaces
 {
     public interface IBehaviour
     {
-        void Action(PhysicsBot bot);
+        void Action(Bot bot);
     }
 }
\ No newline at end of file