diff --git a/src/strategy/actions/ChatActionContext.h b/src/strategy/actions/ChatActionContext.h
index cb617e3e..0859b37b 100644
--- a/src/strategy/actions/ChatActionContext.h
+++ b/src/strategy/actions/ChatActionContext.h
@@ -82,7 +82,7 @@
 #include "TameAction.h"
 #include "TellGlyphsAction.h"
 #include "EquipGlyphsAction.h"
-#include "PetAction.h"
+#include "PetsAction.h"
 
 class ChatActionContext : public NamedObjectContext<Action>
 {
@@ -307,8 +307,8 @@ private:
     static Action* tame(PlayerbotAI* botAI) { return new TameAction(botAI); }
     static Action* glyphs(PlayerbotAI* botAI) { return new TellGlyphsAction(botAI); } // Added for custom Glyphs
     static Action* glyph_equip(PlayerbotAI* ai) { return new EquipGlyphsAction(ai); } // Added for custom Glyphs
-    static Action* pet(PlayerbotAI* botAI) { return new PetAction(botAI); }
-    static Action* pet_attack(PlayerbotAI* botAI) { return new PetAction(botAI, "attack"); }
+    static Action* pet(PlayerbotAI* botAI) { return new PetsAction(botAI); }
+    static Action* pet_attack(PlayerbotAI* botAI) { return new PetsAction(botAI, "attack"); }
     static Action* roll_action(PlayerbotAI* botAI) { return new RollAction(botAI); }
 };
 
diff --git a/src/strategy/actions/MovementActions.cpp b/src/strategy/actions/MovementActions.cpp
index 6758b916..9c84447f 100644
--- a/src/strategy/actions/MovementActions.cpp
+++ b/src/strategy/actions/MovementActions.cpp
@@ -210,7 +210,7 @@ bool MovementAction::MoveTo(uint32 mapId, float x, float y, float z, bool idle,
             mm.Clear();
             if (!backwards)
             {
-                mm.MovePoint(0, x, y, z, generatePath);
+                mm.MovePoint(0, x, y, z, FORCED_MOVEMENT_NONE, 0.0f, 0.0f, generatePath);
             }
             else
             {
@@ -245,7 +245,7 @@ bool MovementAction::MoveTo(uint32 mapId, float x, float y, float z, bool idle,
             mm.Clear();
             if (!backwards)
             {
-                mm.MovePoint(0, x, y, z, generatePath);
+                mm.MovePoint(0, x, y, z, FORCED_MOVEMENT_NONE, 0.0f, 0.0f, generatePath);
             }
             else
             {
@@ -287,7 +287,7 @@ bool MovementAction::MoveTo(uint32 mapId, float x, float y, float z, bool idle,
             mm.Clear();
             if (!backwards)
             {
-                mm.MovePoint(0, x, y, z, generatePath);
+                mm.MovePoint(0, x, y, z, FORCED_MOVEMENT_NONE, 0.0f, 0.0f, generatePath);
             }
             else
             {
diff --git a/src/strategy/actions/PetAction.cpp b/src/strategy/actions/PetsAction.cpp
similarity index 99%
rename from src/strategy/actions/PetAction.cpp
rename to src/strategy/actions/PetsAction.cpp
index 963ff09b..945a8836 100644
--- a/src/strategy/actions/PetAction.cpp
+++ b/src/strategy/actions/PetsAction.cpp
@@ -3,7 +3,7 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "PetAction.h"
+#include "PetsAction.h"
 
 #include "CharmInfo.h"
 #include "Creature.h"
@@ -13,7 +13,7 @@
 #include "PlayerbotAI.h"
 #include "SharedDefines.h"
 
-bool PetAction::Execute(Event event)
+bool PetsAction::Execute(Event event)
 {
     // Extract the command parameter from the event (e.g., "aggressive", "defensive", "attack", etc.)
     std::string param = event.getParam();
diff --git a/src/strategy/actions/PetAction.h b/src/strategy/actions/PetsAction.h
similarity index 67%
rename from src/strategy/actions/PetAction.h
rename to src/strategy/actions/PetsAction.h
index ed4af4d8..f9334e31 100644
--- a/src/strategy/actions/PetAction.h
+++ b/src/strategy/actions/PetsAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PETACTION_H
-#define _PLAYERBOT_PETACTION_H
+#ifndef _PLAYERBOT_PETSACTION_H
+#define _PLAYERBOT_PETSACTION_H
 
 #include <string>
 
@@ -14,10 +14,10 @@
 
 class PlayerbotAI;
 
-class PetAction : public Action
+class PetsAction : public Action
 {
 public:
-    PetAction(PlayerbotAI* botAI, const std::string& defaultCmd = "") : Action(botAI, "pet"), defaultCmd(defaultCmd) {}
+    PetsAction(PlayerbotAI* botAI, const std::string& defaultCmd = "") : Action(botAI, "pet"), defaultCmd(defaultCmd) {}
 
     bool Execute(Event event) override;
 
diff --git a/src/strategy/actions/WorldPacketActionContext.h b/src/strategy/actions/WorldPacketActionContext.h
index bada772c..59c05503 100644
--- a/src/strategy/actions/WorldPacketActionContext.h
+++ b/src/strategy/actions/WorldPacketActionContext.h
@@ -41,7 +41,7 @@
 #include "UseMeetingStoneAction.h"
 #include "NamedObjectContext.h"
 #include "ReleaseSpiritAction.h"
-#include "PetAction.h"
+#include "PetsAction.h"
 
 class PlayerbotAI;
 
@@ -141,7 +141,7 @@ private:
     static Action* tell_not_enough_reputation(PlayerbotAI* botAI) { return new TellMasterAction(botAI, "Not enough reputation"); }
     static Action* tell_cannot_equip(PlayerbotAI* botAI) { return new InventoryChangeFailureAction(botAI); }
     static Action* self_resurrect(PlayerbotAI* botAI) { return new SelfResurrectAction(botAI); }
-    static Action* pet(PlayerbotAI* botAI) { return new PetAction(botAI); }
+    static Action* pet(PlayerbotAI* botAI) { return new PetsAction(botAI); }
 
     // quest
     static Action* quest_update_add_kill(PlayerbotAI* ai) { return new QuestUpdateAddKillAction(ai); }