diff --git a/src/Ai/Base/ActionContext.h b/src/Ai/Base/ActionContext.h
index 7cde4dbfd..7b95e4b0c 100644
--- a/src/Ai/Base/ActionContext.h
+++ b/src/Ai/Base/ActionContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ACTIONCONTEXT_H
-#define _PLAYERBOT_ACTIONCONTEXT_H
+#ifndef PLAYERBOTS_ACTIONCONTEXT_H
+#define PLAYERBOTS_ACTIONCONTEXT_H
 
 #include "AddLootAction.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Base/Actions/AcceptBattlegroundInvitationAction.h b/src/Ai/Base/Actions/AcceptBattlegroundInvitationAction.h
index 5ff4f439e..a56fc8d4b 100644
--- a/src/Ai/Base/Actions/AcceptBattlegroundInvitationAction.h
+++ b/src/Ai/Base/Actions/AcceptBattlegroundInvitationAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ACCEPTBATTLEGROUNDINVITATIONACTION_H
-#define _PLAYERBOT_ACCEPTBATTLEGROUNDINVITATIONACTION_H
+#ifndef PLAYERBOTS_ACCEPTBATTLEGROUNDINVITATIONACTION_H
+#define PLAYERBOTS_ACCEPTBATTLEGROUNDINVITATIONACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/AcceptDuelAction.h b/src/Ai/Base/Actions/AcceptDuelAction.h
index 4606e938f..7443ebf69 100644
--- a/src/Ai/Base/Actions/AcceptDuelAction.h
+++ b/src/Ai/Base/Actions/AcceptDuelAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ACCEPTDUELACTION_H
-#define _PLAYERBOT_ACCEPTDUELACTION_H
+#ifndef PLAYERBOTS_ACCEPTDUELACTION_H
+#define PLAYERBOTS_ACCEPTDUELACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/AcceptInvitationAction.h b/src/Ai/Base/Actions/AcceptInvitationAction.h
index 396ebd7ca..0a35abd6a 100644
--- a/src/Ai/Base/Actions/AcceptInvitationAction.h
+++ b/src/Ai/Base/Actions/AcceptInvitationAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ACCEPTINVITATIONACTION_H
-#define _PLAYERBOT_ACCEPTINVITATIONACTION_H
+#ifndef PLAYERBOTS_ACCEPTINVITATIONACTION_H
+#define PLAYERBOTS_ACCEPTINVITATIONACTION_H
 
 #include "Action.h"
 #include "UseMeetingStoneAction.h"
diff --git a/src/Ai/Base/Actions/AcceptQuestAction.h b/src/Ai/Base/Actions/AcceptQuestAction.h
index 1160e66a8..d07f8a090 100644
--- a/src/Ai/Base/Actions/AcceptQuestAction.h
+++ b/src/Ai/Base/Actions/AcceptQuestAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ACCEPTQUESTACTION_H
-#define _PLAYERBOT_ACCEPTQUESTACTION_H
+#ifndef PLAYERBOTS_ACCEPTQUESTACTION_H
+#define PLAYERBOTS_ACCEPTQUESTACTION_H
 
 #include "QuestAction.h"
 
diff --git a/src/Ai/Base/Actions/AcceptResurrectAction.h b/src/Ai/Base/Actions/AcceptResurrectAction.h
index c4495cfc0..d43277f09 100644
--- a/src/Ai/Base/Actions/AcceptResurrectAction.h
+++ b/src/Ai/Base/Actions/AcceptResurrectAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ACCEPTRESURRECTACTION_H
-#define _PLAYERBOT_ACCEPTRESURRECTACTION_H
+#ifndef PLAYERBOTS_ACCEPTRESURRECTACTION_H
+#define PLAYERBOTS_ACCEPTRESURRECTACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/AddLootAction.h b/src/Ai/Base/Actions/AddLootAction.h
index dcd388175..e5c271474 100644
--- a/src/Ai/Base/Actions/AddLootAction.h
+++ b/src/Ai/Base/Actions/AddLootAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ADDLOOTACTION_H
-#define _PLAYERBOT_ADDLOOTACTION_H
+#ifndef PLAYERBOTS_ADDLOOTACTION_H
+#define PLAYERBOTS_ADDLOOTACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/AreaTriggerAction.h b/src/Ai/Base/Actions/AreaTriggerAction.h
index 93a90f16d..63cd7c072 100644
--- a/src/Ai/Base/Actions/AreaTriggerAction.h
+++ b/src/Ai/Base/Actions/AreaTriggerAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_AREATRIGGERACTION_H
-#define _PLAYERBOT_AREATRIGGERACTION_H
+#ifndef PLAYERBOTS_AREATRIGGERACTION_H
+#define PLAYERBOTS_AREATRIGGERACTION_H
 
 #include "MovementActions.h"
 
diff --git a/src/Ai/Base/Actions/ArenaTeamActions.h b/src/Ai/Base/Actions/ArenaTeamActions.h
index f9fb9ebe7..be3d89f88 100644
--- a/src/Ai/Base/Actions/ArenaTeamActions.h
+++ b/src/Ai/Base/Actions/ArenaTeamActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ARENATEAMACTION_H
-#define _PLAYERBOT_ARENATEAMACTION_H
+#ifndef PLAYERBOTS_ARENATEAMACTIONS_H
+#define PLAYERBOTS_ARENATEAMACTIONS_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/AttackAction.h b/src/Ai/Base/Actions/AttackAction.h
index 27081350f..45fbccc77 100644
--- a/src/Ai/Base/Actions/AttackAction.h
+++ b/src/Ai/Base/Actions/AttackAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ATTACKACTION_H
-#define _PLAYERBOT_ATTACKACTION_H
+#ifndef PLAYERBOTS_ATTACKACTION_H
+#define PLAYERBOTS_ATTACKACTION_H
 
 #include "MovementActions.h"
 
diff --git a/src/Ai/Base/Actions/AutoMaintenanceOnLevelupAction.h b/src/Ai/Base/Actions/AutoMaintenanceOnLevelupAction.h
index 5399973cf..eb4f98c7c 100644
--- a/src/Ai/Base/Actions/AutoMaintenanceOnLevelupAction.h
+++ b/src/Ai/Base/Actions/AutoMaintenanceOnLevelupAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_AUTOTELEPORTFORLEVELACTION_H
-#define _PLAYERBOT_AUTOTELEPORTFORLEVELACTION_H
+#ifndef PLAYERBOTS_AUTOMAINTENANCEONLEVELUPACTION_H
+#define PLAYERBOTS_AUTOMAINTENANCEONLEVELUPACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/BankAction.h b/src/Ai/Base/Actions/BankAction.h
index 5f3ffc783..ebb1be017 100644
--- a/src/Ai/Base/Actions/BankAction.h
+++ b/src/Ai/Base/Actions/BankAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_BANKACTION_H
-#define _PLAYERBOT_BANKACTION_H
+#ifndef PLAYERBOTS_BANKACTION_H
+#define PLAYERBOTS_BANKACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/BattleGroundJoinAction.h b/src/Ai/Base/Actions/BattleGroundJoinAction.h
index d3aaa8994..cf28717a1 100644
--- a/src/Ai/Base/Actions/BattleGroundJoinAction.h
+++ b/src/Ai/Base/Actions/BattleGroundJoinAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_BATTLEGROUNDJOINACTION_H
-#define _PLAYERBOT_BATTLEGROUNDJOINACTION_H
+#ifndef PLAYERBOTS_BATTLEGROUNDJOINACTION_H
+#define PLAYERBOTS_BATTLEGROUNDJOINACTION_H
 
 #include "Action.h"
 #include "DBCEnums.h"
diff --git a/src/Ai/Base/Actions/BattleGroundTactics.h b/src/Ai/Base/Actions/BattleGroundTactics.h
index b6d065aeb..4c0072df0 100644
--- a/src/Ai/Base/Actions/BattleGroundTactics.h
+++ b/src/Ai/Base/Actions/BattleGroundTactics.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_BATTLEGROUNDTACTICSACTION_H
-#define _PLAYERBOT_BATTLEGROUNDTACTICSACTION_H
+#ifndef PLAYERBOTS_BATTLEGROUNDTACTICS_H
+#define PLAYERBOTS_BATTLEGROUNDTACTICS_H
 
 #include "BattlegroundAV.h"
 #include "MovementActions.h"
diff --git a/src/Ai/Base/Actions/BossAuraActions.h b/src/Ai/Base/Actions/BossAuraActions.h
index e31be8c4e..07dd09662 100644
--- a/src/Ai/Base/Actions/BossAuraActions.h
+++ b/src/Ai/Base/Actions/BossAuraActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_BOSSAURAACTION_H
-#define _PLAYERBOT_BOSSAURAACTION_H
+#ifndef PLAYERBOTS_BOSSAURAACTIONS_H
+#define PLAYERBOTS_BOSSAURAACTIONS_H
 
 #include <string>
 
diff --git a/src/Ai/Base/Actions/BuffAction.h b/src/Ai/Base/Actions/BuffAction.h
index 525badd12..db89d3004 100644
--- a/src/Ai/Base/Actions/BuffAction.h
+++ b/src/Ai/Base/Actions/BuffAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_BUFFACTION_H
-#define _PLAYERBOT_BUFFACTION_H
+#ifndef PLAYERBOTS_BUFFACTION_H
+#define PLAYERBOTS_BUFFACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/BuyAction.h b/src/Ai/Base/Actions/BuyAction.h
index 0d7e7e157..86ce7ce5f 100644
--- a/src/Ai/Base/Actions/BuyAction.h
+++ b/src/Ai/Base/Actions/BuyAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_BUYACTION_H
-#define _PLAYERBOT_BUYACTION_H
+#ifndef PLAYERBOTS_BUYACTION_H
+#define PLAYERBOTS_BUYACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/CancelChannelAction.h b/src/Ai/Base/Actions/CancelChannelAction.h
index 220beb71d..29281b749 100644
--- a/src/Ai/Base/Actions/CancelChannelAction.h
+++ b/src/Ai/Base/Actions/CancelChannelAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CANCELCHANNELACTION_H
-#define _PLAYERBOT_CANCELCHANNELACTION_H
+#ifndef PLAYERBOTS_CANCELCHANNELACTION_H
+#define PLAYERBOTS_CANCELCHANNELACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/CastCustomSpellAction.h b/src/Ai/Base/Actions/CastCustomSpellAction.h
index 6cfc1e689..2a483e28b 100644
--- a/src/Ai/Base/Actions/CastCustomSpellAction.h
+++ b/src/Ai/Base/Actions/CastCustomSpellAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CASTCUSTOMSPELLACTION_H
-#define _PLAYERBOT_CASTCUSTOMSPELLACTION_H
+#ifndef PLAYERBOTS_CASTCUSTOMSPELLACTION_H
+#define PLAYERBOTS_CASTCUSTOMSPELLACTION_H
 
 #include "ListSpellsAction.h"
 
diff --git a/src/Ai/Base/Actions/ChangeChatAction.h b/src/Ai/Base/Actions/ChangeChatAction.h
index f4f476a61..0bd384948 100644
--- a/src/Ai/Base/Actions/ChangeChatAction.h
+++ b/src/Ai/Base/Actions/ChangeChatAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CHANGECHATACTION_H
-#define _PLAYERBOT_CHANGECHATACTION_H
+#ifndef PLAYERBOTS_CHANGECHATACTION_H
+#define PLAYERBOTS_CHANGECHATACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/ChangeStrategyAction.h b/src/Ai/Base/Actions/ChangeStrategyAction.h
index b9d0ee866..c7db89e3e 100644
--- a/src/Ai/Base/Actions/ChangeStrategyAction.h
+++ b/src/Ai/Base/Actions/ChangeStrategyAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CHANGESTRATEGYACTION_H
-#define _PLAYERBOT_CHANGESTRATEGYACTION_H
+#ifndef PLAYERBOTS_CHANGESTRATEGYACTION_H
+#define PLAYERBOTS_CHANGESTRATEGYACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/ChangeTalentsAction.h b/src/Ai/Base/Actions/ChangeTalentsAction.h
index 0b06a674e..272ac644f 100644
--- a/src/Ai/Base/Actions/ChangeTalentsAction.h
+++ b/src/Ai/Base/Actions/ChangeTalentsAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CHANGETALENTSACTION_H
-#define _PLAYERBOT_CHANGETALENTSACTION_H
+#ifndef PLAYERBOTS_CHANGETALENTSACTION_H
+#define PLAYERBOTS_CHANGETALENTSACTION_H
 
 #include "Action.h"
 #include "Talentspec.h"
diff --git a/src/Ai/Base/Actions/ChatShortcutActions.h b/src/Ai/Base/Actions/ChatShortcutActions.h
index fa941a4c8..3ffe20082 100644
--- a/src/Ai/Base/Actions/ChatShortcutActions.h
+++ b/src/Ai/Base/Actions/ChatShortcutActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CHATSHORTCUTACTION_H
-#define _PLAYERBOT_CHATSHORTCUTACTION_H
+#ifndef PLAYERBOTS_CHATSHORTCUTACTIONS_H
+#define PLAYERBOTS_CHATSHORTCUTACTIONS_H
 
 #include "MovementActions.h"
 
diff --git a/src/Ai/Base/Actions/CheatAction.h b/src/Ai/Base/Actions/CheatAction.h
index 512c9d390..7f0adc62f 100644
--- a/src/Ai/Base/Actions/CheatAction.h
+++ b/src/Ai/Base/Actions/CheatAction.h
@@ -3,6 +3,9 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
+#ifndef PLAYERBOTS_CHEATACTION_H
+#define PLAYERBOTS_CHEATACTION_H
+
 #include "Action.h"
 
 class PlayerbotAI;
@@ -21,3 +24,5 @@ private:
     static std::string const GetCheatName(BotCheatMask cheatMask);
     void ListCheats();
 };
+
+#endif
diff --git a/src/Ai/Base/Actions/CheckMailAction.h b/src/Ai/Base/Actions/CheckMailAction.h
index cd0add81c..55b2e0fc8 100644
--- a/src/Ai/Base/Actions/CheckMailAction.h
+++ b/src/Ai/Base/Actions/CheckMailAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CHECKMAILACTION_H
-#define _PLAYERBOT_CHECKMAILACTION_H
+#ifndef PLAYERBOTS_CHECKMAILACTION_H
+#define PLAYERBOTS_CHECKMAILACTION_H
 
 #include "Action.h"
 #include "DatabaseEnvFwd.h"
diff --git a/src/Ai/Base/Actions/CheckMountStateAction.h b/src/Ai/Base/Actions/CheckMountStateAction.h
index 0bf83cc5e..feeabe583 100644
--- a/src/Ai/Base/Actions/CheckMountStateAction.h
+++ b/src/Ai/Base/Actions/CheckMountStateAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CHECKMOUNTSTATEACTION_H
-#define _PLAYERBOT_CHECKMOUNTSTATEACTION_H
+#ifndef PLAYERBOTS_CHECKMOUNTSTATEACTION_H
+#define PLAYERBOTS_CHECKMOUNTSTATEACTION_H
 
 #include <unordered_map>
 #include <vector>
diff --git a/src/Ai/Base/Actions/CheckValuesAction.h b/src/Ai/Base/Actions/CheckValuesAction.h
index f36657560..9551af672 100644
--- a/src/Ai/Base/Actions/CheckValuesAction.h
+++ b/src/Ai/Base/Actions/CheckValuesAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CHECKVALUESACTION_H
-#define _PLAYERBOT_CHECKVALUESACTION_H
+#ifndef PLAYERBOTS_CHECKVALUESACTION_H
+#define PLAYERBOTS_CHECKVALUESACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/ChooseRpgTargetAction.h b/src/Ai/Base/Actions/ChooseRpgTargetAction.h
index 2aeb89e20..beb4b7d8d 100644
--- a/src/Ai/Base/Actions/ChooseRpgTargetAction.h
+++ b/src/Ai/Base/Actions/ChooseRpgTargetAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CHOOSERPGTARGETACTION_H
-#define _PLAYERBOT_CHOOSERPGTARGETACTION_H
+#ifndef PLAYERBOTS_CHOOSERPGTARGETACTION_H
+#define PLAYERBOTS_CHOOSERPGTARGETACTION_H
 
 #include "ObjectGuid.h"
 #include "RpgAction.h"
diff --git a/src/Ai/Base/Actions/ChooseTargetActions.h b/src/Ai/Base/Actions/ChooseTargetActions.h
index 5822543ef..21a24aa31 100644
--- a/src/Ai/Base/Actions/ChooseTargetActions.h
+++ b/src/Ai/Base/Actions/ChooseTargetActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CHOOSETARGETACTIONS_H
-#define _PLAYERBOT_CHOOSETARGETACTIONS_H
+#ifndef PLAYERBOTS_CHOOSETARGETACTIONS_H
+#define PLAYERBOTS_CHOOSETARGETACTIONS_H
 
 #include "AttackAction.h"
 
diff --git a/src/Ai/Base/Actions/ChooseTravelTargetAction.h b/src/Ai/Base/Actions/ChooseTravelTargetAction.h
index 2ec026dc2..bd291b003 100644
--- a/src/Ai/Base/Actions/ChooseTravelTargetAction.h
+++ b/src/Ai/Base/Actions/ChooseTravelTargetAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CHOOSETRAVELTARGETACTION_H
-#define _PLAYERBOT_CHOOSETRAVELTARGETACTION_H
+#ifndef PLAYERBOTS_CHOOSETRAVELTARGETACTION_H
+#define PLAYERBOTS_CHOOSETRAVELTARGETACTION_H
 
 #include "MovementActions.h"
 #include "TravelMgr.h"
diff --git a/src/Ai/Base/Actions/CombatActions.h b/src/Ai/Base/Actions/CombatActions.h
index 82d74527e..e8827e93c 100644
--- a/src/Ai/Base/Actions/CombatActions.h
+++ b/src/Ai/Base/Actions/CombatActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_COMBATACTIONS_H
-#define _PLAYERBOT_COMBATACTIONS_H
+#ifndef PLAYERBOTS_COMBATACTIONS_H
+#define PLAYERBOTS_COMBATACTIONS_H
 
 #include "ChangeStrategyAction.h"
 
diff --git a/src/Ai/Base/Actions/CustomStrategyEditAction.h b/src/Ai/Base/Actions/CustomStrategyEditAction.h
index 363307659..6246fde8f 100644
--- a/src/Ai/Base/Actions/CustomStrategyEditAction.h
+++ b/src/Ai/Base/Actions/CustomStrategyEditAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CUSTOMSTRATEGYEDITACTION_H
-#define _PLAYERBOT_CUSTOMSTRATEGYEDITACTION_H
+#ifndef PLAYERBOTS_CUSTOMSTRATEGYEDITACTION_H
+#define PLAYERBOTS_CUSTOMSTRATEGYEDITACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/DebugAction.h b/src/Ai/Base/Actions/DebugAction.h
index 5c81c313e..fbea7325b 100644
--- a/src/Ai/Base/Actions/DebugAction.h
+++ b/src/Ai/Base/Actions/DebugAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DEBUGACTION_H
-#define _PLAYERBOT_DEBUGACTION_H
+#ifndef PLAYERBOTS_DEBUGACTION_H
+#define PLAYERBOTS_DEBUGACTION_H
 
 #include "Action.h"
 #include "ObjectGuid.h"
diff --git a/src/Ai/Base/Actions/DelayAction.h b/src/Ai/Base/Actions/DelayAction.h
index 626c577fd..e081b58a8 100644
--- a/src/Ai/Base/Actions/DelayAction.h
+++ b/src/Ai/Base/Actions/DelayAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DELAYACTION_H
-#define _PLAYERBOT_DELAYACTION_H
+#ifndef PLAYERBOTS_DELAYACTION_H
+#define PLAYERBOTS_DELAYACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/DestroyItemAction.h b/src/Ai/Base/Actions/DestroyItemAction.h
index fce18e602..39545aedc 100644
--- a/src/Ai/Base/Actions/DestroyItemAction.h
+++ b/src/Ai/Base/Actions/DestroyItemAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DESTROYITEMACTION_H
-#define _PLAYERBOT_DESTROYITEMACTION_H
+#ifndef PLAYERBOTS_DESTROYITEMACTION_H
+#define PLAYERBOTS_DESTROYITEMACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/DropQuestAction.h b/src/Ai/Base/Actions/DropQuestAction.h
index a6622eec1..a4382eabb 100644
--- a/src/Ai/Base/Actions/DropQuestAction.h
+++ b/src/Ai/Base/Actions/DropQuestAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DROPQUESTACTION_H
-#define _PLAYERBOT_DROPQUESTACTION_H
+#ifndef PLAYERBOTS_DROPQUESTACTION_H
+#define PLAYERBOTS_DROPQUESTACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/EmoteAction.h b/src/Ai/Base/Actions/EmoteAction.h
index 7732ad8e8..22cd058d5 100644
--- a/src/Ai/Base/Actions/EmoteAction.h
+++ b/src/Ai/Base/Actions/EmoteAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_EMOTEACTION_H
-#define _PLAYERBOT_EMOTEACTION_H
+#ifndef PLAYERBOTS_EMOTEACTION_H
+#define PLAYERBOTS_EMOTEACTION_H
 
 #include <map>
 
diff --git a/src/Ai/Base/Actions/EquipAction.h b/src/Ai/Base/Actions/EquipAction.h
index bf609d861..fc72d0ba7 100644
--- a/src/Ai/Base/Actions/EquipAction.h
+++ b/src/Ai/Base/Actions/EquipAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_EQUIPACTION_H
-#define _PLAYERBOT_EQUIPACTION_H
+#ifndef PLAYERBOTS_EQUIPACTION_H
+#define PLAYERBOTS_EQUIPACTION_H
 
 #include "ChatHelper.h"
 #include "InventoryAction.h"
diff --git a/src/Ai/Base/Actions/EquipGlyphsAction.h b/src/Ai/Base/Actions/EquipGlyphsAction.h
index d2812d8e3..8d6a42a1e 100644
--- a/src/Ai/Base/Actions/EquipGlyphsAction.h
+++ b/src/Ai/Base/Actions/EquipGlyphsAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_EQUIPGLYPHSACTION_H
-#define _PLAYERBOT_EQUIPGLYPHSACTION_H
+#ifndef PLAYERBOTS_EQUIPGLYPHSACTION_H
+#define PLAYERBOTS_EQUIPGLYPHSACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/FishingAction.h b/src/Ai/Base/Actions/FishingAction.h
index 35a7ab6fe..df0beae1b 100644
--- a/src/Ai/Base/Actions/FishingAction.h
+++ b/src/Ai/Base/Actions/FishingAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_FISHINGACTION_H
-#define _PLAYERBOT_FISHINGACTION_H
+#ifndef PLAYERBOTS_FISHINGACTION_H
+#define PLAYERBOTS_FISHINGACTION_H
 
 #include "Action.h"
 #include "Event.h"
diff --git a/src/Ai/Base/Actions/FlagAction.h b/src/Ai/Base/Actions/FlagAction.h
index 3d50d7ad2..a7859a501 100644
--- a/src/Ai/Base/Actions/FlagAction.h
+++ b/src/Ai/Base/Actions/FlagAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_FLAGACTION_H
-#define _PLAYERBOT_FLAGACTION_H
+#ifndef PLAYERBOTS_FLAGACTION_H
+#define PLAYERBOTS_FLAGACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/FollowActions.h b/src/Ai/Base/Actions/FollowActions.h
index 9331bbf55..f3941e6b8 100644
--- a/src/Ai/Base/Actions/FollowActions.h
+++ b/src/Ai/Base/Actions/FollowActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_FOLLOWACTIONS_H
-#define _PLAYERBOT_FOLLOWACTIONS_H
+#ifndef PLAYERBOTS_FOLLOWACTIONS_H
+#define PLAYERBOTS_FOLLOWACTIONS_H
 
 #include "MovementActions.h"
 
diff --git a/src/Ai/Base/Actions/GenericActions.h b/src/Ai/Base/Actions/GenericActions.h
index b089b6764..6da6ab469 100644
--- a/src/Ai/Base/Actions/GenericActions.h
+++ b/src/Ai/Base/Actions/GenericActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICACTIONS_H
-#define _PLAYERBOT_GENERICACTIONS_H
+#ifndef PLAYERBOTS_GENERICACTIONS_H
+#define PLAYERBOTS_GENERICACTIONS_H
 
 #include "AttackAction.h"
 #include "Action.h"
diff --git a/src/Ai/Base/Actions/GenericSpellActions.h b/src/Ai/Base/Actions/GenericSpellActions.h
index 1d6e464ef..a5f802a46 100644
--- a/src/Ai/Base/Actions/GenericSpellActions.h
+++ b/src/Ai/Base/Actions/GenericSpellActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICSPELLACTIONS_H
-#define _PLAYERBOT_GENERICSPELLACTIONS_H
+#ifndef PLAYERBOTS_GENERICSPELLACTIONS_H
+#define PLAYERBOTS_GENERICSPELLACTIONS_H
 
 #include "Action.h"
 #include "PlayerbotAI.h"
diff --git a/src/Ai/Base/Actions/GiveItemAction.h b/src/Ai/Base/Actions/GiveItemAction.h
index bd3f3b087..2b091a6a3 100644
--- a/src/Ai/Base/Actions/GiveItemAction.h
+++ b/src/Ai/Base/Actions/GiveItemAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GIVEITEMACTION_H
-#define _PLAYERBOT_GIVEITEMACTION_H
+#ifndef PLAYERBOTS_GIVEITEMACTION_H
+#define PLAYERBOTS_GIVEITEMACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/GoAction.h b/src/Ai/Base/Actions/GoAction.h
index f94181567..788dcfb5d 100644
--- a/src/Ai/Base/Actions/GoAction.h
+++ b/src/Ai/Base/Actions/GoAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GOACTION_H
-#define _PLAYERBOT_GOACTION_H
+#ifndef PLAYERBOTS_GOACTION_H
+#define PLAYERBOTS_GOACTION_H
 
 #include "MovementActions.h"
 
diff --git a/src/Ai/Base/Actions/GossipHelloAction.h b/src/Ai/Base/Actions/GossipHelloAction.h
index 71ef373fc..db3656b4c 100644
--- a/src/Ai/Base/Actions/GossipHelloAction.h
+++ b/src/Ai/Base/Actions/GossipHelloAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GOSSIPHELLOACTION_H
-#define _PLAYERBOT_GOSSIPHELLOACTION_H
+#ifndef PLAYERBOTS_GOSSIPHELLOACTION_H
+#define PLAYERBOTS_GOSSIPHELLOACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/GreetAction.h b/src/Ai/Base/Actions/GreetAction.h
index 8b1e910ea..7cc6ef7e2 100644
--- a/src/Ai/Base/Actions/GreetAction.h
+++ b/src/Ai/Base/Actions/GreetAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GREETACTION_H
-#define _PLAYERBOT_GREETACTION_H
+#ifndef PLAYERBOTS_GREETACTION_H
+#define PLAYERBOTS_GREETACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/GuildAcceptAction.h b/src/Ai/Base/Actions/GuildAcceptAction.h
index 8d60d07e6..433fe58a3 100644
--- a/src/Ai/Base/Actions/GuildAcceptAction.h
+++ b/src/Ai/Base/Actions/GuildAcceptAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GUILDACCEPTACTION_H
-#define _PLAYERBOT_GUILDACCEPTACTION_H
+#ifndef PLAYERBOTS_GUILDACCEPTACTION_H
+#define PLAYERBOTS_GUILDACCEPTACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/GuildBankAction.h b/src/Ai/Base/Actions/GuildBankAction.h
index 5454a3105..71b57d83d 100644
--- a/src/Ai/Base/Actions/GuildBankAction.h
+++ b/src/Ai/Base/Actions/GuildBankAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GUILDBANKACTION_H
-#define _PLAYERBOT_GUILDBANKACTION_H
+#ifndef PLAYERBOTS_GUILDBANKACTION_H
+#define PLAYERBOTS_GUILDBANKACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/GuildCreateActions.h b/src/Ai/Base/Actions/GuildCreateActions.h
index 07de5824f..2f3e5c57c 100644
--- a/src/Ai/Base/Actions/GuildCreateActions.h
+++ b/src/Ai/Base/Actions/GuildCreateActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GUILDCREATEACTION_H
-#define _PLAYERBOT_GUILDCREATEACTION_H
+#ifndef PLAYERBOTS_GUILDCREATEACTIONS_H
+#define PLAYERBOTS_GUILDCREATEACTIONS_H
 
 #include "ChooseTravelTargetAction.h"
 #include "InventoryAction.h"
diff --git a/src/Ai/Base/Actions/GuildManagementActions.h b/src/Ai/Base/Actions/GuildManagementActions.h
index b1d363e89..c09731921 100644
--- a/src/Ai/Base/Actions/GuildManagementActions.h
+++ b/src/Ai/Base/Actions/GuildManagementActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GUILDMAMANEGEMENTACTION_H
-#define _PLAYERBOT_GUILDMAMANEGEMENTACTION_H
+#ifndef PLAYERBOTS_GUILDMANAGEMENTACTIONS_H
+#define PLAYERBOTS_GUILDMANAGEMENTACTIONS_H
 
 #include "Action.h"
 #include "Opcodes.h"
diff --git a/src/Ai/Base/Actions/HelpAction.h b/src/Ai/Base/Actions/HelpAction.h
index e1d374b0c..8234306a4 100644
--- a/src/Ai/Base/Actions/HelpAction.h
+++ b/src/Ai/Base/Actions/HelpAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_HELPACTION_H
-#define _PLAYERBOT_HELPACTION_H
+#ifndef PLAYERBOTS_HELPACTION_H
+#define PLAYERBOTS_HELPACTION_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Base/Actions/HireAction.h b/src/Ai/Base/Actions/HireAction.h
index 6738f02c1..18509a071 100644
--- a/src/Ai/Base/Actions/HireAction.h
+++ b/src/Ai/Base/Actions/HireAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_HIREACTION_H
-#define _PLAYERBOT_HIREACTION_H
+#ifndef PLAYERBOTS_HIREACTION_H
+#define PLAYERBOTS_HIREACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/ImbueAction.h b/src/Ai/Base/Actions/ImbueAction.h
index 398a8fa18..718f1c38f 100644
--- a/src/Ai/Base/Actions/ImbueAction.h
+++ b/src/Ai/Base/Actions/ImbueAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_IMBUEACTION_H
-#define _PLAYERBOT_IMBUEACTION_H
+#ifndef PLAYERBOTS_IMBUEACTION_H
+#define PLAYERBOTS_IMBUEACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/InventoryAction.h b/src/Ai/Base/Actions/InventoryAction.h
index 7ab0f59de..8eee37c1a 100644
--- a/src/Ai/Base/Actions/InventoryAction.h
+++ b/src/Ai/Base/Actions/InventoryAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_INVENTORYACTION_H
-#define _PLAYERBOT_INVENTORYACTION_H
+#ifndef PLAYERBOTS_INVENTORYACTION_H
+#define PLAYERBOTS_INVENTORYACTION_H
 
 #include "Action.h"
 #include "ItemVisitors.h"
diff --git a/src/Ai/Base/Actions/InventoryChangeFailureAction.h b/src/Ai/Base/Actions/InventoryChangeFailureAction.h
index 6877d0986..c14702587 100644
--- a/src/Ai/Base/Actions/InventoryChangeFailureAction.h
+++ b/src/Ai/Base/Actions/InventoryChangeFailureAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_INVENTORYCHANGEFAILUREACTION_H
-#define _PLAYERBOT_INVENTORYCHANGEFAILUREACTION_H
+#ifndef PLAYERBOTS_INVENTORYCHANGEFAILUREACTION_H
+#define PLAYERBOTS_INVENTORYCHANGEFAILUREACTION_H
 
 #include "Action.h"
 #include "Item.h"
diff --git a/src/Ai/Base/Actions/InviteToGroupAction.h b/src/Ai/Base/Actions/InviteToGroupAction.h
index 4b9f2c7f6..02162ef3f 100644
--- a/src/Ai/Base/Actions/InviteToGroupAction.h
+++ b/src/Ai/Base/Actions/InviteToGroupAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_INVITETOGROUPACTION_H
-#define _PLAYERBOT_INVITETOGROUPACTION_H
+#ifndef PLAYERBOTS_INVITETOGROUPACTION_H
+#define PLAYERBOTS_INVITETOGROUPACTION_H
 
 #include "Action.h"
 #include "Player.h"
diff --git a/src/Ai/Base/Actions/LeaveGroupAction.h b/src/Ai/Base/Actions/LeaveGroupAction.h
index 83baea3c1..b77b0e5e0 100644
--- a/src/Ai/Base/Actions/LeaveGroupAction.h
+++ b/src/Ai/Base/Actions/LeaveGroupAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LEAVEGROUPACTION_H
-#define _PLAYERBOT_LEAVEGROUPACTION_H
+#ifndef PLAYERBOTS_LEAVEGROUPACTION_H
+#define PLAYERBOTS_LEAVEGROUPACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/LfgActions.h b/src/Ai/Base/Actions/LfgActions.h
index 8622a42d7..963d83901 100644
--- a/src/Ai/Base/Actions/LfgActions.h
+++ b/src/Ai/Base/Actions/LfgActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LFGACTIONS_H
-#define _PLAYERBOT_LFGACTIONS_H
+#ifndef PLAYERBOTS_LFGACTIONS_H
+#define PLAYERBOTS_LFGACTIONS_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/ListQuestsActions.h b/src/Ai/Base/Actions/ListQuestsActions.h
index 2cf2d592a..a6f74a9e2 100644
--- a/src/Ai/Base/Actions/ListQuestsActions.h
+++ b/src/Ai/Base/Actions/ListQuestsActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LISTQUESTSACTIONS_H
-#define _PLAYERBOT_LISTQUESTSACTIONS_H
+#ifndef PLAYERBOTS_LISTQUESTSACTIONS_H
+#define PLAYERBOTS_LISTQUESTSACTIONS_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/ListSpellsAction.h b/src/Ai/Base/Actions/ListSpellsAction.h
index 9e674bf33..c269bb3b8 100644
--- a/src/Ai/Base/Actions/ListSpellsAction.h
+++ b/src/Ai/Base/Actions/ListSpellsAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LISTSPELLSACTION_H
-#define _PLAYERBOT_LISTSPELLSACTION_H
+#ifndef PLAYERBOTS_LISTSPELLSACTION_H
+#define PLAYERBOTS_LISTSPELLSACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/LogLevelAction.h b/src/Ai/Base/Actions/LogLevelAction.h
index 3aefaf970..5573288aa 100644
--- a/src/Ai/Base/Actions/LogLevelAction.h
+++ b/src/Ai/Base/Actions/LogLevelAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LOGLEVELACTION_H
-#define _PLAYERBOT_LOGLEVELACTION_H
+#ifndef PLAYERBOTS_LOGLEVELACTION_H
+#define PLAYERBOTS_LOGLEVELACTION_H
 
 #include "Action.h"
 #include "LogCommon.h"
diff --git a/src/Ai/Base/Actions/LootAction.h b/src/Ai/Base/Actions/LootAction.h
index b657ee8cb..db91efdf9 100644
--- a/src/Ai/Base/Actions/LootAction.h
+++ b/src/Ai/Base/Actions/LootAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LOOTACTION_H
-#define _PLAYERBOT_LOOTACTION_H
+#ifndef PLAYERBOTS_LOOTACTION_H
+#define PLAYERBOTS_LOOTACTION_H
 
 #include "InventoryAction.h"
 #include "MovementActions.h"
diff --git a/src/Ai/Base/Actions/LootRollAction.h b/src/Ai/Base/Actions/LootRollAction.h
index 63d2c4b9d..8c0193605 100644
--- a/src/Ai/Base/Actions/LootRollAction.h
+++ b/src/Ai/Base/Actions/LootRollAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LOOTROLLACTION_H
-#define _PLAYERBOT_LOOTROLLACTION_H
+#ifndef PLAYERBOTS_LOOTROLLACTION_H
+#define PLAYERBOTS_LOOTROLLACTION_H
 
 #include "QueryItemUsageAction.h"
 
diff --git a/src/Ai/Base/Actions/LootStrategyAction.h b/src/Ai/Base/Actions/LootStrategyAction.h
index a972066ad..b97dfc2ad 100644
--- a/src/Ai/Base/Actions/LootStrategyAction.h
+++ b/src/Ai/Base/Actions/LootStrategyAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LOOTSTRATEGYACTION_H
-#define _PLAYERBOT_LOOTSTRATEGYACTION_H
+#ifndef PLAYERBOTS_LOOTSTRATEGYACTION_H
+#define PLAYERBOTS_LOOTSTRATEGYACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/MailAction.h b/src/Ai/Base/Actions/MailAction.h
index e66d4147f..23578685f 100644
--- a/src/Ai/Base/Actions/MailAction.h
+++ b/src/Ai/Base/Actions/MailAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_MAILACTION_H
-#define _PLAYERBOT_MAILACTION_H
+#ifndef PLAYERBOTS_MAILACTION_H
+#define PLAYERBOTS_MAILACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/MoveToRpgTargetAction.h b/src/Ai/Base/Actions/MoveToRpgTargetAction.h
index 6dd6558bb..98c97faf2 100644
--- a/src/Ai/Base/Actions/MoveToRpgTargetAction.h
+++ b/src/Ai/Base/Actions/MoveToRpgTargetAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_MOVETORPGTARGETACTION_H
-#define _PLAYERBOT_MOVETORPGTARGETACTION_H
+#ifndef PLAYERBOTS_MOVETORPGTARGETACTION_H
+#define PLAYERBOTS_MOVETORPGTARGETACTION_H
 
 #include "MovementActions.h"
 
diff --git a/src/Ai/Base/Actions/MoveToTravelTargetAction.h b/src/Ai/Base/Actions/MoveToTravelTargetAction.h
index 3d8609cbb..f5246ab79 100644
--- a/src/Ai/Base/Actions/MoveToTravelTargetAction.h
+++ b/src/Ai/Base/Actions/MoveToTravelTargetAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_MOVETOTRAVELTARGETACTION_H
-#define _PLAYERBOT_MOVETOTRAVELTARGETACTION_H
+#ifndef PLAYERBOTS_MOVETOTRAVELTARGETACTION_H
+#define PLAYERBOTS_MOVETOTRAVELTARGETACTION_H
 
 #include "MovementActions.h"
 
diff --git a/src/Ai/Base/Actions/MovementActions.h b/src/Ai/Base/Actions/MovementActions.h
index b1c566211..7fb8b5166 100644
--- a/src/Ai/Base/Actions/MovementActions.h
+++ b/src/Ai/Base/Actions/MovementActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_MOVEMENTACTIONS_H
-#define _PLAYERBOT_MOVEMENTACTIONS_H
+#ifndef PLAYERBOTS_MOVEMENTACTIONS_H
+#define PLAYERBOTS_MOVEMENTACTIONS_H
 
 #include <cmath>
 
diff --git a/src/Ai/Base/Actions/NonCombatActions.h b/src/Ai/Base/Actions/NonCombatActions.h
index 3156d4992..b57226a5c 100644
--- a/src/Ai/Base/Actions/NonCombatActions.h
+++ b/src/Ai/Base/Actions/NonCombatActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_NONCOMBATACTIONS_H
-#define _PLAYERBOT_NONCOMBATACTIONS_H
+#ifndef PLAYERBOTS_NONCOMBATACTIONS_H
+#define PLAYERBOTS_NONCOMBATACTIONS_H
 
 #include "UseItemAction.h"
 
diff --git a/src/Ai/Base/Actions/OpenItemAction.h b/src/Ai/Base/Actions/OpenItemAction.h
index c221741b3..1b2a30766 100644
--- a/src/Ai/Base/Actions/OpenItemAction.h
+++ b/src/Ai/Base/Actions/OpenItemAction.h
@@ -3,8 +3,8 @@
  * you may redistribute it and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_OPENITEMACTION_H
-#define _PLAYERBOT_OPENITEMACTION_H
+#ifndef PLAYERBOTS_OPENITEMACTION_H
+#define PLAYERBOTS_OPENITEMACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/OutfitAction.h b/src/Ai/Base/Actions/OutfitAction.h
index b530504c8..809f11752 100644
--- a/src/Ai/Base/Actions/OutfitAction.h
+++ b/src/Ai/Base/Actions/OutfitAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_OUTFITACTION_H
-#define _PLAYERBOT_OUTFITACTION_H
+#ifndef PLAYERBOTS_OUTFITACTION_H
+#define PLAYERBOTS_OUTFITACTION_H
 
 #include "ChatHelper.h"
 #include "EquipAction.h"
diff --git a/src/Ai/Base/Actions/PassLeadershipToMasterAction.h b/src/Ai/Base/Actions/PassLeadershipToMasterAction.h
index afa5663bc..a686c0a69 100644
--- a/src/Ai/Base/Actions/PassLeadershipToMasterAction.h
+++ b/src/Ai/Base/Actions/PassLeadershipToMasterAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PASSLEADERSHIPTOMASTERACTION_H
-#define _PLAYERBOT_PASSLEADERSHIPTOMASTERACTION_H
+#ifndef PLAYERBOTS_PASSLEADERSHIPTOMASTERACTION_H
+#define PLAYERBOTS_PASSLEADERSHIPTOMASTERACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/PetitionSignAction.h b/src/Ai/Base/Actions/PetitionSignAction.h
index 9eb8b3131..d24a32afa 100644
--- a/src/Ai/Base/Actions/PetitionSignAction.h
+++ b/src/Ai/Base/Actions/PetitionSignAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PETITIONSIGNACTION_H
-#define _PLAYERBOT_PETITIONSIGNACTION_H
+#ifndef PLAYERBOTS_PETITIONSIGNACTION_H
+#define PLAYERBOTS_PETITIONSIGNACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/PetsAction.h b/src/Ai/Base/Actions/PetsAction.h
index eaccdcb1a..89750651c 100644
--- a/src/Ai/Base/Actions/PetsAction.h
+++ b/src/Ai/Base/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_PETSACTION_H
-#define _PLAYERBOT_PETSACTION_H
+#ifndef PLAYERBOTS_PETSACTION_H
+#define PLAYERBOTS_PETSACTION_H
 
 #include <string>
 
diff --git a/src/Ai/Base/Actions/PositionAction.h b/src/Ai/Base/Actions/PositionAction.h
index 7e8173924..a9e4afbcf 100644
--- a/src/Ai/Base/Actions/PositionAction.h
+++ b/src/Ai/Base/Actions/PositionAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_POSITIONACTION_H
-#define _PLAYERBOT_POSITIONACTION_H
+#ifndef PLAYERBOTS_POSITIONACTION_H
+#define PLAYERBOTS_POSITIONACTION_H
 
 #include "MovementActions.h"
 
diff --git a/src/Ai/Base/Actions/PullActions.h b/src/Ai/Base/Actions/PullActions.h
index 299dd4a1e..ce2cbb8b8 100644
--- a/src/Ai/Base/Actions/PullActions.h
+++ b/src/Ai/Base/Actions/PullActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PULLACTIONS_H
-#define _PLAYERBOT_PULLACTIONS_H
+#ifndef PLAYERBOTS_PULLACTIONS_H
+#define PLAYERBOTS_PULLACTIONS_H
 
 #include "GenericSpellActions.h"
 #include "ReachTargetActions.h"
diff --git a/src/Ai/Base/Actions/QueryItemUsageAction.h b/src/Ai/Base/Actions/QueryItemUsageAction.h
index f2f8bc2ce..12c56bbfe 100644
--- a/src/Ai/Base/Actions/QueryItemUsageAction.h
+++ b/src/Ai/Base/Actions/QueryItemUsageAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_QUERYITEMUSAGEACTION_H
-#define _PLAYERBOT_QUERYITEMUSAGEACTION_H
+#ifndef PLAYERBOTS_QUERYITEMUSAGEACTION_H
+#define PLAYERBOTS_QUERYITEMUSAGEACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/QueryQuestAction.h b/src/Ai/Base/Actions/QueryQuestAction.h
index 308850901..5776f790c 100644
--- a/src/Ai/Base/Actions/QueryQuestAction.h
+++ b/src/Ai/Base/Actions/QueryQuestAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_QUERYQUESTACTION_H
-#define _PLAYERBOT_QUERYQUESTACTION_H
+#ifndef PLAYERBOTS_QUERYQUESTACTION_H
+#define PLAYERBOTS_QUERYQUESTACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/QuestAction.h b/src/Ai/Base/Actions/QuestAction.h
index c19faf9ec..ed36ffa09 100644
--- a/src/Ai/Base/Actions/QuestAction.h
+++ b/src/Ai/Base/Actions/QuestAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_QUESTACTION_H
-#define _PLAYERBOT_QUESTACTION_H
+#ifndef PLAYERBOTS_QUESTACTION_H
+#define PLAYERBOTS_QUESTACTION_H
 
 #include "Action.h"
 #include "Object.h"
diff --git a/src/Ai/Base/Actions/QuestConfirmAcceptAction.h b/src/Ai/Base/Actions/QuestConfirmAcceptAction.h
index 1f13a0abf..0e34839ce 100644
--- a/src/Ai/Base/Actions/QuestConfirmAcceptAction.h
+++ b/src/Ai/Base/Actions/QuestConfirmAcceptAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_QUESTCONFIRMACCEPTACTION_H
-#define _PLAYERBOT_QUESTCONFIRMACCEPTACTION_H
+#ifndef PLAYERBOTS_QUESTCONFIRMACCEPTACTION_H
+#define PLAYERBOTS_QUESTCONFIRMACCEPTACTION_H
 
 #include "AiObjectContext.h"
 #include "Player.h"
diff --git a/src/Ai/Base/Actions/RandomBotUpdateAction.h b/src/Ai/Base/Actions/RandomBotUpdateAction.h
index b5d940ad8..3653bf915 100644
--- a/src/Ai/Base/Actions/RandomBotUpdateAction.h
+++ b/src/Ai/Base/Actions/RandomBotUpdateAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RANDOMBOTUPDATEACTION_H
-#define _PLAYERBOT_RANDOMBOTUPDATEACTION_H
+#ifndef PLAYERBOTS_RANDOMBOTUPDATEACTION_H
+#define PLAYERBOTS_RANDOMBOTUPDATEACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/RangeAction.h b/src/Ai/Base/Actions/RangeAction.h
index 828fcc978..872723e30 100644
--- a/src/Ai/Base/Actions/RangeAction.h
+++ b/src/Ai/Base/Actions/RangeAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RANGEACTION_H
-#define _PLAYERBOT_RANGEACTION_H
+#ifndef PLAYERBOTS_RANGEACTION_H
+#define PLAYERBOTS_RANGEACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/ReachTargetActions.h b/src/Ai/Base/Actions/ReachTargetActions.h
index 1a8ce0c9c..47e3d76ef 100644
--- a/src/Ai/Base/Actions/ReachTargetActions.h
+++ b/src/Ai/Base/Actions/ReachTargetActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_REACHTARGETACTIONS_H
-#define _PLAYERBOT_REACHTARGETACTIONS_H
+#ifndef PLAYERBOTS_REACHTARGETACTIONS_H
+#define PLAYERBOTS_REACHTARGETACTIONS_H
 
 #include "GenericSpellActions.h"
 #include "MovementActions.h"
diff --git a/src/Ai/Base/Actions/ReadyCheckAction.h b/src/Ai/Base/Actions/ReadyCheckAction.h
index 0c16c489b..396fca4b9 100644
--- a/src/Ai/Base/Actions/ReadyCheckAction.h
+++ b/src/Ai/Base/Actions/ReadyCheckAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_READYCHECKACTION_H
-#define _PLAYERBOT_READYCHECKACTION_H
+#ifndef PLAYERBOTS_READYCHECKACTION_H
+#define PLAYERBOTS_READYCHECKACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/ReleaseSpiritAction.h b/src/Ai/Base/Actions/ReleaseSpiritAction.h
index af5be1da8..5aab90333 100644
--- a/src/Ai/Base/Actions/ReleaseSpiritAction.h
+++ b/src/Ai/Base/Actions/ReleaseSpiritAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef PLAYERBOT_RELEASESPIRITACTION_H
-#define PLAYERBOT_RELEASESPIRITACTION_H
+#ifndef PLAYERBOTS_RELEASESPIRITACTION_H
+#define PLAYERBOTS_RELEASESPIRITACTION_H
 
 #include "Action.h"
 #include "ReviveFromCorpseAction.h"
diff --git a/src/Ai/Base/Actions/RememberTaxiAction.h b/src/Ai/Base/Actions/RememberTaxiAction.h
index e2de4b440..efdaee41f 100644
--- a/src/Ai/Base/Actions/RememberTaxiAction.h
+++ b/src/Ai/Base/Actions/RememberTaxiAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_REMEMBERTAXIACTION_H
-#define _PLAYERBOT_REMEMBERTAXIACTION_H
+#ifndef PLAYERBOTS_REMEMBERTAXIACTION_H
+#define PLAYERBOTS_REMEMBERTAXIACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/RemoveAuraAction.h b/src/Ai/Base/Actions/RemoveAuraAction.h
index 14f4073cd..8226ffd2e 100644
--- a/src/Ai/Base/Actions/RemoveAuraAction.h
+++ b/src/Ai/Base/Actions/RemoveAuraAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_REMOVEAURAACTION_H
-#define _PLAYERBOT_REMOVEAURAACTION_H
+#ifndef PLAYERBOTS_REMOVEAURAACTION_H
+#define PLAYERBOTS_REMOVEAURAACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/RepairAllAction.h b/src/Ai/Base/Actions/RepairAllAction.h
index aec1af961..aaa047789 100644
--- a/src/Ai/Base/Actions/RepairAllAction.h
+++ b/src/Ai/Base/Actions/RepairAllAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_REPAIRALLACTION_H
-#define _PLAYERBOT_REPAIRALLACTION_H
+#ifndef PLAYERBOTS_REPAIRALLACTION_H
+#define PLAYERBOTS_REPAIRALLACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/ResetAiAction.h b/src/Ai/Base/Actions/ResetAiAction.h
index 092a03137..862b65e20 100644
--- a/src/Ai/Base/Actions/ResetAiAction.h
+++ b/src/Ai/Base/Actions/ResetAiAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RESETAIACTION_H
-#define _PLAYERBOT_RESETAIACTION_H
+#ifndef PLAYERBOTS_RESETAIACTION_H
+#define PLAYERBOTS_RESETAIACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/ResetInstancesAction.h b/src/Ai/Base/Actions/ResetInstancesAction.h
index b69256bc1..951d271ab 100644
--- a/src/Ai/Base/Actions/ResetInstancesAction.h
+++ b/src/Ai/Base/Actions/ResetInstancesAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RESETINSTANCESACTION_H
-#define _PLAYERBOT_RESETINSTANCESACTION_H
+#ifndef PLAYERBOTS_RESETINSTANCESACTION_H
+#define PLAYERBOTS_RESETINSTANCESACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/RevealGatheringItemAction.h b/src/Ai/Base/Actions/RevealGatheringItemAction.h
index cd0422476..519ff903a 100644
--- a/src/Ai/Base/Actions/RevealGatheringItemAction.h
+++ b/src/Ai/Base/Actions/RevealGatheringItemAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_REVEALGATHERINGITEMACTION_H
-#define _PLAYERBOT_REVEALGATHERINGITEMACTION_H
+#ifndef PLAYERBOTS_REVEALGATHERINGITEMACTION_H
+#define PLAYERBOTS_REVEALGATHERINGITEMACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/ReviveFromCorpseAction.h b/src/Ai/Base/Actions/ReviveFromCorpseAction.h
index a20dd3c07..53da9cf82 100644
--- a/src/Ai/Base/Actions/ReviveFromCorpseAction.h
+++ b/src/Ai/Base/Actions/ReviveFromCorpseAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_REVIVEFROMCORPSEACTION_H
-#define _PLAYERBOT_REVIVEFROMCORPSEACTION_H
+#ifndef PLAYERBOTS_REVIVEFROMCORPSEACTION_H
+#define PLAYERBOTS_REVIVEFROMCORPSEACTION_H
 
 #include "MovementActions.h"
 
diff --git a/src/Ai/Base/Actions/RewardAction.h b/src/Ai/Base/Actions/RewardAction.h
index 328777a94..31602fa8c 100644
--- a/src/Ai/Base/Actions/RewardAction.h
+++ b/src/Ai/Base/Actions/RewardAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_REWARDACTION_H
-#define _PLAYERBOT_REWARDACTION_H
+#ifndef PLAYERBOTS_REWARDACTION_H
+#define PLAYERBOTS_REWARDACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/RtiAction.h b/src/Ai/Base/Actions/RtiAction.h
index 18b0aa44d..6d915b1d5 100644
--- a/src/Ai/Base/Actions/RtiAction.h
+++ b/src/Ai/Base/Actions/RtiAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RTIACTION_H
-#define _PLAYERBOT_RTIACTION_H
+#ifndef PLAYERBOTS_RTIACTION_H
+#define PLAYERBOTS_RTIACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/RtscAction.h b/src/Ai/Base/Actions/RtscAction.h
index 81ec27c03..81085b9f8 100644
--- a/src/Ai/Base/Actions/RtscAction.h
+++ b/src/Ai/Base/Actions/RtscAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RTSCACTION_H
-#define _PLAYERBOT_RTSCACTION_H
+#ifndef PLAYERBOTS_RTSCACTION_H
+#define PLAYERBOTS_RTSCACTION_H
 
 #include "SeeSpellAction.h"
 
diff --git a/src/Ai/Base/Actions/SaveManaAction.h b/src/Ai/Base/Actions/SaveManaAction.h
index 09edec989..ea60c7c03 100644
--- a/src/Ai/Base/Actions/SaveManaAction.h
+++ b/src/Ai/Base/Actions/SaveManaAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SAVEMANAACTION_H
-#define _PLAYERBOT_SAVEMANAACTION_H
+#ifndef PLAYERBOTS_SAVEMANAACTION_H
+#define PLAYERBOTS_SAVEMANAACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/SayAction.h b/src/Ai/Base/Actions/SayAction.h
index cae5ee444..df6061055 100644
--- a/src/Ai/Base/Actions/SayAction.h
+++ b/src/Ai/Base/Actions/SayAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SAYACTION_H
-#define _PLAYERBOT_SAYACTION_H
+#ifndef PLAYERBOTS_SAYACTION_H
+#define PLAYERBOTS_SAYACTION_H
 
 #include "Action.h"
 #include "PlayerbotAI.h"
diff --git a/src/Ai/Base/Actions/SecurityCheckAction.h b/src/Ai/Base/Actions/SecurityCheckAction.h
index 21f343ccb..9f646feb3 100644
--- a/src/Ai/Base/Actions/SecurityCheckAction.h
+++ b/src/Ai/Base/Actions/SecurityCheckAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SECURITYCHECKACTION_H
-#define _PLAYERBOT_SECURITYCHECKACTION_H
+#ifndef PLAYERBOTS_SECURITYCHECKACTION_H
+#define PLAYERBOTS_SECURITYCHECKACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/SeeSpellAction.h b/src/Ai/Base/Actions/SeeSpellAction.h
index 91556d635..6f68ee479 100644
--- a/src/Ai/Base/Actions/SeeSpellAction.h
+++ b/src/Ai/Base/Actions/SeeSpellAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SEESPELLACTION_H
-#define _PLAYERBOT_SEESPELLACTION_H
+#ifndef PLAYERBOTS_SEESPELLACTION_H
+#define PLAYERBOTS_SEESPELLACTION_H
 
 #include "MovementActions.h"
 
diff --git a/src/Ai/Base/Actions/SellAction.h b/src/Ai/Base/Actions/SellAction.h
index 7c985de9d..dab6b48b0 100644
--- a/src/Ai/Base/Actions/SellAction.h
+++ b/src/Ai/Base/Actions/SellAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SELLACTION_H
-#define _PLAYERBOT_SELLACTION_H
+#ifndef PLAYERBOTS_SELLACTION_H
+#define PLAYERBOTS_SELLACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/SendMailAction.h b/src/Ai/Base/Actions/SendMailAction.h
index 06affa6bd..f8e270523 100644
--- a/src/Ai/Base/Actions/SendMailAction.h
+++ b/src/Ai/Base/Actions/SendMailAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SENDMAILACTION_H
-#define _PLAYERBOT_SENDMAILACTION_H
+#ifndef PLAYERBOTS_SENDMAILACTION_H
+#define PLAYERBOTS_SENDMAILACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/SetCraftAction.h b/src/Ai/Base/Actions/SetCraftAction.h
index d10507da9..8bd0d4c24 100644
--- a/src/Ai/Base/Actions/SetCraftAction.h
+++ b/src/Ai/Base/Actions/SetCraftAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SETCRAFTACTION_H
-#define _PLAYERBOT_SETCRAFTACTION_H
+#ifndef PLAYERBOTS_SETCRAFTACTION_H
+#define PLAYERBOTS_SETCRAFTACTION_H
 
 #include "Action.h"
 #include "CraftValue.h"
diff --git a/src/Ai/Base/Actions/SetFocusHealTargetsAction.h b/src/Ai/Base/Actions/SetFocusHealTargetsAction.h
index 92d5c0b19..8f4289f66 100644
--- a/src/Ai/Base/Actions/SetFocusHealTargetsAction.h
+++ b/src/Ai/Base/Actions/SetFocusHealTargetsAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SETFOCUSHEALTARGETSACTION_H
-#define _PLAYERBOT_SETFOCUSHEALTARGETSACTION_H
+#ifndef PLAYERBOTS_SETFOCUSHEALTARGETSACTION_H
+#define PLAYERBOTS_SETFOCUSHEALTARGETSACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/SetHomeAction.h b/src/Ai/Base/Actions/SetHomeAction.h
index ee499bf8a..5f7b2a5d7 100644
--- a/src/Ai/Base/Actions/SetHomeAction.h
+++ b/src/Ai/Base/Actions/SetHomeAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SETHOMEACTION_H
-#define _PLAYERBOT_SETHOMEACTION_H
+#ifndef PLAYERBOTS_SETHOMEACTION_H
+#define PLAYERBOTS_SETHOMEACTION_H
 
 #include "MovementActions.h"
 
diff --git a/src/Ai/Base/Actions/ShareQuestAction.h b/src/Ai/Base/Actions/ShareQuestAction.h
index 033ed606b..d44ba87c2 100644
--- a/src/Ai/Base/Actions/ShareQuestAction.h
+++ b/src/Ai/Base/Actions/ShareQuestAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SHAREQUESTACTION_H
-#define _PLAYERBOT_SHAREQUESTACTION_H
+#ifndef PLAYERBOTS_SHAREQUESTACTION_H
+#define PLAYERBOTS_SHAREQUESTACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/SkipSpellsListAction.h b/src/Ai/Base/Actions/SkipSpellsListAction.h
index 578be9a9c..84735bf8d 100644
--- a/src/Ai/Base/Actions/SkipSpellsListAction.h
+++ b/src/Ai/Base/Actions/SkipSpellsListAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SKIPSPELLSLISTACTION_H
-#define _PLAYERBOT_SKIPSPELLSLISTACTION_H
+#ifndef PLAYERBOTS_SKIPSPELLSLISTACTION_H
+#define PLAYERBOTS_SKIPSPELLSLISTACTION_H
 
 #include "Action.h"
 #include "ChatHelper.h"
diff --git a/src/Ai/Base/Actions/StatsAction.h b/src/Ai/Base/Actions/StatsAction.h
index 0dbaf38b8..8aab161ba 100644
--- a/src/Ai/Base/Actions/StatsAction.h
+++ b/src/Ai/Base/Actions/StatsAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_STATSACTION_H
-#define _PLAYERBOT_STATSACTION_H
+#ifndef PLAYERBOTS_STATSACTION_H
+#define PLAYERBOTS_STATSACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/StayActions.h b/src/Ai/Base/Actions/StayActions.h
index d050b9661..abd314d4b 100644
--- a/src/Ai/Base/Actions/StayActions.h
+++ b/src/Ai/Base/Actions/StayActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_STAYACTIONS_H
-#define _PLAYERBOT_STAYACTIONS_H
+#ifndef PLAYERBOTS_STAYACTIONS_H
+#define PLAYERBOTS_STAYACTIONS_H
 
 #include "MovementActions.h"
 
diff --git a/src/Ai/Base/Actions/SuggestWhatToDoAction.h b/src/Ai/Base/Actions/SuggestWhatToDoAction.h
index 238ce7e89..97afd1a4e 100644
--- a/src/Ai/Base/Actions/SuggestWhatToDoAction.h
+++ b/src/Ai/Base/Actions/SuggestWhatToDoAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SUGGESTWHATTODOACTION_H
-#define _PLAYERBOT_SUGGESTWHATTODOACTION_H
+#ifndef PLAYERBOTS_SUGGESTWHATTODOACTION_H
+#define PLAYERBOTS_SUGGESTWHATTODOACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/TalkToQuestGiverAction.h b/src/Ai/Base/Actions/TalkToQuestGiverAction.h
index edde3272b..97f1a8a52 100644
--- a/src/Ai/Base/Actions/TalkToQuestGiverAction.h
+++ b/src/Ai/Base/Actions/TalkToQuestGiverAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TALKTOQUESTGIVERACTION_H
-#define _PLAYERBOT_TALKTOQUESTGIVERACTION_H
+#ifndef PLAYERBOTS_TALKTOQUESTGIVERACTION_H
+#define PLAYERBOTS_TALKTOQUESTGIVERACTION_H
 
 #include "QuestAction.h"
 
diff --git a/src/Ai/Base/Actions/TameAction.h b/src/Ai/Base/Actions/TameAction.h
index 234eaec2a..dae6aff04 100644
--- a/src/Ai/Base/Actions/TameAction.h
+++ b/src/Ai/Base/Actions/TameAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TAMEACTION_H
-#define _PLAYERBOT_TAMEACTION_H
+#ifndef PLAYERBOTS_TAMEACTION_H
+#define PLAYERBOTS_TAMEACTION_H
 
 #include <string>
 #include "Action.h"
diff --git a/src/Ai/Base/Actions/TaxiAction.h b/src/Ai/Base/Actions/TaxiAction.h
index 97cbda6f5..c58f37a3b 100644
--- a/src/Ai/Base/Actions/TaxiAction.h
+++ b/src/Ai/Base/Actions/TaxiAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TAXIACTION_H
-#define _PLAYERBOT_TAXIACTION_H
+#ifndef PLAYERBOTS_TAXIACTION_H
+#define PLAYERBOTS_TAXIACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/TeleportAction.h b/src/Ai/Base/Actions/TeleportAction.h
index 46e316f8e..06f361430 100644
--- a/src/Ai/Base/Actions/TeleportAction.h
+++ b/src/Ai/Base/Actions/TeleportAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TELEPORTACTION_H
-#define _PLAYERBOT_TELEPORTACTION_H
+#ifndef PLAYERBOTS_TELEPORTACTION_H
+#define PLAYERBOTS_TELEPORTACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/TellCastFailedAction.h b/src/Ai/Base/Actions/TellCastFailedAction.h
index 5eec7a43a..c79f1871a 100644
--- a/src/Ai/Base/Actions/TellCastFailedAction.h
+++ b/src/Ai/Base/Actions/TellCastFailedAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TELLCASTFAILEDACTION_H
-#define _PLAYERBOT_TELLCASTFAILEDACTION_H
+#ifndef PLAYERBOTS_TELLCASTFAILEDACTION_H
+#define PLAYERBOTS_TELLCASTFAILEDACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/TellEmblemsAction.h b/src/Ai/Base/Actions/TellEmblemsAction.h
index 570fb2d04..4ddbeaeaf 100644
--- a/src/Ai/Base/Actions/TellEmblemsAction.h
+++ b/src/Ai/Base/Actions/TellEmblemsAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TELLEMBLEMSACTION_H
-#define _PLAYERBOT_TELLEMBLEMSACTION_H
+#ifndef PLAYERBOTS_TELLEMBLEMSACTION_H
+#define PLAYERBOTS_TELLEMBLEMSACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/TellGlyphsAction.h b/src/Ai/Base/Actions/TellGlyphsAction.h
index 77bb5b1ca..d6a414d7e 100644
--- a/src/Ai/Base/Actions/TellGlyphsAction.h
+++ b/src/Ai/Base/Actions/TellGlyphsAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TELLGLYPHSACTION_H
-#define _PLAYERBOT_TELLGLYPHSACTION_H
+#ifndef PLAYERBOTS_TELLGLYPHSACTION_H
+#define PLAYERBOTS_TELLGLYPHSACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/TellItemCountAction.h b/src/Ai/Base/Actions/TellItemCountAction.h
index 3bc4cf79d..c5351f7c0 100644
--- a/src/Ai/Base/Actions/TellItemCountAction.h
+++ b/src/Ai/Base/Actions/TellItemCountAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TELLITEMCOUNTACTION_H
-#define _PLAYERBOT_TELLITEMCOUNTACTION_H
+#ifndef PLAYERBOTS_TELLITEMCOUNTACTION_H
+#define PLAYERBOTS_TELLITEMCOUNTACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/TellLosAction.h b/src/Ai/Base/Actions/TellLosAction.h
index d4ae928e6..34ed2b4b5 100644
--- a/src/Ai/Base/Actions/TellLosAction.h
+++ b/src/Ai/Base/Actions/TellLosAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TELLLOSACTION_H
-#define _PLAYERBOT_TELLLOSACTION_H
+#ifndef PLAYERBOTS_TELLLOSACTION_H
+#define PLAYERBOTS_TELLLOSACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/TellMasterAction.h b/src/Ai/Base/Actions/TellMasterAction.h
index 5a8821206..19a6e0360 100644
--- a/src/Ai/Base/Actions/TellMasterAction.h
+++ b/src/Ai/Base/Actions/TellMasterAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TELLMASTERACTION_H
-#define _PLAYERBOT_TELLMASTERACTION_H
+#ifndef PLAYERBOTS_TELLMASTERACTION_H
+#define PLAYERBOTS_TELLMASTERACTION_H
 
 #include "MovementActions.h"
 
diff --git a/src/Ai/Base/Actions/TellPvpStatsAction.h b/src/Ai/Base/Actions/TellPvpStatsAction.h
index 025cbd0d8..0b3464c50 100644
--- a/src/Ai/Base/Actions/TellPvpStatsAction.h
+++ b/src/Ai/Base/Actions/TellPvpStatsAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TELLPVPSTATSACTION_H
-#define _PLAYERBOT_TELLPVPSTATSACTION_H
+#ifndef PLAYERBOTS_TELLPVPSTATSACTION_H
+#define PLAYERBOTS_TELLPVPSTATSACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/TellReputationAction.h b/src/Ai/Base/Actions/TellReputationAction.h
index d97d0d177..c1ad717e7 100644
--- a/src/Ai/Base/Actions/TellReputationAction.h
+++ b/src/Ai/Base/Actions/TellReputationAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TELLREPUTATIONACTION_H
-#define _PLAYERBOT_TELLREPUTATIONACTION_H
+#ifndef PLAYERBOTS_TELLREPUTATIONACTION_H
+#define PLAYERBOTS_TELLREPUTATIONACTION_H
 
 #include <string>
 
diff --git a/src/Ai/Base/Actions/TellTargetAction.h b/src/Ai/Base/Actions/TellTargetAction.h
index 440e42f21..ea7403850 100644
--- a/src/Ai/Base/Actions/TellTargetAction.h
+++ b/src/Ai/Base/Actions/TellTargetAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TELLTARGETACTION_H
-#define _PLAYERBOT_TELLTARGETACTION_H
+#ifndef PLAYERBOTS_TELLTARGETACTION_H
+#define PLAYERBOTS_TELLTARGETACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/TradeAction.h b/src/Ai/Base/Actions/TradeAction.h
index 4b81d24dd..3d448cd11 100644
--- a/src/Ai/Base/Actions/TradeAction.h
+++ b/src/Ai/Base/Actions/TradeAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TRADEACTION_H
-#define _PLAYERBOT_TRADEACTION_H
+#ifndef PLAYERBOTS_TRADEACTION_H
+#define PLAYERBOTS_TRADEACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/TradeStatusAction.h b/src/Ai/Base/Actions/TradeStatusAction.h
index 4313b18d0..af4818953 100644
--- a/src/Ai/Base/Actions/TradeStatusAction.h
+++ b/src/Ai/Base/Actions/TradeStatusAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TRADESTATUSACTION_H
-#define _PLAYERBOT_TRADESTATUSACTION_H
+#ifndef PLAYERBOTS_TRADESTATUSACTION_H
+#define PLAYERBOTS_TRADESTATUSACTION_H
 
 #include "QueryItemUsageAction.h"
 
diff --git a/src/Ai/Base/Actions/TradeStatusExtendedAction.h b/src/Ai/Base/Actions/TradeStatusExtendedAction.h
index 8797d8dc8..5fbff28d5 100644
--- a/src/Ai/Base/Actions/TradeStatusExtendedAction.h
+++ b/src/Ai/Base/Actions/TradeStatusExtendedAction.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_TRADESTATUSEXTENDEDACTION_H
-#define _PLAYERBOT_TRADESTATUSEXTENDEDACTION_H
+#ifndef PLAYERBOTS_TRADESTATUSEXTENDEDACTION_H
+#define PLAYERBOTS_TRADESTATUSEXTENDEDACTION_H
 
 #include "QueryItemUsageAction.h"
 
diff --git a/src/Ai/Base/Actions/TradeValues.h b/src/Ai/Base/Actions/TradeValues.h
index 3f7d3e530..44a864051 100644
--- a/src/Ai/Base/Actions/TradeValues.h
+++ b/src/Ai/Base/Actions/TradeValues.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TRADEVALUES_H
-#define _PLAYERBOT_TRADEVALUES_H
+#ifndef PLAYERBOTS_TRADEVALUES_H
+#define PLAYERBOTS_TRADEVALUES_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Actions/TrainerAction.h b/src/Ai/Base/Actions/TrainerAction.h
index 733bed529..96a063f46 100644
--- a/src/Ai/Base/Actions/TrainerAction.h
+++ b/src/Ai/Base/Actions/TrainerAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TRAINERACTION_H
-#define _PLAYERBOT_TRAINERACTION_H
+#ifndef PLAYERBOTS_TRAINERACTION_H
+#define PLAYERBOTS_TRAINERACTION_H
 
 #include "Action.h"
 #include "ChatHelper.h"
diff --git a/src/Ai/Base/Actions/TravelAction.h b/src/Ai/Base/Actions/TravelAction.h
index d84b0c243..04af6662c 100644
--- a/src/Ai/Base/Actions/TravelAction.h
+++ b/src/Ai/Base/Actions/TravelAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TRAVELACTION_H
-#define _PLAYERBOT_TRAVELACTION_H
+#ifndef PLAYERBOTS_TRAVELACTION_H
+#define PLAYERBOTS_TRAVELACTION_H
 
 #include "MovementActions.h"
 
diff --git a/src/Ai/Base/Actions/UnequipAction.h b/src/Ai/Base/Actions/UnequipAction.h
index 56004bebe..d2259f4a8 100644
--- a/src/Ai/Base/Actions/UnequipAction.h
+++ b/src/Ai/Base/Actions/UnequipAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_UNEQUIPACTION_H
-#define _PLAYERBOT_UNEQUIPACTION_H
+#ifndef PLAYERBOTS_UNEQUIPACTION_H
+#define PLAYERBOTS_UNEQUIPACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/UnlockItemAction.h b/src/Ai/Base/Actions/UnlockItemAction.h
index a4738da7c..6d7a8f94e 100644
--- a/src/Ai/Base/Actions/UnlockItemAction.h
+++ b/src/Ai/Base/Actions/UnlockItemAction.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_UNLOCKITEMACTION_H
-#define _PLAYERBOT_UNLOCKITEMACTION_H
+#ifndef PLAYERBOTS_UNLOCKITEMACTION_H
+#define PLAYERBOTS_UNLOCKITEMACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/UnlockTradedItemAction.h b/src/Ai/Base/Actions/UnlockTradedItemAction.h
index 6349ab56b..893665e88 100644
--- a/src/Ai/Base/Actions/UnlockTradedItemAction.h
+++ b/src/Ai/Base/Actions/UnlockTradedItemAction.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_UNLOCKTRADEDITEMACTION_H
-#define _PLAYERBOT_UNLOCKTRADEDITEMACTION_H
+#ifndef PLAYERBOTS_UNLOCKTRADEDITEMACTION_H
+#define PLAYERBOTS_UNLOCKTRADEDITEMACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/UseItemAction.h b/src/Ai/Base/Actions/UseItemAction.h
index 263bc29dc..9e6f23987 100644
--- a/src/Ai/Base/Actions/UseItemAction.h
+++ b/src/Ai/Base/Actions/UseItemAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_USEITEMACTION_H
-#define _PLAYERBOT_USEITEMACTION_H
+#ifndef PLAYERBOTS_USEITEMACTION_H
+#define PLAYERBOTS_USEITEMACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/UseMeetingStoneAction.h b/src/Ai/Base/Actions/UseMeetingStoneAction.h
index fd2a2c5f2..4b953c8be 100644
--- a/src/Ai/Base/Actions/UseMeetingStoneAction.h
+++ b/src/Ai/Base/Actions/UseMeetingStoneAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_USEMEETINGSTONEACTION_H
-#define _PLAYERBOT_USEMEETINGSTONEACTION_H
+#ifndef PLAYERBOTS_USEMEETINGSTONEACTION_H
+#define PLAYERBOTS_USEMEETINGSTONEACTION_H
 
 #include "MovementActions.h"
 
diff --git a/src/Ai/Base/Actions/VehicleActions.h b/src/Ai/Base/Actions/VehicleActions.h
index 1a0e0a300..d55a421ad 100644
--- a/src/Ai/Base/Actions/VehicleActions.h
+++ b/src/Ai/Base/Actions/VehicleActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_VEHICLEACTIONS_H
-#define _PLAYERBOT_VEHICLEACTIONS_H
+#ifndef PLAYERBOTS_VEHICLEACTIONS_H
+#define PLAYERBOTS_VEHICLEACTIONS_H
 
 #include "Event.h"
 #include "MovementActions.h"
diff --git a/src/Ai/Base/Actions/WaitForAttackAction.h b/src/Ai/Base/Actions/WaitForAttackAction.h
index ab12b3908..c95efedb5 100644
--- a/src/Ai/Base/Actions/WaitForAttackAction.h
+++ b/src/Ai/Base/Actions/WaitForAttackAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WAITFORATTACKACTION_H
-#define _PLAYERBOT_WAITFORATTACKACTION_H
+#ifndef PLAYERBOTS_WAITFORATTACKACTION_H
+#define PLAYERBOTS_WAITFORATTACKACTION_H
 
 #include "MovementActions.h"
 
diff --git a/src/Ai/Base/Actions/WhoAction.h b/src/Ai/Base/Actions/WhoAction.h
index d3ba1756d..2098c5e43 100644
--- a/src/Ai/Base/Actions/WhoAction.h
+++ b/src/Ai/Base/Actions/WhoAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WHOACTION_H
-#define _PLAYERBOT_WHOACTION_H
+#ifndef PLAYERBOTS_WHOACTION_H
+#define PLAYERBOTS_WHOACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/WipeAction.h b/src/Ai/Base/Actions/WipeAction.h
index 868119087..6dbfd439b 100644
--- a/src/Ai/Base/Actions/WipeAction.h
+++ b/src/Ai/Base/Actions/WipeAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WIPEACTION_H
-#define _PLAYERBOT_WIPEACTION_H
+#ifndef PLAYERBOTS_WIPEACTION_H
+#define PLAYERBOTS_WIPEACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/WorldBuffAction.h b/src/Ai/Base/Actions/WorldBuffAction.h
index e1330e949..bfe9a2c62 100644
--- a/src/Ai/Base/Actions/WorldBuffAction.h
+++ b/src/Ai/Base/Actions/WorldBuffAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WORLDBUFFACTION_H
-#define _PLAYERBOT_WORLDBUFFACTION_H
+#ifndef PLAYERBOTS_WORLDBUFFACTION_H
+#define PLAYERBOTS_WORLDBUFFACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/Actions/WtsAction.h b/src/Ai/Base/Actions/WtsAction.h
index 22da503f8..297a4f3e2 100644
--- a/src/Ai/Base/Actions/WtsAction.h
+++ b/src/Ai/Base/Actions/WtsAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WTSACTION_H
-#define _PLAYERBOT_WTSACTION_H
+#ifndef PLAYERBOTS_WTSACTION_H
+#define PLAYERBOTS_WTSACTION_H
 
 #include "InventoryAction.h"
 
diff --git a/src/Ai/Base/Actions/XpGainAction.h b/src/Ai/Base/Actions/XpGainAction.h
index d5935a9fd..c103dc429 100644
--- a/src/Ai/Base/Actions/XpGainAction.h
+++ b/src/Ai/Base/Actions/XpGainAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_XPGAINACTION_H
-#define _PLAYERBOT_XPGAINACTION_H
+#ifndef PLAYERBOTS_XPGAINACTION_H
+#define PLAYERBOTS_XPGAINACTION_H
 
 #include "Action.h"
 
diff --git a/src/Ai/Base/ChatActionContext.h b/src/Ai/Base/ChatActionContext.h
index 9bcfda617..19a3dbcee 100644
--- a/src/Ai/Base/ChatActionContext.h
+++ b/src/Ai/Base/ChatActionContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CHATACTIONCONTEXTACTION_H
-#define _PLAYERBOT_CHATACTIONCONTEXTACTION_H
+#ifndef PLAYERBOTS_CHATACTIONCONTEXT_H
+#define PLAYERBOTS_CHATACTIONCONTEXT_H
 
 #include "AddLootAction.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Base/ChatTriggerContext.h b/src/Ai/Base/ChatTriggerContext.h
index 700fa95b4..c14de7d07 100644
--- a/src/Ai/Base/ChatTriggerContext.h
+++ b/src/Ai/Base/ChatTriggerContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CHATTRIGGERCONTEXT_H
-#define _PLAYERBOT_CHATTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_CHATTRIGGERCONTEXT_H
+#define PLAYERBOTS_CHATTRIGGERCONTEXT_H
 
 #include "ChatCommandTrigger.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Base/SharedValueContext.h b/src/Ai/Base/SharedValueContext.h
index 0ac35ab1b..4ea2471fd 100644
--- a/src/Ai/Base/SharedValueContext.h
+++ b/src/Ai/Base/SharedValueContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SHAREDVALUECONTEXT_H
-#define _PLAYERBOT_SHAREDVALUECONTEXT_H
+#ifndef PLAYERBOTS_SHAREDVALUECONTEXT_H
+#define PLAYERBOTS_SHAREDVALUECONTEXT_H
 
 #include "LootValues.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Base/Strategy/AggressiveStrategy.h b/src/Ai/Base/Strategy/AggressiveStrategy.h
index 8a81192e7..e15847bdc 100644
--- a/src/Ai/Base/Strategy/AggressiveStrategy.h
+++ b/src/Ai/Base/Strategy/AggressiveStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_AGGRESSIVESTRATEGY_H
-#define _PLAYERBOT_AGGRESSIVESTRATEGY_H
+#ifndef PLAYERBOTS_AGGRESSIVESTRATEGY_H
+#define PLAYERBOTS_AGGRESSIVESTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Base/Strategy/AttackEnemyPlayersStrategy.h b/src/Ai/Base/Strategy/AttackEnemyPlayersStrategy.h
index aa29d90c1..a46051d1e 100644
--- a/src/Ai/Base/Strategy/AttackEnemyPlayersStrategy.h
+++ b/src/Ai/Base/Strategy/AttackEnemyPlayersStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ATTACKENEMYPAYERSSTRATEGYACTION_H
-#define _PLAYERBOT_ATTACKENEMYPAYERSSTRATEGYACTION_H
+#ifndef PLAYERBOTS_ATTACKENEMYPLAYERSSTRATEGY_H
+#define PLAYERBOTS_ATTACKENEMYPLAYERSSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Base/Strategy/BattlegroundStrategy.cpp b/src/Ai/Base/Strategy/BattlegroundStrategy.cpp
index 41c726cc2..f414e752e 100644
--- a/src/Ai/Base/Strategy/BattlegroundStrategy.cpp
+++ b/src/Ai/Base/Strategy/BattlegroundStrategy.cpp
@@ -14,7 +14,7 @@ void BGStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
     triggers.push_back(new TriggerNode("timer", { NextAction("bg strategy check", relevance)}));
 }
 
-BGStrategy::BGStrategy(PlayerbotAI* botAI) : PassTroughStrategy(botAI) {}
+BGStrategy::BGStrategy(PlayerbotAI* botAI) : PassThroughStrategy(botAI) {}
 
 void BattlegroundStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
diff --git a/src/Ai/Base/Strategy/BattlegroundStrategy.h b/src/Ai/Base/Strategy/BattlegroundStrategy.h
index e36895e2c..07969f9f3 100644
--- a/src/Ai/Base/Strategy/BattlegroundStrategy.h
+++ b/src/Ai/Base/Strategy/BattlegroundStrategy.h
@@ -3,12 +3,12 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_BATTLEGROUNDSTRATEGY_H
-#define _PLAYERBOT_BATTLEGROUNDSTRATEGY_H
+#ifndef PLAYERBOTS_BATTLEGROUNDSTRATEGY_H
+#define PLAYERBOTS_BATTLEGROUNDSTRATEGY_H
 
-#include "PassTroughStrategy.h"
+#include "PassThroughStrategy.h"
 
-class BGStrategy : public PassTroughStrategy
+class BGStrategy : public PassThroughStrategy
 {
 public:
     BGStrategy(PlayerbotAI* botAI);
diff --git a/src/Ai/Base/Strategy/CastTimeStrategy.h b/src/Ai/Base/Strategy/CastTimeStrategy.h
index f5eddc1ca..28c5a751d 100644
--- a/src/Ai/Base/Strategy/CastTimeStrategy.h
+++ b/src/Ai/Base/Strategy/CastTimeStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CASTTIMESTRATEGY_H
-#define _PLAYERBOT_CASTTIMESTRATEGY_H
+#ifndef PLAYERBOTS_CASTTIMESTRATEGY_H
+#define PLAYERBOTS_CASTTIMESTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/ChatCommandHandlerStrategy.cpp b/src/Ai/Base/Strategy/ChatCommandHandlerStrategy.cpp
index 4afc86dcb..85405ef64 100644
--- a/src/Ai/Base/Strategy/ChatCommandHandlerStrategy.cpp
+++ b/src/Ai/Base/Strategy/ChatCommandHandlerStrategy.cpp
@@ -23,7 +23,7 @@ private:
 // Commands where trigger name =/= action name.
 void ChatCommandHandlerStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
-    PassTroughStrategy::InitTriggers(triggers);
+    PassThroughStrategy::InitTriggers(triggers);
 
     // Keep single action triggers on one line, and multi-action triggers on multiple lines.
     triggers.push_back(new TriggerNode("rep", { NextAction("reputation", relevance) }));
@@ -79,7 +79,7 @@ void ChatCommandHandlerStrategy::InitTriggers(std::vector<TriggerNode*>& trigger
 }
 
 // Commands where trigger name == action name.
-ChatCommandHandlerStrategy::ChatCommandHandlerStrategy(PlayerbotAI* botAI) : PassTroughStrategy(botAI)
+ChatCommandHandlerStrategy::ChatCommandHandlerStrategy(PlayerbotAI* botAI) : PassThroughStrategy(botAI)
 {
     actionNodeFactories.Add(new ChatCommandActionNodeFactoryInternal());
 
diff --git a/src/Ai/Base/Strategy/ChatCommandHandlerStrategy.h b/src/Ai/Base/Strategy/ChatCommandHandlerStrategy.h
index 87eab747d..1bb337e5a 100644
--- a/src/Ai/Base/Strategy/ChatCommandHandlerStrategy.h
+++ b/src/Ai/Base/Strategy/ChatCommandHandlerStrategy.h
@@ -3,14 +3,14 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CHATCOMMANDHANDLERSTRATEGY_H
-#define _PLAYERBOT_CHATCOMMANDHANDLERSTRATEGY_H
+#ifndef PLAYERBOTS_CHATCOMMANDHANDLERSTRATEGY_H
+#define PLAYERBOTS_CHATCOMMANDHANDLERSTRATEGY_H
 
-#include "PassTroughStrategy.h"
+#include "PassThroughStrategy.h"
 
 class PlayerbotAI;
 
-class ChatCommandHandlerStrategy : public PassTroughStrategy
+class ChatCommandHandlerStrategy : public PassThroughStrategy
 {
 public:
     ChatCommandHandlerStrategy(PlayerbotAI* botAI);
diff --git a/src/Ai/Base/Strategy/CombatStrategy.h b/src/Ai/Base/Strategy/CombatStrategy.h
index 3296d8bc7..a5d224b17 100644
--- a/src/Ai/Base/Strategy/CombatStrategy.h
+++ b/src/Ai/Base/Strategy/CombatStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_COMBATSTRATEGY_H
-#define _PLAYERBOT_COMBATSTRATEGY_H
+#ifndef PLAYERBOTS_COMBATSTRATEGY_H
+#define PLAYERBOTS_COMBATSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/ConserveManaStrategy.h b/src/Ai/Base/Strategy/ConserveManaStrategy.h
index 000399f19..f5b5f08c1 100644
--- a/src/Ai/Base/Strategy/ConserveManaStrategy.h
+++ b/src/Ai/Base/Strategy/ConserveManaStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CONSERVEMANASTRATEGY_H
-#define _PLAYERBOT_CONSERVEMANASTRATEGY_H
+#ifndef PLAYERBOTS_CONSERVEMANASTRATEGY_H
+#define PLAYERBOTS_CONSERVEMANASTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/DeadStrategy.cpp b/src/Ai/Base/Strategy/DeadStrategy.cpp
index 61399fa10..2935810b1 100644
--- a/src/Ai/Base/Strategy/DeadStrategy.cpp
+++ b/src/Ai/Base/Strategy/DeadStrategy.cpp
@@ -9,7 +9,7 @@
 
 void DeadStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
-    PassTroughStrategy::InitTriggers(triggers);
+    PassThroughStrategy::InitTriggers(triggers);
 
     triggers.push_back(
         new TriggerNode("often", { NextAction("auto release", relevance) }));
@@ -29,4 +29,4 @@ void DeadStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
         "can self resurrect", { NextAction("self resurrect", relevance + 2.0f) }));
 }
 
-DeadStrategy::DeadStrategy(PlayerbotAI* botAI) : PassTroughStrategy(botAI) {}
+DeadStrategy::DeadStrategy(PlayerbotAI* botAI) : PassThroughStrategy(botAI) {}
diff --git a/src/Ai/Base/Strategy/DeadStrategy.h b/src/Ai/Base/Strategy/DeadStrategy.h
index 4ae33d4c5..d1d20a647 100644
--- a/src/Ai/Base/Strategy/DeadStrategy.h
+++ b/src/Ai/Base/Strategy/DeadStrategy.h
@@ -3,14 +3,14 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DEADSTRATEGY_H
-#define _PLAYERBOT_DEADSTRATEGY_H
+#ifndef PLAYERBOTS_DEADSTRATEGY_H
+#define PLAYERBOTS_DEADSTRATEGY_H
 
-#include "PassTroughStrategy.h"
+#include "PassThroughStrategy.h"
 
 class PlayerbotAI;
 
-class DeadStrategy : public PassTroughStrategy
+class DeadStrategy : public PassThroughStrategy
 {
 public:
     DeadStrategy(PlayerbotAI* botAI);
diff --git a/src/Ai/Base/Strategy/DebugStrategy.h b/src/Ai/Base/Strategy/DebugStrategy.h
index 95118f737..53be7a5c3 100644
--- a/src/Ai/Base/Strategy/DebugStrategy.h
+++ b/src/Ai/Base/Strategy/DebugStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DEBUGSTRATEGY_H
-#define _PLAYERBOT_DEBUGSTRATEGY_H
+#ifndef PLAYERBOTS_DEBUGSTRATEGY_H
+#define PLAYERBOTS_DEBUGSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/DpsAssistStrategy.h b/src/Ai/Base/Strategy/DpsAssistStrategy.h
index 2f97e1656..d8fa81a69 100644
--- a/src/Ai/Base/Strategy/DpsAssistStrategy.h
+++ b/src/Ai/Base/Strategy/DpsAssistStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DPSASSISTSTRATEGY_H
-#define _PLAYERBOT_DPSASSISTSTRATEGY_H
+#ifndef PLAYERBOTS_DPSASSISTSTRATEGY_H
+#define PLAYERBOTS_DPSASSISTSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Base/Strategy/DuelStrategy.cpp b/src/Ai/Base/Strategy/DuelStrategy.cpp
index 2a36a3cc6..0469a5b1d 100644
--- a/src/Ai/Base/Strategy/DuelStrategy.cpp
+++ b/src/Ai/Base/Strategy/DuelStrategy.cpp
@@ -7,7 +7,7 @@
 
 void DuelStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
-    PassTroughStrategy::InitTriggers(triggers);
+    PassThroughStrategy::InitTriggers(triggers);
 
     triggers.push_back(
         new TriggerNode("duel requested", { NextAction("accept duel", relevance) }));
@@ -15,7 +15,7 @@ void DuelStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
         new TriggerNode("no attackers", { NextAction("attack duel opponent", 70.0f) }));
 }
 
-DuelStrategy::DuelStrategy(PlayerbotAI* botAI) : PassTroughStrategy(botAI) {}
+DuelStrategy::DuelStrategy(PlayerbotAI* botAI) : PassThroughStrategy(botAI) {}
 
 void StartDuelStrategy::InitTriggers(std::vector<TriggerNode*>& /*triggers*/) {}
 
diff --git a/src/Ai/Base/Strategy/DuelStrategy.h b/src/Ai/Base/Strategy/DuelStrategy.h
index fc08030a7..e50de5d4c 100644
--- a/src/Ai/Base/Strategy/DuelStrategy.h
+++ b/src/Ai/Base/Strategy/DuelStrategy.h
@@ -3,14 +3,14 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DUELSTRATEGY_H
-#define _PLAYERBOT_DUELSTRATEGY_H
+#ifndef PLAYERBOTS_DUELSTRATEGY_H
+#define PLAYERBOTS_DUELSTRATEGY_H
 
-#include "PassTroughStrategy.h"
+#include "PassThroughStrategy.h"
 
 class PlayerbotAI;
 
-class DuelStrategy : public PassTroughStrategy
+class DuelStrategy : public PassThroughStrategy
 {
 public:
     DuelStrategy(PlayerbotAI* botAI);
diff --git a/src/Ai/Base/Strategy/EmoteStrategy.h b/src/Ai/Base/Strategy/EmoteStrategy.h
index 4f1f5efa4..25e51c232 100644
--- a/src/Ai/Base/Strategy/EmoteStrategy.h
+++ b/src/Ai/Base/Strategy/EmoteStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_EMOTESTRATEGY_H
-#define _PLAYERBOT_EMOTESTRATEGY_H
+#ifndef PLAYERBOTS_EMOTESTRATEGY_H
+#define PLAYERBOTS_EMOTESTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/FleeStrategy.h b/src/Ai/Base/Strategy/FleeStrategy.h
index 315719840..2e40cdb5a 100644
--- a/src/Ai/Base/Strategy/FleeStrategy.h
+++ b/src/Ai/Base/Strategy/FleeStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_FLEESTRATEGY_H
-#define _PLAYERBOT_FLEESTRATEGY_H
+#ifndef PLAYERBOTS_FLEESTRATEGY_H
+#define PLAYERBOTS_FLEESTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/FocusTargetStrategy.h b/src/Ai/Base/Strategy/FocusTargetStrategy.h
index 9af35c666..2a36c3583 100644
--- a/src/Ai/Base/Strategy/FocusTargetStrategy.h
+++ b/src/Ai/Base/Strategy/FocusTargetStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_FOCUSTARGETSTRATEGY_H
-#define _PLAYERBOT_FOCUSTARGETSTRATEGY_H
+#ifndef PLAYERBOTS_FOCUSTARGETSTRATEGY_H
+#define PLAYERBOTS_FOCUSTARGETSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/FollowMasterStrategy.h b/src/Ai/Base/Strategy/FollowMasterStrategy.h
index 9d7e3431f..20beecd01 100644
--- a/src/Ai/Base/Strategy/FollowMasterStrategy.h
+++ b/src/Ai/Base/Strategy/FollowMasterStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_FOLLOWMASTERSTRATEGY_H
-#define _PLAYERBOT_FOLLOWMASTERSTRATEGY_H
+#ifndef PLAYERBOTS_FOLLOWMASTERSTRATEGY_H
+#define PLAYERBOTS_FOLLOWMASTERSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Base/Strategy/GrindingStrategy.h b/src/Ai/Base/Strategy/GrindingStrategy.h
index e093c7a58..bdf63013e 100644
--- a/src/Ai/Base/Strategy/GrindingStrategy.h
+++ b/src/Ai/Base/Strategy/GrindingStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GRINDINGSTRATEGY_H
-#define _PLAYERBOT_GRINDINGSTRATEGY_H
+#ifndef PLAYERBOTS_GRINDINGSTRATEGY_H
+#define PLAYERBOTS_GRINDINGSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Base/Strategy/GroupStrategy.h b/src/Ai/Base/Strategy/GroupStrategy.h
index 0a2bd5086..fefc49201 100644
--- a/src/Ai/Base/Strategy/GroupStrategy.h
+++ b/src/Ai/Base/Strategy/GroupStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GROUPSTRATEGY_H
-#define _PLAYERBOT_GROUPSTRATEGY_H
+#ifndef PLAYERBOTS_GROUPSTRATEGY_H
+#define PLAYERBOTS_GROUPSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Base/Strategy/GuardStrategy.h b/src/Ai/Base/Strategy/GuardStrategy.h
index 98c6b2a6f..96abc6b1b 100644
--- a/src/Ai/Base/Strategy/GuardStrategy.h
+++ b/src/Ai/Base/Strategy/GuardStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GUARDSTRATEGY_H
-#define _PLAYERBOT_GUARDSTRATEGY_H
+#ifndef PLAYERBOTS_GUARDSTRATEGY_H
+#define PLAYERBOTS_GUARDSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Base/Strategy/GuildStrategy.h b/src/Ai/Base/Strategy/GuildStrategy.h
index 1e46bf9b0..0235d5c63 100644
--- a/src/Ai/Base/Strategy/GuildStrategy.h
+++ b/src/Ai/Base/Strategy/GuildStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GUILDSTRATEGY_H
-#define _PLAYERBOT_GUILDSTRATEGY_H
+#ifndef PLAYERBOTS_GUILDSTRATEGY_H
+#define PLAYERBOTS_GUILDSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Base/Strategy/KiteStrategy.h b/src/Ai/Base/Strategy/KiteStrategy.h
index 4e77774c6..07b8c4ca7 100644
--- a/src/Ai/Base/Strategy/KiteStrategy.h
+++ b/src/Ai/Base/Strategy/KiteStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_KITESTRATEGY_H
-#define _PLAYERBOT_KITESTRATEGY_H
+#ifndef PLAYERBOTS_KITESTRATEGY_H
+#define PLAYERBOTS_KITESTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/LfgStrategy.cpp b/src/Ai/Base/Strategy/LfgStrategy.cpp
index b6057881c..e9e0ae8f9 100644
--- a/src/Ai/Base/Strategy/LfgStrategy.cpp
+++ b/src/Ai/Base/Strategy/LfgStrategy.cpp
@@ -16,4 +16,4 @@ void LfgStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
         "unknown dungeon", { NextAction("give leader in dungeon", relevance) }));
 }
 
-LfgStrategy::LfgStrategy(PlayerbotAI* botAI) : PassTroughStrategy(botAI) {}
+LfgStrategy::LfgStrategy(PlayerbotAI* botAI) : PassThroughStrategy(botAI) {}
diff --git a/src/Ai/Base/Strategy/LfgStrategy.h b/src/Ai/Base/Strategy/LfgStrategy.h
index 6626725b5..92ea74eae 100644
--- a/src/Ai/Base/Strategy/LfgStrategy.h
+++ b/src/Ai/Base/Strategy/LfgStrategy.h
@@ -3,12 +3,12 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LFGSTRATEGY_H
-#define _PLAYERBOT_LFGSTRATEGY_H
+#ifndef PLAYERBOTS_LFGSTRATEGY_H
+#define PLAYERBOTS_LFGSTRATEGY_H
 
-#include "PassTroughStrategy.h"
+#include "PassThroughStrategy.h"
 
-class LfgStrategy : public PassTroughStrategy
+class LfgStrategy : public PassThroughStrategy
 {
 public:
     LfgStrategy(PlayerbotAI* botAI);
diff --git a/src/Ai/Base/Strategy/LootNonCombatStrategy.h b/src/Ai/Base/Strategy/LootNonCombatStrategy.h
index fef564f8b..285171791 100644
--- a/src/Ai/Base/Strategy/LootNonCombatStrategy.h
+++ b/src/Ai/Base/Strategy/LootNonCombatStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LOOTNONCOMBATSTRATEGY_H
-#define _PLAYERBOT_LOOTNONCOMBATSTRATEGY_H
+#ifndef PLAYERBOTS_LOOTNONCOMBATSTRATEGY_H
+#define PLAYERBOTS_LOOTNONCOMBATSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/MaintenanceStrategy.h b/src/Ai/Base/Strategy/MaintenanceStrategy.h
index 44bfadd03..10193127d 100644
--- a/src/Ai/Base/Strategy/MaintenanceStrategy.h
+++ b/src/Ai/Base/Strategy/MaintenanceStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_MAINTANCESTRATEGY_H
-#define _PLAYERBOT_MAINTANCESTRATEGY_H
+#ifndef PLAYERBOTS_MAINTENANCESTRATEGY_H
+#define PLAYERBOTS_MAINTENANCESTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Base/Strategy/MarkRtiStrategy.h b/src/Ai/Base/Strategy/MarkRtiStrategy.h
index 734f3d8e6..8a16040bd 100644
--- a/src/Ai/Base/Strategy/MarkRtiStrategy.h
+++ b/src/Ai/Base/Strategy/MarkRtiStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_MARKRTISTRATEGY_H
-#define _PLAYERBOT_MARKRTISTRATEGY_H
+#ifndef PLAYERBOTS_MARKRTISTRATEGY_H
+#define PLAYERBOTS_MARKRTISTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/MeleeCombatStrategy.h b/src/Ai/Base/Strategy/MeleeCombatStrategy.h
index 9cad2bb3e..b49e1c9ae 100644
--- a/src/Ai/Base/Strategy/MeleeCombatStrategy.h
+++ b/src/Ai/Base/Strategy/MeleeCombatStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_MELEECOMBATSTRATEGY_H
-#define _PLAYERBOT_MELEECOMBATSTRATEGY_H
+#ifndef PLAYERBOTS_MELEECOMBATSTRATEGY_H
+#define PLAYERBOTS_MELEECOMBATSTRATEGY_H
 
 #include "CombatStrategy.h"
 
diff --git a/src/Ai/Base/Strategy/MoveFromGroupStrategy.h b/src/Ai/Base/Strategy/MoveFromGroupStrategy.h
index 53aa1c99a..184686430 100644
--- a/src/Ai/Base/Strategy/MoveFromGroupStrategy.h
+++ b/src/Ai/Base/Strategy/MoveFromGroupStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_MOVEFROMGROUPSTRATEGY_H
-#define _PLAYERBOT_MOVEFROMGROUPSTRATEGY_H
+#ifndef PLAYERBOTS_MOVEFROMGROUPSTRATEGY_H
+#define PLAYERBOTS_MOVEFROMGROUPSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/NonCombatStrategy.h b/src/Ai/Base/Strategy/NonCombatStrategy.h
index 18549ac11..c99fb63d0 100644
--- a/src/Ai/Base/Strategy/NonCombatStrategy.h
+++ b/src/Ai/Base/Strategy/NonCombatStrategy.h
@@ -3,10 +3,10 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_NONCOMBATSTRATEGY_H
-#define _PLAYERBOT_NONCOMBATSTRATEGY_H
+#ifndef PLAYERBOTS_NONCOMBATSTRATEGY_H
+#define PLAYERBOTS_NONCOMBATSTRATEGY_H
 
-#include "PassTroughStrategy.h"
+#include "PassThroughStrategy.h"
 
 class PlayerbotAI;
 
diff --git a/src/Ai/Base/Strategy/PassTroughStrategy.cpp b/src/Ai/Base/Strategy/PassThroughStrategy.cpp
similarity index 80%
rename from src/Ai/Base/Strategy/PassTroughStrategy.cpp
rename to src/Ai/Base/Strategy/PassThroughStrategy.cpp
index 228106df4..a271bbb43 100644
--- a/src/Ai/Base/Strategy/PassTroughStrategy.cpp
+++ b/src/Ai/Base/Strategy/PassThroughStrategy.cpp
@@ -3,11 +3,11 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "PassTroughStrategy.h"
+#include "PassThroughStrategy.h"
 
 #include "Playerbots.h"
 
-void PassTroughStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
+void PassThroughStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
     for (std::vector<std::string>::iterator i = supported.begin(); i != supported.end(); i++)
         triggers.push_back(
diff --git a/src/Ai/Base/Strategy/PassTroughStrategy.h b/src/Ai/Base/Strategy/PassThroughStrategy.h
similarity index 64%
rename from src/Ai/Base/Strategy/PassTroughStrategy.h
rename to src/Ai/Base/Strategy/PassThroughStrategy.h
index b3f897e2c..aa7bc47e8 100644
--- a/src/Ai/Base/Strategy/PassTroughStrategy.h
+++ b/src/Ai/Base/Strategy/PassThroughStrategy.h
@@ -3,17 +3,17 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PASSTHROUGHSTRATEGY_H
-#define _PLAYERBOT_PASSTHROUGHSTRATEGY_H
+#ifndef PLAYERBOTS_PASSTHROUGHSTRATEGY_H
+#define PLAYERBOTS_PASSTHROUGHSTRATEGY_H
 
 #include "Strategy.h"
 
 class PlayerbotAI;
 
-class PassTroughStrategy : public Strategy
+class PassThroughStrategy : public Strategy
 {
 public:
-    PassTroughStrategy(PlayerbotAI* botAI, float relevance = 100.0f) : Strategy(botAI), relevance(relevance) {}
+    PassThroughStrategy(PlayerbotAI* botAI, float relevance = 100.0f) : Strategy(botAI), relevance(relevance) {}
 
     void InitTriggers(std::vector<TriggerNode*>& triggers) override;
 
diff --git a/src/Ai/Base/Strategy/PassiveStrategy.h b/src/Ai/Base/Strategy/PassiveStrategy.h
index 097ecd0a0..02ef65ee0 100644
--- a/src/Ai/Base/Strategy/PassiveStrategy.h
+++ b/src/Ai/Base/Strategy/PassiveStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PASSIVESTRATEGY_H
-#define _PLAYERBOT_PASSIVESTRATEGY_H
+#ifndef PLAYERBOTS_PASSIVESTRATEGY_H
+#define PLAYERBOTS_PASSIVESTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/PullStrategy.h b/src/Ai/Base/Strategy/PullStrategy.h
index 428699c56..1a66493e2 100644
--- a/src/Ai/Base/Strategy/PullStrategy.h
+++ b/src/Ai/Base/Strategy/PullStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PULLSTRATEGY_H
-#define _PLAYERBOT_PULLSTRATEGY_H
+#ifndef PLAYERBOTS_PULLSTRATEGY_H
+#define PLAYERBOTS_PULLSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/QuestStrategies.cpp b/src/Ai/Base/Strategy/QuestStrategies.cpp
index adcc4b22b..7f1df5297 100644
--- a/src/Ai/Base/Strategy/QuestStrategies.cpp
+++ b/src/Ai/Base/Strategy/QuestStrategies.cpp
@@ -7,11 +7,11 @@
 
 #include "Playerbots.h"
 
-QuestStrategy::QuestStrategy(PlayerbotAI* botAI) : PassTroughStrategy(botAI) { supported.push_back("accept quest"); }
+QuestStrategy::QuestStrategy(PlayerbotAI* botAI) : PassThroughStrategy(botAI) { supported.push_back("accept quest"); }
 
 void QuestStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
-    PassTroughStrategy::InitTriggers(triggers);
+    PassThroughStrategy::InitTriggers(triggers);
 
     triggers.push_back(
         new TriggerNode("quest share", {  NextAction("accept quest share", relevance) }));
diff --git a/src/Ai/Base/Strategy/QuestStrategies.h b/src/Ai/Base/Strategy/QuestStrategies.h
index 232d19428..b2d4b7afe 100644
--- a/src/Ai/Base/Strategy/QuestStrategies.h
+++ b/src/Ai/Base/Strategy/QuestStrategies.h
@@ -3,14 +3,14 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_QUESTSTRATEGIES_H
-#define _PLAYERBOT_QUESTSTRATEGIES_H
+#ifndef PLAYERBOTS_QUESTSTRATEGIES_H
+#define PLAYERBOTS_QUESTSTRATEGIES_H
 
-#include "PassTroughStrategy.h"
+#include "PassThroughStrategy.h"
 
 class PlayerbotAI;
 
-class QuestStrategy : public PassTroughStrategy
+class QuestStrategy : public PassThroughStrategy
 {
 public:
     QuestStrategy(PlayerbotAI* botAI);
diff --git a/src/Ai/Base/Strategy/RTSCStrategy.h b/src/Ai/Base/Strategy/RTSCStrategy.h
index c61aee2a9..a7054ff8a 100644
--- a/src/Ai/Base/Strategy/RTSCStrategy.h
+++ b/src/Ai/Base/Strategy/RTSCStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RTSCSTRATEGY_H
-#define _PLAYERBOT_RTSCSTRATEGY_H
+#ifndef PLAYERBOTS_RTSCSTRATEGY_H
+#define PLAYERBOTS_RTSCSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/RacialsStrategy.h b/src/Ai/Base/Strategy/RacialsStrategy.h
index 1837890f5..72f73b31b 100644
--- a/src/Ai/Base/Strategy/RacialsStrategy.h
+++ b/src/Ai/Base/Strategy/RacialsStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RACIALSSTRATEGY_H
-#define _PLAYERBOT_RACIALSSTRATEGY_H
+#ifndef PLAYERBOTS_RACIALSSTRATEGY_H
+#define PLAYERBOTS_RACIALSSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/RangedCombatStrategy.h b/src/Ai/Base/Strategy/RangedCombatStrategy.h
index cb5adad7a..b08071c50 100644
--- a/src/Ai/Base/Strategy/RangedCombatStrategy.h
+++ b/src/Ai/Base/Strategy/RangedCombatStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RANGEDCOMBATSTRATEGY_H
-#define _PLAYERBOT_RANGEDCOMBATSTRATEGY_H
+#ifndef PLAYERBOTS_RANGEDCOMBATSTRATEGY_H
+#define PLAYERBOTS_RANGEDCOMBATSTRATEGY_H
 
 #include "CombatStrategy.h"
 
diff --git a/src/Ai/Base/Strategy/ReturnStrategy.h b/src/Ai/Base/Strategy/ReturnStrategy.h
index 1d260b33a..97420025e 100644
--- a/src/Ai/Base/Strategy/ReturnStrategy.h
+++ b/src/Ai/Base/Strategy/ReturnStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RETURNSTRATEGY_H
-#define _PLAYERBOT_RETURNSTRATEGY_H
+#ifndef PLAYERBOTS_RETURNSTRATEGY_H
+#define PLAYERBOTS_RETURNSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Base/Strategy/RunawayStrategy.h b/src/Ai/Base/Strategy/RunawayStrategy.h
index 4ab802ac3..cd9627347 100644
--- a/src/Ai/Base/Strategy/RunawayStrategy.h
+++ b/src/Ai/Base/Strategy/RunawayStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RUNAWAYSTRATEGY_H
-#define _PLAYERBOT_RUNAWAYSTRATEGY_H
+#ifndef PLAYERBOTS_RUNAWAYSTRATEGY_H
+#define PLAYERBOTS_RUNAWAYSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Base/Strategy/SayStrategy.h b/src/Ai/Base/Strategy/SayStrategy.h
index f83ece59c..4de993734 100644
--- a/src/Ai/Base/Strategy/SayStrategy.h
+++ b/src/Ai/Base/Strategy/SayStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SAYSTRATEGY_H
-#define _PLAYERBOT_SAYSTRATEGY_H
+#ifndef PLAYERBOTS_SAYSTRATEGY_H
+#define PLAYERBOTS_SAYSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/StayStrategy.h b/src/Ai/Base/Strategy/StayStrategy.h
index 0ee1c7d1c..745256431 100644
--- a/src/Ai/Base/Strategy/StayStrategy.h
+++ b/src/Ai/Base/Strategy/StayStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_STAYSTRATEGY_H
-#define _PLAYERBOT_STAYSTRATEGY_H
+#ifndef PLAYERBOTS_STAYSTRATEGY_H
+#define PLAYERBOTS_STAYSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Base/Strategy/TankAssistStrategy.h b/src/Ai/Base/Strategy/TankAssistStrategy.h
index 8efcf0fe4..597111e24 100644
--- a/src/Ai/Base/Strategy/TankAssistStrategy.h
+++ b/src/Ai/Base/Strategy/TankAssistStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TANKASSISTSTRATEGY_H
-#define _PLAYERBOT_TANKASSISTSTRATEGY_H
+#ifndef PLAYERBOTS_TANKASSISTSTRATEGY_H
+#define PLAYERBOTS_TANKASSISTSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/TellTargetStrategy.h b/src/Ai/Base/Strategy/TellTargetStrategy.h
index 4b3663494..b9464953a 100644
--- a/src/Ai/Base/Strategy/TellTargetStrategy.h
+++ b/src/Ai/Base/Strategy/TellTargetStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TELLTARGETSTRATEGY_H
-#define _PLAYERBOT_TELLTARGETSTRATEGY_H
+#ifndef PLAYERBOTS_TELLTARGETSTRATEGY_H
+#define PLAYERBOTS_TELLTARGETSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/ThreatStrategy.h b/src/Ai/Base/Strategy/ThreatStrategy.h
index d1815e816..d00f0f8d8 100644
--- a/src/Ai/Base/Strategy/ThreatStrategy.h
+++ b/src/Ai/Base/Strategy/ThreatStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_THREATSTRATEGY_H
-#define _PLAYERBOT_THREATSTRATEGY_H
+#ifndef PLAYERBOTS_THREATSTRATEGY_H
+#define PLAYERBOTS_THREATSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/TravelStrategy.h b/src/Ai/Base/Strategy/TravelStrategy.h
index c0b0bd2d1..37f135309 100644
--- a/src/Ai/Base/Strategy/TravelStrategy.h
+++ b/src/Ai/Base/Strategy/TravelStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TRAVELSTRATEGY_H
-#define _PLAYERBOT_TRAVELSTRATEGY_H
+#ifndef PLAYERBOTS_TRAVELSTRATEGY_H
+#define PLAYERBOTS_TRAVELSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/UseFoodStrategy.h b/src/Ai/Base/Strategy/UseFoodStrategy.h
index 9eb7a94d5..f313834a7 100644
--- a/src/Ai/Base/Strategy/UseFoodStrategy.h
+++ b/src/Ai/Base/Strategy/UseFoodStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_USEFOODSTRATEGY_H
-#define _PLAYERBOT_USEFOODSTRATEGY_H
+#ifndef PLAYERBOTS_USEFOODSTRATEGY_H
+#define PLAYERBOTS_USEFOODSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/UsePotionsStrategy.h b/src/Ai/Base/Strategy/UsePotionsStrategy.h
index 36cf2dc29..45e435639 100644
--- a/src/Ai/Base/Strategy/UsePotionsStrategy.h
+++ b/src/Ai/Base/Strategy/UsePotionsStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_USEPOTIONSSTRATEGY_H
-#define _PLAYERBOT_USEPOTIONSSTRATEGY_H
+#ifndef PLAYERBOTS_USEPOTIONSSTRATEGY_H
+#define PLAYERBOTS_USEPOTIONSSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Base/Strategy/WaitForAttackStrategy.h b/src/Ai/Base/Strategy/WaitForAttackStrategy.h
index 085b4fe0b..7cb42b927 100644
--- a/src/Ai/Base/Strategy/WaitForAttackStrategy.h
+++ b/src/Ai/Base/Strategy/WaitForAttackStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WAITFORATTACKSTRATEGY_H
-#define _PLAYERBOT_WAITFORATTACKSTRATEGY_H
+#ifndef PLAYERBOTS_WAITFORATTACKSTRATEGY_H
+#define PLAYERBOTS_WAITFORATTACKSTRATEGY_H
 
 #include "Multiplier.h"
 #include "Strategy.h"
diff --git a/src/Ai/Base/Strategy/WorldPacketHandlerStrategy.cpp b/src/Ai/Base/Strategy/WorldPacketHandlerStrategy.cpp
index 5f2d2532d..ea8a7d8e0 100644
--- a/src/Ai/Base/Strategy/WorldPacketHandlerStrategy.cpp
+++ b/src/Ai/Base/Strategy/WorldPacketHandlerStrategy.cpp
@@ -7,7 +7,7 @@
 
 void WorldPacketHandlerStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
-    PassTroughStrategy::InitTriggers(triggers);
+    PassThroughStrategy::InitTriggers(triggers);
 
     triggers.push_back(
         new TriggerNode("group invite", { NextAction("accept invitation", relevance) }));
@@ -71,7 +71,7 @@ void WorldPacketHandlerStrategy::InitTriggers(std::vector<TriggerNode*>& trigger
     triggers.push_back(new TriggerNode("very often", { NextAction("loot roll", relevance) }));
 }
 
-WorldPacketHandlerStrategy::WorldPacketHandlerStrategy(PlayerbotAI* botAI) : PassTroughStrategy(botAI)
+WorldPacketHandlerStrategy::WorldPacketHandlerStrategy(PlayerbotAI* botAI) : PassThroughStrategy(botAI)
 {
     supported.push_back("loot roll");
     supported.push_back("check mount state");
diff --git a/src/Ai/Base/Strategy/WorldPacketHandlerStrategy.h b/src/Ai/Base/Strategy/WorldPacketHandlerStrategy.h
index 52b6e83e3..1cb70e81e 100644
--- a/src/Ai/Base/Strategy/WorldPacketHandlerStrategy.h
+++ b/src/Ai/Base/Strategy/WorldPacketHandlerStrategy.h
@@ -3,14 +3,14 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WORLDPACKETHANDLERSTRATEGY_H
-#define _PLAYERBOT_WORLDPACKETHANDLERSTRATEGY_H
+#ifndef PLAYERBOTS_WORLDPACKETHANDLERSTRATEGY_H
+#define PLAYERBOTS_WORLDPACKETHANDLERSTRATEGY_H
 
-#include "PassTroughStrategy.h"
+#include "PassThroughStrategy.h"
 
 class PlayerbotAI;
 
-class WorldPacketHandlerStrategy : public PassTroughStrategy
+class WorldPacketHandlerStrategy : public PassThroughStrategy
 {
 public:
     WorldPacketHandlerStrategy(PlayerbotAI* botAI);
@@ -19,10 +19,10 @@ public:
     std::string const getName() override { return "default"; }
 };
 
-class ReadyCheckStrategy : public PassTroughStrategy
+class ReadyCheckStrategy : public PassThroughStrategy
 {
 public:
-    ReadyCheckStrategy(PlayerbotAI* botAI) : PassTroughStrategy(botAI) { }
+    ReadyCheckStrategy(PlayerbotAI* botAI) : PassThroughStrategy(botAI) { }
 
     void InitTriggers(std::vector<TriggerNode*>& triggers) override;
     std::string const getName() override { return "ready check"; }
diff --git a/src/Ai/Base/StrategyContext.h b/src/Ai/Base/StrategyContext.h
index 8dab9c40d..bdcfe3caf 100644
--- a/src/Ai/Base/StrategyContext.h
+++ b/src/Ai/Base/StrategyContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_STRATEGYCONTEXT_H
-#define _PLAYERBOT_STRATEGYCONTEXT_H
+#ifndef PLAYERBOTS_STRATEGYCONTEXT_H
+#define PLAYERBOTS_STRATEGYCONTEXT_H
 
 #include "AggressiveStrategy.h"
 #include "AttackEnemyPlayersStrategy.h"
diff --git a/src/Ai/Base/Trigger/BossAuraTriggers.h b/src/Ai/Base/Trigger/BossAuraTriggers.h
index 86a0fa31f..64599dfe4 100644
--- a/src/Ai/Base/Trigger/BossAuraTriggers.h
+++ b/src/Ai/Base/Trigger/BossAuraTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_BOSSAURATRIGGERS_H
-#define _PLAYERBOT_BOSSAURATRIGGERS_H
+#ifndef PLAYERBOTS_BOSSAURATRIGGERS_H
+#define PLAYERBOTS_BOSSAURATRIGGERS_H
 
 #include "GenericTriggers.h"
 
diff --git a/src/Ai/Base/Trigger/ChatCommandTrigger.h b/src/Ai/Base/Trigger/ChatCommandTrigger.h
index 4131b0e42..601cb819a 100644
--- a/src/Ai/Base/Trigger/ChatCommandTrigger.h
+++ b/src/Ai/Base/Trigger/ChatCommandTrigger.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CHATCOMMANDTRIGGER_H
-#define _PLAYERBOT_CHATCOMMANDTRIGGER_H
+#ifndef PLAYERBOTS_CHATCOMMANDTRIGGER_H
+#define PLAYERBOTS_CHATCOMMANDTRIGGER_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/Base/Trigger/CureTriggers.h b/src/Ai/Base/Trigger/CureTriggers.h
index 208ee5ad8..a2210870d 100644
--- a/src/Ai/Base/Trigger/CureTriggers.h
+++ b/src/Ai/Base/Trigger/CureTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CURETRIGGERS_H
-#define _PLAYERBOT_CURETRIGGERS_H
+#ifndef PLAYERBOTS_CURETRIGGERS_H
+#define PLAYERBOTS_CURETRIGGERS_H
 
 #include "GenericTriggers.h"
 
diff --git a/src/Ai/Base/Trigger/FishingTriggers.h b/src/Ai/Base/Trigger/FishingTriggers.h
index ed3c6962b..ea66e7404 100644
--- a/src/Ai/Base/Trigger/FishingTriggers.h
+++ b/src/Ai/Base/Trigger/FishingTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_FISHING_TRIGGER_H
-#define _PLAYERBOT_FISHING_TRIGGER_H
+#ifndef PLAYERBOTS_FISHINGTRIGGERS_H
+#define PLAYERBOTS_FISHINGTRIGGERS_H
 
 #include "GenericTriggers.h"
 
diff --git a/src/Ai/Base/Trigger/GenericTriggers.h b/src/Ai/Base/Trigger/GenericTriggers.h
index 418949a85..51a1e0551 100644
--- a/src/Ai/Base/Trigger/GenericTriggers.h
+++ b/src/Ai/Base/Trigger/GenericTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICTRIGGERS_H
-#define _PLAYERBOT_GENERICTRIGGERS_H
+#ifndef PLAYERBOTS_GENERICTRIGGERS_H
+#define PLAYERBOTS_GENERICTRIGGERS_H
 
 #include <utility>
 
diff --git a/src/Ai/Base/Trigger/GuildTriggers.h b/src/Ai/Base/Trigger/GuildTriggers.h
index adbf730e7..0a85f5af7 100644
--- a/src/Ai/Base/Trigger/GuildTriggers.h
+++ b/src/Ai/Base/Trigger/GuildTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GUILDTRIGGER_H
-#define _PLAYERBOT_GUILDTRIGGER_H
+#ifndef PLAYERBOTS_GUILDTRIGGERS_H
+#define PLAYERBOTS_GUILDTRIGGERS_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/Base/Trigger/HealthTriggers.h b/src/Ai/Base/Trigger/HealthTriggers.h
index 14e68c7e3..68c86c3e8 100644
--- a/src/Ai/Base/Trigger/HealthTriggers.h
+++ b/src/Ai/Base/Trigger/HealthTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_HEALTHTRIGGERS_H
-#define _PLAYERBOT_HEALTHTRIGGERS_H
+#ifndef PLAYERBOTS_HEALTHTRIGGERS_H
+#define PLAYERBOTS_HEALTHTRIGGERS_H
 
 #include <stdexcept>
 
diff --git a/src/Ai/Base/Trigger/LfgTriggers.h b/src/Ai/Base/Trigger/LfgTriggers.h
index c1f79055a..7d7deef75 100644
--- a/src/Ai/Base/Trigger/LfgTriggers.h
+++ b/src/Ai/Base/Trigger/LfgTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LFGTRIGGERS_H
-#define _PLAYERBOT_LFGTRIGGERS_H
+#ifndef PLAYERBOTS_LFGTRIGGERS_H
+#define PLAYERBOTS_LFGTRIGGERS_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/Base/Trigger/LootTriggers.h b/src/Ai/Base/Trigger/LootTriggers.h
index f7c580b21..bf6f4e968 100644
--- a/src/Ai/Base/Trigger/LootTriggers.h
+++ b/src/Ai/Base/Trigger/LootTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LOOTTRIGGERS_H
-#define _PLAYERBOT_LOOTTRIGGERS_H
+#ifndef PLAYERBOTS_LOOTTRIGGERS_H
+#define PLAYERBOTS_LOOTTRIGGERS_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/Base/Trigger/PullTriggers.h b/src/Ai/Base/Trigger/PullTriggers.h
index d56036177..66cf479b9 100644
--- a/src/Ai/Base/Trigger/PullTriggers.h
+++ b/src/Ai/Base/Trigger/PullTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PULLTRIGGERS_H
-#define _PLAYERBOT_PULLTRIGGERS_H
+#ifndef PLAYERBOTS_PULLTRIGGERS_H
+#define PLAYERBOTS_PULLTRIGGERS_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/Base/Trigger/PvpTriggers.h b/src/Ai/Base/Trigger/PvpTriggers.h
index 46e489a63..5077dda73 100644
--- a/src/Ai/Base/Trigger/PvpTriggers.h
+++ b/src/Ai/Base/Trigger/PvpTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PVPTRIGGERS_H
-#define _PLAYERBOT_PVPTRIGGERS_H
+#ifndef PLAYERBOTS_PVPTRIGGERS_H
+#define PLAYERBOTS_PVPTRIGGERS_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/Base/Trigger/RangeTriggers.h b/src/Ai/Base/Trigger/RangeTriggers.h
index 62e1ae6e0..38e3d0d72 100644
--- a/src/Ai/Base/Trigger/RangeTriggers.h
+++ b/src/Ai/Base/Trigger/RangeTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RANGETRIGGERS_H
-#define _PLAYERBOT_RANGETRIGGERS_H
+#ifndef PLAYERBOTS_RANGETRIGGERS_H
+#define PLAYERBOTS_RANGETRIGGERS_H
 
 #include "PlayerbotAIConfig.h"
 #include "Trigger.h"
diff --git a/src/Ai/Base/Trigger/RpgTriggers.h b/src/Ai/Base/Trigger/RpgTriggers.h
index 317348362..d320a1b75 100644
--- a/src/Ai/Base/Trigger/RpgTriggers.h
+++ b/src/Ai/Base/Trigger/RpgTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RPGTRIGGERS_H
-#define _PLAYERBOT_RPGTRIGGERS_H
+#ifndef PLAYERBOTS_RPGTRIGGERS_H
+#define PLAYERBOTS_RPGTRIGGERS_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/Base/Trigger/RtiTriggers.h b/src/Ai/Base/Trigger/RtiTriggers.h
index 9ff128ec2..792af47cc 100644
--- a/src/Ai/Base/Trigger/RtiTriggers.h
+++ b/src/Ai/Base/Trigger/RtiTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RTITRIGGERS_H
-#define _PLAYERBOT_RTITRIGGERS_H
+#ifndef PLAYERBOTS_RTITRIGGERS_H
+#define PLAYERBOTS_RTITRIGGERS_H
 
 #include "GenericTriggers.h"
 #include "Trigger.h"
diff --git a/src/Ai/Base/Trigger/StuckTriggers.h b/src/Ai/Base/Trigger/StuckTriggers.h
index 42edc9d16..3387b4fcc 100644
--- a/src/Ai/Base/Trigger/StuckTriggers.h
+++ b/src/Ai/Base/Trigger/StuckTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_STUCKTRIGGERS_H
-#define _PLAYERBOT_STUCKTRIGGERS_H
+#ifndef PLAYERBOTS_STUCKTRIGGERS_H
+#define PLAYERBOTS_STUCKTRIGGERS_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/Base/Trigger/TravelTriggers.h b/src/Ai/Base/Trigger/TravelTriggers.h
index ce2e1467c..47f4bc26a 100644
--- a/src/Ai/Base/Trigger/TravelTriggers.h
+++ b/src/Ai/Base/Trigger/TravelTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TRAVELTRIGGERS_H
-#define _PLAYERBOT_TRAVELTRIGGERS_H
+#ifndef PLAYERBOTS_TRAVELTRIGGERS_H
+#define PLAYERBOTS_TRAVELTRIGGERS_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/Base/Trigger/WaitForAttackTriggers.h b/src/Ai/Base/Trigger/WaitForAttackTriggers.h
index 152434b1f..016078e76 100644
--- a/src/Ai/Base/Trigger/WaitForAttackTriggers.h
+++ b/src/Ai/Base/Trigger/WaitForAttackTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WAITFORATTACKTRIGGERS_H
-#define _PLAYERBOT_WAITFORATTACKTRIGGERS_H
+#ifndef PLAYERBOTS_WAITFORATTACKTRIGGERS_H
+#define PLAYERBOTS_WAITFORATTACKTRIGGERS_H
 
 #include "PlayerbotAIConfig.h"
 #include "Playerbots.h"
diff --git a/src/Ai/Base/Trigger/WithinAreaTrigger.h b/src/Ai/Base/Trigger/WithinAreaTrigger.h
index 1d428d9df..40f254070 100644
--- a/src/Ai/Base/Trigger/WithinAreaTrigger.h
+++ b/src/Ai/Base/Trigger/WithinAreaTrigger.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WITHINAREATRIGGER_H
-#define _PLAYERBOT_WITHINAREATRIGGER_H
+#ifndef PLAYERBOTS_WITHINAREATRIGGER_H
+#define PLAYERBOTS_WITHINAREATRIGGER_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/Base/Trigger/WorldPacketTrigger.h b/src/Ai/Base/Trigger/WorldPacketTrigger.h
index 6f98e37ac..000896edb 100644
--- a/src/Ai/Base/Trigger/WorldPacketTrigger.h
+++ b/src/Ai/Base/Trigger/WorldPacketTrigger.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WORLDPACKETTRIGGER_H
-#define _PLAYERBOT_WORLDPACKETTRIGGER_H
+#ifndef PLAYERBOTS_WORLDPACKETTRIGGER_H
+#define PLAYERBOTS_WORLDPACKETTRIGGER_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/Base/TriggerContext.h b/src/Ai/Base/TriggerContext.h
index 111597620..3b30691d3 100644
--- a/src/Ai/Base/TriggerContext.h
+++ b/src/Ai/Base/TriggerContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TRIGGERCONTEXT_H
-#define _PLAYERBOT_TRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_TRIGGERCONTEXT_H
+#define PLAYERBOTS_TRIGGERCONTEXT_H
 
 #include "CureTriggers.h"
 #include "FishingTriggers.h"
diff --git a/src/Ai/Base/Util/GenericBuffUtils.h b/src/Ai/Base/Util/GenericBuffUtils.h
index 9f93bf108..d7f724aab 100644
--- a/src/Ai/Base/Util/GenericBuffUtils.h
+++ b/src/Ai/Base/Util/GenericBuffUtils.h
@@ -3,7 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#pragma once
+#ifndef PLAYERBOTS_GENERICBUFFUTILS_H
+#define PLAYERBOTS_GENERICBUFFUTILS_H
 
 #include <string>
 #include "Common.h"
@@ -43,3 +44,5 @@ namespace ai::spell
 {
     bool HasSpellOrCategoryCooldown(Player* bot, uint32 spellId);
 }
+
+#endif
diff --git a/src/Ai/Base/Value/ActiveSpellValue.h b/src/Ai/Base/Value/ActiveSpellValue.h
index 50e1e5891..de85c353c 100644
--- a/src/Ai/Base/Value/ActiveSpellValue.h
+++ b/src/Ai/Base/Value/ActiveSpellValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ACTIVESPELLVALUE_H
-#define _PLAYERBOT_ACTIVESPELLVALUE_H
+#ifndef PLAYERBOTS_ACTIVESPELLVALUE_H
+#define PLAYERBOTS_ACTIVESPELLVALUE_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/Value/AggressiveTargetValue.h b/src/Ai/Base/Value/AggressiveTargetValue.h
index 61b4d6951..de25bc23c 100644
--- a/src/Ai/Base/Value/AggressiveTargetValue.h
+++ b/src/Ai/Base/Value/AggressiveTargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_AGGRESSIVETARGETVALUE_H
-#define _PLAYERBOT_AGGRESSIVETARGETVALUE_H
+#ifndef PLAYERBOTS_AGGRESSIVETARGETVALUE_H
+#define PLAYERBOTS_AGGRESSIVETARGETVALUE_H
 
 #include "TargetValue.h"
 
diff --git a/src/Ai/Base/Value/AlwaysLootListValue.h b/src/Ai/Base/Value/AlwaysLootListValue.h
index d55df8772..bd1f096d8 100644
--- a/src/Ai/Base/Value/AlwaysLootListValue.h
+++ b/src/Ai/Base/Value/AlwaysLootListValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ALWAYSLOOTLISTVALUE_H
-#define _PLAYERBOT_ALWAYSLOOTLISTVALUE_H
+#ifndef PLAYERBOTS_ALWAYSLOOTLISTVALUE_H
+#define PLAYERBOTS_ALWAYSLOOTLISTVALUE_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/Value/AoeHealValues.h b/src/Ai/Base/Value/AoeHealValues.h
index b4c3ac956..b7645f4c6 100644
--- a/src/Ai/Base/Value/AoeHealValues.h
+++ b/src/Ai/Base/Value/AoeHealValues.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_AOEHEALVALUES_H
-#define _PLAYERBOT_AOEHEALVALUES_H
+#ifndef PLAYERBOTS_AOEHEALVALUES_H
+#define PLAYERBOTS_AOEHEALVALUES_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/AoeValues.h b/src/Ai/Base/Value/AoeValues.h
index cefc1a10c..94f7c6cf7 100644
--- a/src/Ai/Base/Value/AoeValues.h
+++ b/src/Ai/Base/Value/AoeValues.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_AOEVALUES_H
-#define _PLAYERBOT_AOEVALUES_H
+#ifndef PLAYERBOTS_AOEVALUES_H
+#define PLAYERBOTS_AOEVALUES_H
 
 #include "AiObjectContext.h"
 #include "GameObject.h"
diff --git a/src/Ai/Base/Value/Arrow.h b/src/Ai/Base/Value/Arrow.h
index 3e5a76b8f..42de5d935 100644
--- a/src/Ai/Base/Value/Arrow.h
+++ b/src/Ai/Base/Value/Arrow.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ARROW_H
-#define _PLAYERBOT_ARROW_H
+#ifndef PLAYERBOTS_ARROW_H
+#define PLAYERBOTS_ARROW_H
 
 #include "Formations.h"
 #include "TravelMgr.h"
diff --git a/src/Ai/Base/Value/AttackerCountValues.h b/src/Ai/Base/Value/AttackerCountValues.h
index 651c34153..47214d864 100644
--- a/src/Ai/Base/Value/AttackerCountValues.h
+++ b/src/Ai/Base/Value/AttackerCountValues.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ATTACKERCOUNTVALUES_H
-#define _PLAYERBOT_ATTACKERCOUNTVALUES_H
+#ifndef PLAYERBOTS_ATTACKERCOUNTVALUES_H
+#define PLAYERBOTS_ATTACKERCOUNTVALUES_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/AttackerWithoutAuraTargetValue.h b/src/Ai/Base/Value/AttackerWithoutAuraTargetValue.h
index 5f1a4aa6c..cef8af99f 100644
--- a/src/Ai/Base/Value/AttackerWithoutAuraTargetValue.h
+++ b/src/Ai/Base/Value/AttackerWithoutAuraTargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ATTACKERWITHOUTAURATARGETVALUE_H
-#define _PLAYERBOT_ATTACKERWITHOUTAURATARGETVALUE_H
+#ifndef PLAYERBOTS_ATTACKERWITHOUTAURATARGETVALUE_H
+#define PLAYERBOTS_ATTACKERWITHOUTAURATARGETVALUE_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/AttackersValue.h b/src/Ai/Base/Value/AttackersValue.h
index 7e9397c86..27ae79039 100644
--- a/src/Ai/Base/Value/AttackersValue.h
+++ b/src/Ai/Base/Value/AttackersValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ATTACKERSVALUE_H
-#define _PLAYERBOT_ATTACKERSVALUE_H
+#ifndef PLAYERBOTS_ATTACKERSVALUE_H
+#define PLAYERBOTS_ATTACKERSVALUE_H
 
 #include "PlayerbotAIConfig.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/AvailableLootValue.h b/src/Ai/Base/Value/AvailableLootValue.h
index 4c2a62a84..0173c7405 100644
--- a/src/Ai/Base/Value/AvailableLootValue.h
+++ b/src/Ai/Base/Value/AvailableLootValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_AVAILABLELOOTVALUE_H
-#define _PLAYERBOT_AVAILABLELOOTVALUE_H
+#ifndef PLAYERBOTS_AVAILABLELOOTVALUE_H
+#define PLAYERBOTS_AVAILABLELOOTVALUE_H
 
 #include "LootObjectStack.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/BudgetValues.h b/src/Ai/Base/Value/BudgetValues.h
index 024d4a4f1..d7365f634 100644
--- a/src/Ai/Base/Value/BudgetValues.h
+++ b/src/Ai/Base/Value/BudgetValues.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_BUDGETVALUES_H
-#define _PLAYERBOT_BUDGETVALUES_H
+#ifndef PLAYERBOTS_BUDGETVALUES_H
+#define PLAYERBOTS_BUDGETVALUES_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/CcTargetValue.h b/src/Ai/Base/Value/CcTargetValue.h
index 8bc0483fc..c487523c4 100644
--- a/src/Ai/Base/Value/CcTargetValue.h
+++ b/src/Ai/Base/Value/CcTargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CCTARGETVALUE_H
-#define _PLAYERBOT_CCTARGETVALUE_H
+#ifndef PLAYERBOTS_CCTARGETVALUE_H
+#define PLAYERBOTS_CCTARGETVALUE_H
 
 #include "NamedObjectContext.h"
 #include "TargetValue.h"
diff --git a/src/Ai/Base/Value/ChatValue.h b/src/Ai/Base/Value/ChatValue.h
index af538fe18..d22ddac1d 100644
--- a/src/Ai/Base/Value/ChatValue.h
+++ b/src/Ai/Base/Value/ChatValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CHATVALUE_H
-#define _PLAYERBOT_CHATVALUE_H
+#ifndef PLAYERBOTS_CHATVALUE_H
+#define PLAYERBOTS_CHATVALUE_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/Value/CollisionValue.h b/src/Ai/Base/Value/CollisionValue.h
index 91802f222..e894b3162 100644
--- a/src/Ai/Base/Value/CollisionValue.h
+++ b/src/Ai/Base/Value/CollisionValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_COLLISIONVALUE_H
-#define _PLAYERBOT_COLLISIONVALUE_H
+#ifndef PLAYERBOTS_COLLISIONVALUE_H
+#define PLAYERBOTS_COLLISIONVALUE_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/CraftValue.h b/src/Ai/Base/Value/CraftValue.h
index d3311e6c8..2cff6e9f7 100644
--- a/src/Ai/Base/Value/CraftValue.h
+++ b/src/Ai/Base/Value/CraftValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CRAFTVALUE_H
-#define _PLAYERBOT_CRAFTVALUE_H
+#ifndef PLAYERBOTS_CRAFTVALUE_H
+#define PLAYERBOTS_CRAFTVALUE_H
 
 #include <map>
 
diff --git a/src/Ai/Base/Value/CurrentCcTargetValue.h b/src/Ai/Base/Value/CurrentCcTargetValue.h
index 708b1d704..8ca4e4102 100644
--- a/src/Ai/Base/Value/CurrentCcTargetValue.h
+++ b/src/Ai/Base/Value/CurrentCcTargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CURRENTCCTARGETVALUE_H
-#define _PLAYERBOT_CURRENTCCTARGETVALUE_H
+#ifndef PLAYERBOTS_CURRENTCCTARGETVALUE_H
+#define PLAYERBOTS_CURRENTCCTARGETVALUE_H
 
 #include "NamedObjectContext.h"
 #include "TargetValue.h"
diff --git a/src/Ai/Base/Value/CurrentTargetValue.h b/src/Ai/Base/Value/CurrentTargetValue.h
index 3cfbb4863..b7061980d 100644
--- a/src/Ai/Base/Value/CurrentTargetValue.h
+++ b/src/Ai/Base/Value/CurrentTargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CURRENTTARGETVALUE_H
-#define _PLAYERBOT_CURRENTTARGETVALUE_H
+#ifndef PLAYERBOTS_CURRENTTARGETVALUE_H
+#define PLAYERBOTS_CURRENTTARGETVALUE_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/Value/DistanceValue.h b/src/Ai/Base/Value/DistanceValue.h
index d5160f8cf..44dc8be26 100644
--- a/src/Ai/Base/Value/DistanceValue.h
+++ b/src/Ai/Base/Value/DistanceValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DISTANCEVALUE_H
-#define _PLAYERBOT_DISTANCEVALUE_H
+#ifndef PLAYERBOTS_DISTANCEVALUE_H
+#define PLAYERBOTS_DISTANCEVALUE_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/DpsTargetValue.h b/src/Ai/Base/Value/DpsTargetValue.h
index f45a122db..8d8cb82c0 100644
--- a/src/Ai/Base/Value/DpsTargetValue.h
+++ b/src/Ai/Base/Value/DpsTargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DPSTARGETVALUE_H
-#define _PLAYERBOT_DPSTARGETVALUE_H
+#ifndef PLAYERBOTS_DPSTARGETVALUE_H
+#define PLAYERBOTS_DPSTARGETVALUE_H
 
 #include "RtiTargetValue.h"
 
diff --git a/src/Ai/Base/Value/DuelTargetValue.h b/src/Ai/Base/Value/DuelTargetValue.h
index ca310fd64..ba7bd8e90 100644
--- a/src/Ai/Base/Value/DuelTargetValue.h
+++ b/src/Ai/Base/Value/DuelTargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DUELTARGETVALUE_H
-#define _PLAYERBOT_DUELTARGETVALUE_H
+#ifndef PLAYERBOTS_DUELTARGETVALUE_H
+#define PLAYERBOTS_DUELTARGETVALUE_H
 
 #include "TargetValue.h"
 
diff --git a/src/Ai/Base/Value/EnemyHealerTargetValue.h b/src/Ai/Base/Value/EnemyHealerTargetValue.h
index 57aec6d16..43d0ac140 100644
--- a/src/Ai/Base/Value/EnemyHealerTargetValue.h
+++ b/src/Ai/Base/Value/EnemyHealerTargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ENEMYHEALERTARGETVALUE_H
-#define _PLAYERBOT_ENEMYHEALERTARGETVALUE_H
+#ifndef PLAYERBOTS_ENEMYHEALERTARGETVALUE_H
+#define PLAYERBOTS_ENEMYHEALERTARGETVALUE_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/EnemyPlayerValue.h b/src/Ai/Base/Value/EnemyPlayerValue.h
index 2ff56f4eb..ef7441774 100644
--- a/src/Ai/Base/Value/EnemyPlayerValue.h
+++ b/src/Ai/Base/Value/EnemyPlayerValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ENEMYPLAYERVALUE_H
-#define _PLAYERBOT_ENEMYPLAYERVALUE_H
+#ifndef PLAYERBOTS_ENEMYPLAYERVALUE_H
+#define PLAYERBOTS_ENEMYPLAYERVALUE_H
 
 #include "PlayerbotAIConfig.h"
 #include "PossibleTargetsValue.h"
diff --git a/src/Ai/Base/Value/EstimatedLifetimeValue.h b/src/Ai/Base/Value/EstimatedLifetimeValue.h
index c412068ec..ef78d0241 100644
--- a/src/Ai/Base/Value/EstimatedLifetimeValue.h
+++ b/src/Ai/Base/Value/EstimatedLifetimeValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_EstimatedLifetimeValue_H
-#define _PLAYERBOT_EstimatedLifetimeValue_H
+#ifndef PLAYERBOTS_ESTIMATEDLIFETIMEVALUE_H
+#define PLAYERBOTS_ESTIMATEDLIFETIMEVALUE_H
 
 #include "NamedObjectContext.h"
 #include "PossibleTargetsValue.h"
diff --git a/src/Ai/Base/Value/FishValues.h b/src/Ai/Base/Value/FishValues.h
index 4304d6f45..afbad47b1 100644
--- a/src/Ai/Base/Value/FishValues.h
+++ b/src/Ai/Base/Value/FishValues.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_FISHVALUES_H
-#define _PLAYERBOT_FISHVALUES_H
+#ifndef PLAYERBOTS_FISHVALUES_H
+#define PLAYERBOTS_FISHVALUES_H
 
 #include "Value.h"
 #include "TravelMgr.h"
diff --git a/src/Ai/Base/Value/Formations.h b/src/Ai/Base/Value/Formations.h
index 3e5decf7f..e81497845 100644
--- a/src/Ai/Base/Value/Formations.h
+++ b/src/Ai/Base/Value/Formations.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_FORMATIONS_H
-#define _PLAYERBOT_FORMATIONS_H
+#ifndef PLAYERBOTS_FORMATIONS_H
+#define PLAYERBOTS_FORMATIONS_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Base/Value/GrindTargetValue.h b/src/Ai/Base/Value/GrindTargetValue.h
index 587037eb1..f767ecf2f 100644
--- a/src/Ai/Base/Value/GrindTargetValue.h
+++ b/src/Ai/Base/Value/GrindTargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GRINDTARGETVALUE_H
-#define _PLAYERBOT_GRINDTARGETVALUE_H
+#ifndef PLAYERBOTS_GRINDTARGETVALUE_H
+#define PLAYERBOTS_GRINDTARGETVALUE_H
 
 #include "TargetValue.h"
 
diff --git a/src/Ai/Base/Value/GroupLeaderValue.h b/src/Ai/Base/Value/GroupLeaderValue.h
index a35962043..25ad03a28 100644
--- a/src/Ai/Base/Value/GroupLeaderValue.h
+++ b/src/Ai/Base/Value/GroupLeaderValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GROUPLEADERVALUE_H
-#define _PLAYERBOT_GROUPLEADERVALUE_H
+#ifndef PLAYERBOTS_GROUPLEADERVALUE_H
+#define PLAYERBOTS_GROUPLEADERVALUE_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/Value/GroupValues.h b/src/Ai/Base/Value/GroupValues.h
index ba0473003..d9fa53382 100644
--- a/src/Ai/Base/Value/GroupValues.h
+++ b/src/Ai/Base/Value/GroupValues.h
@@ -3,6 +3,9 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
+#ifndef PLAYERBOTS_GROUPVALUES_H
+#define PLAYERBOTS_GROUPVALUES_H
+
 #include "NamedObjectContext.h"
 #include "Value.h"
 
@@ -71,3 +74,5 @@ public:
 
     bool Calculate() override;
 };
+
+#endif
diff --git a/src/Ai/Base/Value/GuildValues.h b/src/Ai/Base/Value/GuildValues.h
index ece61bc42..c4da82106 100644
--- a/src/Ai/Base/Value/GuildValues.h
+++ b/src/Ai/Base/Value/GuildValues.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GUILDVALUES_H
-#define _PLAYERBOT_GUILDVALUES_H
+#ifndef PLAYERBOTS_GUILDVALUES_H
+#define PLAYERBOTS_GUILDVALUES_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/Value/HasAvailableLootValue.h b/src/Ai/Base/Value/HasAvailableLootValue.h
index 9b8200b56..754918ac5 100644
--- a/src/Ai/Base/Value/HasAvailableLootValue.h
+++ b/src/Ai/Base/Value/HasAvailableLootValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_HASAVAILABLELOOTVALUE_H
-#define _PLAYERBOT_HASAVAILABLELOOTVALUE_H
+#ifndef PLAYERBOTS_HASAVAILABLELOOTVALUE_H
+#define PLAYERBOTS_HASAVAILABLELOOTVALUE_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/Value/HasTotemValue.h b/src/Ai/Base/Value/HasTotemValue.h
index a43d8f204..41f1c7d59 100644
--- a/src/Ai/Base/Value/HasTotemValue.h
+++ b/src/Ai/Base/Value/HasTotemValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_HASTOTEMVALUE_H
-#define _PLAYERBOT_HASTOTEMVALUE_H
+#ifndef PLAYERBOTS_HASTOTEMVALUE_H
+#define PLAYERBOTS_HASTOTEMVALUE_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/InvalidTargetValue.h b/src/Ai/Base/Value/InvalidTargetValue.h
index bc105dd7b..e8435c85c 100644
--- a/src/Ai/Base/Value/InvalidTargetValue.h
+++ b/src/Ai/Base/Value/InvalidTargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_INVALIDTARGETVALUE_H
-#define _PLAYERBOT_INVALIDTARGETVALUE_H
+#ifndef PLAYERBOTS_INVALIDTARGETVALUE_H
+#define PLAYERBOTS_INVALIDTARGETVALUE_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/IsBehindValue.h b/src/Ai/Base/Value/IsBehindValue.h
index bf09898ee..63db63c40 100644
--- a/src/Ai/Base/Value/IsBehindValue.h
+++ b/src/Ai/Base/Value/IsBehindValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ISBEHINDVALUE_H
-#define _PLAYERBOT_ISBEHINDVALUE_H
+#ifndef PLAYERBOTS_ISBEHINDVALUE_H
+#define PLAYERBOTS_ISBEHINDVALUE_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/IsFacingValue.h b/src/Ai/Base/Value/IsFacingValue.h
index 1e6a36864..76f914683 100644
--- a/src/Ai/Base/Value/IsFacingValue.h
+++ b/src/Ai/Base/Value/IsFacingValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ISFACINGVALUE_H
-#define _PLAYERBOT_ISFACINGVALUE_H
+#ifndef PLAYERBOTS_ISFACINGVALUE_H
+#define PLAYERBOTS_ISFACINGVALUE_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/IsMovingValue.h b/src/Ai/Base/Value/IsMovingValue.h
index fa68693a6..5a715d4d8 100644
--- a/src/Ai/Base/Value/IsMovingValue.h
+++ b/src/Ai/Base/Value/IsMovingValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ISMOVINGVALUE_H
-#define _PLAYERBOT_ISMOVINGVALUE_H
+#ifndef PLAYERBOTS_ISMOVINGVALUE_H
+#define PLAYERBOTS_ISMOVINGVALUE_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/ItemCountValue.h b/src/Ai/Base/Value/ItemCountValue.h
index 7e47565fc..ff6b6310a 100644
--- a/src/Ai/Base/Value/ItemCountValue.h
+++ b/src/Ai/Base/Value/ItemCountValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ITEMCOUNTVALUE_H
-#define _PLAYERBOT_ITEMCOUNTVALUE_H
+#ifndef PLAYERBOTS_ITEMCOUNTVALUE_H
+#define PLAYERBOTS_ITEMCOUNTVALUE_H
 
 #include "InventoryAction.h"
 #include "Item.h"
diff --git a/src/Ai/Base/Value/ItemForSpellValue.h b/src/Ai/Base/Value/ItemForSpellValue.h
index ea7a52bcd..602cbfc34 100644
--- a/src/Ai/Base/Value/ItemForSpellValue.h
+++ b/src/Ai/Base/Value/ItemForSpellValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ITEMFORSPELLVALUE_H
-#define _PLAYERBOT_ITEMFORSPELLVALUE_H
+#ifndef PLAYERBOTS_ITEMFORSPELLVALUE_H
+#define PLAYERBOTS_ITEMFORSPELLVALUE_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/ItemUsageValue.h b/src/Ai/Base/Value/ItemUsageValue.h
index b759bab6a..9aa9dadc0 100644
--- a/src/Ai/Base/Value/ItemUsageValue.h
+++ b/src/Ai/Base/Value/ItemUsageValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ITEMUSAGEVALUE_H
-#define _PLAYERBOT_ITEMUSAGEVALUE_H
+#ifndef PLAYERBOTS_ITEMUSAGEVALUE_H
+#define PLAYERBOTS_ITEMUSAGEVALUE_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/LastMovementValue.h b/src/Ai/Base/Value/LastMovementValue.h
index ef09d31fe..99a2b4c37 100644
--- a/src/Ai/Base/Value/LastMovementValue.h
+++ b/src/Ai/Base/Value/LastMovementValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LASTMOVEMENTVALUE_H
-#define _PLAYERBOT_LASTMOVEMENTVALUE_H
+#ifndef PLAYERBOTS_LASTMOVEMENTVALUE_H
+#define PLAYERBOTS_LASTMOVEMENTVALUE_H
 
 #include "ObjectGuid.h"
 #include "TravelNode.h"
diff --git a/src/Ai/Base/Value/LastSaidValue.h b/src/Ai/Base/Value/LastSaidValue.h
index 443055866..e2c6873b2 100644
--- a/src/Ai/Base/Value/LastSaidValue.h
+++ b/src/Ai/Base/Value/LastSaidValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LASTSAIDVALUE_H
-#define _PLAYERBOT_LASTSAIDVALUE_H
+#ifndef PLAYERBOTS_LASTSAIDVALUE_H
+#define PLAYERBOTS_LASTSAIDVALUE_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/LastSpellCastTimeValue.h b/src/Ai/Base/Value/LastSpellCastTimeValue.h
index 984ed8032..9d3d70c20 100644
--- a/src/Ai/Base/Value/LastSpellCastTimeValue.h
+++ b/src/Ai/Base/Value/LastSpellCastTimeValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LASTSPELLCASTTIMEVALUE_H
-#define _PLAYERBOT_LASTSPELLCASTTIMEVALUE_H
+#ifndef PLAYERBOTS_LASTSPELLCASTTIMEVALUE_H
+#define PLAYERBOTS_LASTSPELLCASTTIMEVALUE_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/LastSpellCastValue.h b/src/Ai/Base/Value/LastSpellCastValue.h
index fda18e8b6..273bcb255 100644
--- a/src/Ai/Base/Value/LastSpellCastValue.h
+++ b/src/Ai/Base/Value/LastSpellCastValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LASTSPELLCASTVALUE_H
-#define _PLAYERBOT_LASTSPELLCASTVALUE_H
+#ifndef PLAYERBOTS_LASTSPELLCASTVALUE_H
+#define PLAYERBOTS_LASTSPELLCASTVALUE_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/Value/LeastHpTargetValue.h b/src/Ai/Base/Value/LeastHpTargetValue.h
index 01f40656b..5f7b2c74a 100644
--- a/src/Ai/Base/Value/LeastHpTargetValue.h
+++ b/src/Ai/Base/Value/LeastHpTargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LEASTHPTARGETVALUE_H
-#define _PLAYERBOT_LEASTHPTARGETVALUE_H
+#ifndef PLAYERBOTS_LEASTHPTARGETVALUE_H
+#define PLAYERBOTS_LEASTHPTARGETVALUE_H
 
 #include "TargetValue.h"
 
diff --git a/src/Ai/Base/Value/LfgValues.h b/src/Ai/Base/Value/LfgValues.h
index d6ff5c990..a0224c6c5 100644
--- a/src/Ai/Base/Value/LfgValues.h
+++ b/src/Ai/Base/Value/LfgValues.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LFGVALUES_H
-#define _PLAYERBOT_LFGVALUES_H
+#ifndef PLAYERBOTS_LFGVALUES_H
+#define PLAYERBOTS_LFGVALUES_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/Value/LineTargetValue.h b/src/Ai/Base/Value/LineTargetValue.h
index 6f1d1c532..ab08e45aa 100644
--- a/src/Ai/Base/Value/LineTargetValue.h
+++ b/src/Ai/Base/Value/LineTargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LINETARGETVALUE_H
-#define _PLAYERBOT_LINETARGETVALUE_H
+#ifndef PLAYERBOTS_LINETARGETVALUE_H
+#define PLAYERBOTS_LINETARGETVALUE_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/Value/LogLevelValue.h b/src/Ai/Base/Value/LogLevelValue.h
index f8515b13b..855818f16 100644
--- a/src/Ai/Base/Value/LogLevelValue.h
+++ b/src/Ai/Base/Value/LogLevelValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LOGLEVELVALUE_H
-#define _PLAYERBOT_LOGLEVELVALUE_H
+#ifndef PLAYERBOTS_LOGLEVELVALUE_H
+#define PLAYERBOTS_LOGLEVELVALUE_H
 
 #include "LogCommon.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/LootStrategyValue.h b/src/Ai/Base/Value/LootStrategyValue.h
index dc3f94cc7..d52691521 100644
--- a/src/Ai/Base/Value/LootStrategyValue.h
+++ b/src/Ai/Base/Value/LootStrategyValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LOOTSTRATEGYVALUE_H
-#define _PLAYERBOT_LOOTSTRATEGYVALUE_H
+#ifndef PLAYERBOTS_LOOTSTRATEGYVALUE_H
+#define PLAYERBOTS_LOOTSTRATEGYVALUE_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/Value/LootValues.h b/src/Ai/Base/Value/LootValues.h
index 7945f3f40..b16653fdd 100644
--- a/src/Ai/Base/Value/LootValues.h
+++ b/src/Ai/Base/Value/LootValues.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LOOTVALUES_H
-#define _PLAYERBOT_LOOTVALUES_H
+#ifndef PLAYERBOTS_LOOTVALUES_H
+#define PLAYERBOTS_LOOTVALUES_H
 
 #include "ItemUsageValue.h"
 #include "LootMgr.h"
diff --git a/src/Ai/Base/Value/MaintenanceValues.h b/src/Ai/Base/Value/MaintenanceValues.h
index 7efcb593d..abe92253f 100644
--- a/src/Ai/Base/Value/MaintenanceValues.h
+++ b/src/Ai/Base/Value/MaintenanceValues.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_MAINTANCEVALUE_H
-#define _PLAYERBOT_MAINTANCEVALUE_H
+#ifndef PLAYERBOTS_MAINTENANCEVALUES_H
+#define PLAYERBOTS_MAINTENANCEVALUES_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/Value/ManaSaveLevelValue.h b/src/Ai/Base/Value/ManaSaveLevelValue.h
index f406998f1..9cc0b544e 100644
--- a/src/Ai/Base/Value/ManaSaveLevelValue.h
+++ b/src/Ai/Base/Value/ManaSaveLevelValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_MANASAVELEVELVALUE_H
-#define _PLAYERBOT_MANASAVELEVELVALUE_H
+#ifndef PLAYERBOTS_MANASAVELEVELVALUE_H
+#define PLAYERBOTS_MANASAVELEVELVALUE_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/Value/NearestAdsValue.h b/src/Ai/Base/Value/NearestAdsValue.h
index b9e3fbe31..d400def74 100644
--- a/src/Ai/Base/Value/NearestAdsValue.h
+++ b/src/Ai/Base/Value/NearestAdsValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_NEARESTADSVALUE_H
-#define _PLAYERBOT_NEARESTADSVALUE_H
+#ifndef PLAYERBOTS_NEARESTADSVALUE_H
+#define PLAYERBOTS_NEARESTADSVALUE_H
 
 #include "PlayerbotAIConfig.h"
 #include "PossibleTargetsValue.h"
diff --git a/src/Ai/Base/Value/NearestCorpsesValue.h b/src/Ai/Base/Value/NearestCorpsesValue.h
index f6a067c3f..56365550a 100644
--- a/src/Ai/Base/Value/NearestCorpsesValue.h
+++ b/src/Ai/Base/Value/NearestCorpsesValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_NEARESTCORPSESVALUE_H
-#define _PLAYERBOT_NEARESTCORPSESVALUE_H
+#ifndef PLAYERBOTS_NEARESTCORPSESVALUE_H
+#define PLAYERBOTS_NEARESTCORPSESVALUE_H
 
 #include "NearestUnitsValue.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Base/Value/NearestFriendlyPlayersValue.h b/src/Ai/Base/Value/NearestFriendlyPlayersValue.h
index 258840904..329a3d456 100644
--- a/src/Ai/Base/Value/NearestFriendlyPlayersValue.h
+++ b/src/Ai/Base/Value/NearestFriendlyPlayersValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_NEARESTFRIENDLYPLAYERSVALUES_H
-#define _PLAYERBOT_NEARESTFRIENDLYPLAYERSVALUES_H
+#ifndef PLAYERBOTS_NEARESTFRIENDLYPLAYERSVALUE_H
+#define PLAYERBOTS_NEARESTFRIENDLYPLAYERSVALUE_H
 
 #include "NearestUnitsValue.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Base/Value/NearestGameObjects.h b/src/Ai/Base/Value/NearestGameObjects.h
index 9d1153aad..53c85eed4 100644
--- a/src/Ai/Base/Value/NearestGameObjects.h
+++ b/src/Ai/Base/Value/NearestGameObjects.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_NEARESTGAMEOBJECTS_H
-#define _PLAYERBOT_NEARESTGAMEOBJECTS_H
+#ifndef PLAYERBOTS_NEARESTGAMEOBJECTS_H
+#define PLAYERBOTS_NEARESTGAMEOBJECTS_H
 
 #include "PlayerbotAIConfig.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/NearestNonBotPlayersValue.h b/src/Ai/Base/Value/NearestNonBotPlayersValue.h
index 1980bcf2b..ebd6928d9 100644
--- a/src/Ai/Base/Value/NearestNonBotPlayersValue.h
+++ b/src/Ai/Base/Value/NearestNonBotPlayersValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_NEARESTNONBOTPLAYERSVALUE_H
-#define _PLAYERBOT_NEARESTNONBOTPLAYERSVALUE_H
+#ifndef PLAYERBOTS_NEARESTNONBOTPLAYERSVALUE_H
+#define PLAYERBOTS_NEARESTNONBOTPLAYERSVALUE_H
 
 #include "NearestUnitsValue.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Base/Value/NearestNpcsValue.h b/src/Ai/Base/Value/NearestNpcsValue.h
index 71e1d9de4..02eada2a0 100644
--- a/src/Ai/Base/Value/NearestNpcsValue.h
+++ b/src/Ai/Base/Value/NearestNpcsValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_NEARESTNPCSVALUE_H
-#define _PLAYERBOT_NEARESTNPCSVALUE_H
+#ifndef PLAYERBOTS_NEARESTNPCSVALUE_H
+#define PLAYERBOTS_NEARESTNPCSVALUE_H
 
 #include "NearestUnitsValue.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Base/Value/NearestUnitsValue.h b/src/Ai/Base/Value/NearestUnitsValue.h
index 5e00cb6d0..80208f339 100644
--- a/src/Ai/Base/Value/NearestUnitsValue.h
+++ b/src/Ai/Base/Value/NearestUnitsValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_NEARESTUNITSVALUE_H
-#define _PLAYERBOT_NEARESTUNITSVALUE_H
+#ifndef PLAYERBOTS_NEARESTUNITSVALUE_H
+#define PLAYERBOTS_NEARESTUNITSVALUE_H
 
 #include "PlayerbotAIConfig.h"
 #include "Unit.h"
diff --git a/src/Ai/Base/Value/NewPlayerNearbyValue.h b/src/Ai/Base/Value/NewPlayerNearbyValue.h
index e26ec0dcb..d1c9a3eb1 100644
--- a/src/Ai/Base/Value/NewPlayerNearbyValue.h
+++ b/src/Ai/Base/Value/NewPlayerNearbyValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_NEWPLAYERNEARBYVALUE_H
-#define _PLAYERBOT_NEWPLAYERNEARBYVALUE_H
+#ifndef PLAYERBOTS_NEWPLAYERNEARBYVALUE_H
+#define PLAYERBOTS_NEWPLAYERNEARBYVALUE_H
 
 #include "ObjectGuid.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/OutfitListValue.h b/src/Ai/Base/Value/OutfitListValue.h
index fbb5984fa..2c54a62c5 100644
--- a/src/Ai/Base/Value/OutfitListValue.h
+++ b/src/Ai/Base/Value/OutfitListValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_OUTFITLISTVALUE_H
-#define _PLAYERBOT_OUTFITLISTVALUE_H
+#ifndef PLAYERBOTS_OUTFITLISTVALUE_H
+#define PLAYERBOTS_OUTFITLISTVALUE_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/Value/PartyMemberSnaredTargetValue.h b/src/Ai/Base/Value/PartyMemberSnaredTargetValue.h
index d7b517e38..b5ee55962 100644
--- a/src/Ai/Base/Value/PartyMemberSnaredTargetValue.h
+++ b/src/Ai/Base/Value/PartyMemberSnaredTargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PARTYMEMBERSNAREDTARGETVALUE_H
-#define _PLAYERBOT_PARTYMEMBERSNAREDTARGETVALUE_H
+#ifndef PLAYERBOTS_PARTYMEMBERSNAREDTARGETVALUE_H
+#define PLAYERBOTS_PARTYMEMBERSNAREDTARGETVALUE_H
 
 #include "NamedObjectContext.h"
 #include "PartyMemberValue.h"
diff --git a/src/Ai/Base/Value/PartyMemberToDispel.h b/src/Ai/Base/Value/PartyMemberToDispel.h
index 04e7e9b13..b8fb87935 100644
--- a/src/Ai/Base/Value/PartyMemberToDispel.h
+++ b/src/Ai/Base/Value/PartyMemberToDispel.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PARTYMEMBERTODISPEL_H
-#define _PLAYERBOT_PARTYMEMBERTODISPEL_H
+#ifndef PLAYERBOTS_PARTYMEMBERTODISPEL_H
+#define PLAYERBOTS_PARTYMEMBERTODISPEL_H
 
 #include "NamedObjectContext.h"
 #include "PartyMemberValue.h"
diff --git a/src/Ai/Base/Value/PartyMemberToHeal.h b/src/Ai/Base/Value/PartyMemberToHeal.h
index 6a255b724..aab42317e 100644
--- a/src/Ai/Base/Value/PartyMemberToHeal.h
+++ b/src/Ai/Base/Value/PartyMemberToHeal.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PARTYMEMBERTOHEAL_H
-#define _PLAYERBOT_PARTYMEMBERTOHEAL_H
+#ifndef PLAYERBOTS_PARTYMEMBERTOHEAL_H
+#define PLAYERBOTS_PARTYMEMBERTOHEAL_H
 
 #include "PartyMemberValue.h"
 
diff --git a/src/Ai/Base/Value/PartyMemberToResurrect.h b/src/Ai/Base/Value/PartyMemberToResurrect.h
index 14e94b735..97e7d2076 100644
--- a/src/Ai/Base/Value/PartyMemberToResurrect.h
+++ b/src/Ai/Base/Value/PartyMemberToResurrect.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PARTYMEMBERTORESURRECT_H
-#define _PLAYERBOT_PARTYMEMBERTORESURRECT_H
+#ifndef PLAYERBOTS_PARTYMEMBERTORESURRECT_H
+#define PLAYERBOTS_PARTYMEMBERTORESURRECT_H
 
 #include "PartyMemberValue.h"
 
diff --git a/src/Ai/Base/Value/PartyMemberValue.h b/src/Ai/Base/Value/PartyMemberValue.h
index 4d52ac61d..de0abbc36 100644
--- a/src/Ai/Base/Value/PartyMemberValue.h
+++ b/src/Ai/Base/Value/PartyMemberValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PARTYMEMBERVALUE_H
-#define _PLAYERBOT_PARTYMEMBERVALUE_H
+#ifndef PLAYERBOTS_PARTYMEMBERVALUE_H
+#define PLAYERBOTS_PARTYMEMBERVALUE_H
 
 #include "Player.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/PartyMemberWithoutAuraValue.h b/src/Ai/Base/Value/PartyMemberWithoutAuraValue.h
index 6d95a3131..4094c596f 100644
--- a/src/Ai/Base/Value/PartyMemberWithoutAuraValue.h
+++ b/src/Ai/Base/Value/PartyMemberWithoutAuraValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PARTYMEMBERWITHOUTAURAVALUE_H
-#define _PLAYERBOT_PARTYMEMBERWITHOUTAURAVALUE_H
+#ifndef PLAYERBOTS_PARTYMEMBERWITHOUTAURAVALUE_H
+#define PLAYERBOTS_PARTYMEMBERWITHOUTAURAVALUE_H
 
 #include "NamedObjectContext.h"
 #include "PartyMemberValue.h"
diff --git a/src/Ai/Base/Value/PartyMemberWithoutItemValue.h b/src/Ai/Base/Value/PartyMemberWithoutItemValue.h
index 379835543..b6626adf3 100644
--- a/src/Ai/Base/Value/PartyMemberWithoutItemValue.h
+++ b/src/Ai/Base/Value/PartyMemberWithoutItemValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PARTYMEMBERWITHOUTITEMVALUE_H
-#define _PLAYERBOT_PARTYMEMBERWITHOUTITEMVALUE_H
+#ifndef PLAYERBOTS_PARTYMEMBERWITHOUTITEMVALUE_H
+#define PLAYERBOTS_PARTYMEMBERWITHOUTITEMVALUE_H
 
 #include "NamedObjectContext.h"
 #include "PartyMemberValue.h"
diff --git a/src/Ai/Base/Value/PetTargetValue.h b/src/Ai/Base/Value/PetTargetValue.h
index 368acdc9d..86e054035 100644
--- a/src/Ai/Base/Value/PetTargetValue.h
+++ b/src/Ai/Base/Value/PetTargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PETTARGETVALUE_H
-#define _PLAYERBOT_PETTARGETVALUE_H
+#ifndef PLAYERBOTS_PETTARGETVALUE_H
+#define PLAYERBOTS_PETTARGETVALUE_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/Value/PositionValue.h b/src/Ai/Base/Value/PositionValue.h
index a0123dafc..e12b6e95f 100644
--- a/src/Ai/Base/Value/PositionValue.h
+++ b/src/Ai/Base/Value/PositionValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_POSITIONVALUE_H
-#define _PLAYERBOT_POSITIONVALUE_H
+#ifndef PLAYERBOTS_POSITIONVALUE_H
+#define PLAYERBOTS_POSITIONVALUE_H
 
 #include "NamedObjectContext.h"
 #include "TravelMgr.h"
diff --git a/src/Ai/Base/Value/PossibleRpgTargetsValue.h b/src/Ai/Base/Value/PossibleRpgTargetsValue.h
index 00e5f8012..968e7308f 100644
--- a/src/Ai/Base/Value/PossibleRpgTargetsValue.h
+++ b/src/Ai/Base/Value/PossibleRpgTargetsValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_POSSIBLERPGTARGETSVALUE_H
-#define _PLAYERBOT_POSSIBLERPGTARGETSVALUE_H
+#ifndef PLAYERBOTS_POSSIBLERPGTARGETSVALUE_H
+#define PLAYERBOTS_POSSIBLERPGTARGETSVALUE_H
 
 #include "NearestGameObjects.h"
 #include "NearestUnitsValue.h"
diff --git a/src/Ai/Base/Value/PossibleTargetsValue.h b/src/Ai/Base/Value/PossibleTargetsValue.h
index c710c2676..fa97b735c 100644
--- a/src/Ai/Base/Value/PossibleTargetsValue.h
+++ b/src/Ai/Base/Value/PossibleTargetsValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_POSSIBLETARGETSVALUE_H
-#define _PLAYERBOT_POSSIBLETARGETSVALUE_H
+#ifndef PLAYERBOTS_POSSIBLETARGETSVALUE_H
+#define PLAYERBOTS_POSSIBLETARGETSVALUE_H
 
 #include "NearestUnitsValue.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Base/Value/PvpValues.h b/src/Ai/Base/Value/PvpValues.h
index bad46b951..c8f708adf 100644
--- a/src/Ai/Base/Value/PvpValues.h
+++ b/src/Ai/Base/Value/PvpValues.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PVPVALUES_H
-#define _PLAYERBOT_PVPVALUES_H
+#ifndef PLAYERBOTS_PVPVALUES_H
+#define PLAYERBOTS_PVPVALUES_H
 
 #include "NamedObjectContext.h"
 #include "SharedDefines.h"
diff --git a/src/Ai/Base/Value/QuestValues.h b/src/Ai/Base/Value/QuestValues.h
index a3ece1fd2..66ae9bc06 100644
--- a/src/Ai/Base/Value/QuestValues.h
+++ b/src/Ai/Base/Value/QuestValues.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_QUESTVALUES_H
-#define _PLAYERBOT_QUESTVALUES_H
+#ifndef PLAYERBOTS_QUESTVALUES_H
+#define PLAYERBOTS_QUESTVALUES_H
 
 #include "NamedObjectContext.h"
 #include "TravelMgr.h"
diff --git a/src/Ai/Base/Value/RTSCValues.h b/src/Ai/Base/Value/RTSCValues.h
index d5ca7b58d..424295a8a 100644
--- a/src/Ai/Base/Value/RTSCValues.h
+++ b/src/Ai/Base/Value/RTSCValues.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RTSCVALUE_H
-#define _PLAYERBOT_RTSCVALUE_H
+#ifndef PLAYERBOTS_RTSCVALUES_H
+#define PLAYERBOTS_RTSCVALUES_H
 
 #include "NamedObjectContext.h"
 #include "TravelMgr.h"
diff --git a/src/Ai/Base/Value/RandomBotUpdateValue.h b/src/Ai/Base/Value/RandomBotUpdateValue.h
index ee3c50105..54e5fd3f9 100644
--- a/src/Ai/Base/Value/RandomBotUpdateValue.h
+++ b/src/Ai/Base/Value/RandomBotUpdateValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RANDOMBOTUPDATEVALUE_H
-#define _PLAYERBOT_RANDOMBOTUPDATEVALUE_H
+#ifndef PLAYERBOTS_RANDOMBOTUPDATEVALUE_H
+#define PLAYERBOTS_RANDOMBOTUPDATEVALUE_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/Value/RangeValues.h b/src/Ai/Base/Value/RangeValues.h
index 0728be2a2..25996ff5d 100644
--- a/src/Ai/Base/Value/RangeValues.h
+++ b/src/Ai/Base/Value/RangeValues.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RANGEVALUES_H
-#define _PLAYERBOT_RANGEVALUES_H
+#ifndef PLAYERBOTS_RANGEVALUES_H
+#define PLAYERBOTS_RANGEVALUES_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/RtiTargetValue.h b/src/Ai/Base/Value/RtiTargetValue.h
index c2f3d607a..450766666 100644
--- a/src/Ai/Base/Value/RtiTargetValue.h
+++ b/src/Ai/Base/Value/RtiTargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RTITARGETVALUE_H
-#define _PLAYERBOT_RTITARGETVALUE_H
+#ifndef PLAYERBOTS_RTITARGETVALUE_H
+#define PLAYERBOTS_RTITARGETVALUE_H
 
 #include "TargetValue.h"
 
diff --git a/src/Ai/Base/Value/RtiValue.h b/src/Ai/Base/Value/RtiValue.h
index f4a2efbe7..b0a19361b 100644
--- a/src/Ai/Base/Value/RtiValue.h
+++ b/src/Ai/Base/Value/RtiValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RTIVALUE_H
-#define _PLAYERBOT_RTIVALUE_H
+#ifndef PLAYERBOTS_RTIVALUE_H
+#define PLAYERBOTS_RTIVALUE_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/Value/SelfTargetValue.h b/src/Ai/Base/Value/SelfTargetValue.h
index 1de04e1cd..e1077be94 100644
--- a/src/Ai/Base/Value/SelfTargetValue.h
+++ b/src/Ai/Base/Value/SelfTargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SELFTARGETVALUE_H
-#define _PLAYERBOT_SELFTARGETVALUE_H
+#ifndef PLAYERBOTS_SELFTARGETVALUE_H
+#define PLAYERBOTS_SELFTARGETVALUE_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/Value/SkipSpellsListValue.h b/src/Ai/Base/Value/SkipSpellsListValue.h
index 55eb745a9..50095a59a 100644
--- a/src/Ai/Base/Value/SkipSpellsListValue.h
+++ b/src/Ai/Base/Value/SkipSpellsListValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SKIPSPELLSLISTVALUE_H
-#define _PLAYERBOT_SKIPSPELLSLISTVALUE_H
+#ifndef PLAYERBOTS_SKIPSPELLSLISTVALUE_H
+#define PLAYERBOTS_SKIPSPELLSLISTVALUE_H
 
 #include <set>
 
diff --git a/src/Ai/Base/Value/SnareTargetValue.h b/src/Ai/Base/Value/SnareTargetValue.h
index 5ff976daf..c1baf3e68 100644
--- a/src/Ai/Base/Value/SnareTargetValue.h
+++ b/src/Ai/Base/Value/SnareTargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SNARETARGETVALUE_H
-#define _PLAYERBOT_SNARETARGETVALUE_H
+#ifndef PLAYERBOTS_SNARETARGETVALUE_H
+#define PLAYERBOTS_SNARETARGETVALUE_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/SpellCastUsefulValue.h b/src/Ai/Base/Value/SpellCastUsefulValue.h
index 789243341..a13445aa5 100644
--- a/src/Ai/Base/Value/SpellCastUsefulValue.h
+++ b/src/Ai/Base/Value/SpellCastUsefulValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SPELLCASTUSEFULVALUE_H
-#define _PLAYERBOT_SPELLCASTUSEFULVALUE_H
+#ifndef PLAYERBOTS_SPELLCASTUSEFULVALUE_H
+#define PLAYERBOTS_SPELLCASTUSEFULVALUE_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/SpellIdValue.h b/src/Ai/Base/Value/SpellIdValue.h
index 3df8e8229..2f3f6a741 100644
--- a/src/Ai/Base/Value/SpellIdValue.h
+++ b/src/Ai/Base/Value/SpellIdValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SPELLIDVALUE_H
-#define _PLAYERBOT_SPELLIDVALUE_H
+#ifndef PLAYERBOTS_SPELLIDVALUE_H
+#define PLAYERBOTS_SPELLIDVALUE_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/Stances.h b/src/Ai/Base/Value/Stances.h
index 16ad14de2..e75d48dd8 100644
--- a/src/Ai/Base/Value/Stances.h
+++ b/src/Ai/Base/Value/Stances.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_STANCES_H
-#define _PLAYERBOT_STANCES_H
+#ifndef PLAYERBOTS_STANCES_H
+#define PLAYERBOTS_STANCES_H
 
 #include "Action.h"
 #include "Formations.h"
diff --git a/src/Ai/Base/Value/StatsValues.h b/src/Ai/Base/Value/StatsValues.h
index 27cad01f1..a864fa28c 100644
--- a/src/Ai/Base/Value/StatsValues.h
+++ b/src/Ai/Base/Value/StatsValues.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_STATSVALUE_H
-#define _PLAYERBOT_STATSVALUE_H
+#ifndef PLAYERBOTS_STATSVALUES_H
+#define PLAYERBOTS_STATSVALUES_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/TankTargetValue.h b/src/Ai/Base/Value/TankTargetValue.h
index 8aee6182e..041915e45 100644
--- a/src/Ai/Base/Value/TankTargetValue.h
+++ b/src/Ai/Base/Value/TankTargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TANKTARGETVALUE_H
-#define _PLAYERBOT_TANKTARGETVALUE_H
+#ifndef PLAYERBOTS_TANKTARGETVALUE_H
+#define PLAYERBOTS_TANKTARGETVALUE_H
 
 #include "TargetValue.h"
 
diff --git a/src/Ai/Base/Value/TargetValue.h b/src/Ai/Base/Value/TargetValue.h
index 94fcbdf8a..1ef0d1273 100644
--- a/src/Ai/Base/Value/TargetValue.h
+++ b/src/Ai/Base/Value/TargetValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TARGETVALUE_H
-#define _PLAYERBOT_TARGETVALUE_H
+#ifndef PLAYERBOTS_TARGETVALUE_H
+#define PLAYERBOTS_TARGETVALUE_H
 
 #include "NamedObjectContext.h"
 #include "TravelMgr.h"
diff --git a/src/Ai/Base/Value/ThreatValues.h b/src/Ai/Base/Value/ThreatValues.h
index 845a8c958..5202ef4bd 100644
--- a/src/Ai/Base/Value/ThreatValues.h
+++ b/src/Ai/Base/Value/ThreatValues.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_THREATVALUES_H
-#define _PLAYERBOT_THREATVALUES_H
+#ifndef PLAYERBOTS_THREATVALUES_H
+#define PLAYERBOTS_THREATVALUES_H
 
 #include "NamedObjectContext.h"
 #include "Value.h"
diff --git a/src/Ai/Base/Value/WaitForAttackTimeValue.h b/src/Ai/Base/Value/WaitForAttackTimeValue.h
index c2d26a430..12e72ffbb 100644
--- a/src/Ai/Base/Value/WaitForAttackTimeValue.h
+++ b/src/Ai/Base/Value/WaitForAttackTimeValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WAITFORATTACKTIMEVALUE_H
-#define _PLAYERBOT_WAITFORATTACKTIMEVALUE_H
+#ifndef PLAYERBOTS_WAITFORATTACKTIMEVALUE_H
+#define PLAYERBOTS_WAITFORATTACKTIMEVALUE_H
 
 #include "Value.h"
 
diff --git a/src/Ai/Base/ValueContext.h b/src/Ai/Base/ValueContext.h
index 4070da80b..392621025 100644
--- a/src/Ai/Base/ValueContext.h
+++ b/src/Ai/Base/ValueContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_VALUECONTEXT_H
-#define _PLAYERBOT_VALUECONTEXT_H
+#ifndef PLAYERBOTS_VALUECONTEXT_H
+#define PLAYERBOTS_VALUECONTEXT_H
 
 #include "ActiveSpellValue.h"
 #include "AggressiveTargetValue.h"
diff --git a/src/Ai/Base/WorldPacketActionContext.h b/src/Ai/Base/WorldPacketActionContext.h
index 839a88655..9aa7eeaf6 100644
--- a/src/Ai/Base/WorldPacketActionContext.h
+++ b/src/Ai/Base/WorldPacketActionContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WORLDPACKETACTIONCONTEXT_H
-#define _PLAYERBOT_WORLDPACKETACTIONCONTEXT_H
+#ifndef PLAYERBOTS_WORLDPACKETACTIONCONTEXT_H
+#define PLAYERBOTS_WORLDPACKETACTIONCONTEXT_H
 
 #include "AcceptBattlegroundInvitationAction.h"
 #include "AcceptDuelAction.h"
diff --git a/src/Ai/Base/WorldPacketTriggerContext.h b/src/Ai/Base/WorldPacketTriggerContext.h
index 62afafd1a..3a9a20364 100644
--- a/src/Ai/Base/WorldPacketTriggerContext.h
+++ b/src/Ai/Base/WorldPacketTriggerContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WORLDPACKETTRIGGERCONTEXT_H
-#define _PLAYERBOT_WORLDPACKETTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_WORLDPACKETTRIGGERCONTEXT_H
+#define PLAYERBOTS_WORLDPACKETTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "WithinAreaTrigger.h"
diff --git a/src/Ai/Class/Dk/DKActions.h b/src/Ai/Class/Dk/DKActions.h
index 5e8bf968f..6212a20fe 100644
--- a/src/Ai/Class/Dk/DKActions.h
+++ b/src/Ai/Class/Dk/DKActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DKACTIONS_H
-#define _PLAYERBOT_DKACTIONS_H
+#ifndef PLAYERBOTS_DKACTIONS_H
+#define PLAYERBOTS_DKACTIONS_H
 
 #include "Event.h"
 #include "GenericSpellActions.h"
diff --git a/src/Ai/Class/Dk/DKAiObjectContext.h b/src/Ai/Class/Dk/DKAiObjectContext.h
index 8921df718..1a2eac31b 100644
--- a/src/Ai/Class/Dk/DKAiObjectContext.h
+++ b/src/Ai/Class/Dk/DKAiObjectContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DKAIOBJECTCONTEXT_H
-#define _PLAYERBOT_DKAIOBJECTCONTEXT_H
+#ifndef PLAYERBOTS_DKAIOBJECTCONTEXT_H
+#define PLAYERBOTS_DKAIOBJECTCONTEXT_H
 
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Class/Dk/DKTriggers.h b/src/Ai/Class/Dk/DKTriggers.h
index 98070d85f..fd3c1a726 100644
--- a/src/Ai/Class/Dk/DKTriggers.h
+++ b/src/Ai/Class/Dk/DKTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DKTRIGGERS_H
-#define _PLAYERBOT_DKTRIGGERS_H
+#ifndef PLAYERBOTS_DKTRIGGERS_H
+#define PLAYERBOTS_DKTRIGGERS_H
 
 #include "GenericTriggers.h"
 
diff --git a/src/Ai/Class/Dk/Strategy/BloodDKStrategy.h b/src/Ai/Class/Dk/Strategy/BloodDKStrategy.h
index 590727c93..2986dba77 100644
--- a/src/Ai/Class/Dk/Strategy/BloodDKStrategy.h
+++ b/src/Ai/Class/Dk/Strategy/BloodDKStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_BLOODDKSTRATEGY_H
-#define _PLAYERBOT_BLOODDKSTRATEGY_H
+#ifndef PLAYERBOTS_BLOODDKSTRATEGY_H
+#define PLAYERBOTS_BLOODDKSTRATEGY_H
 
 #include "GenericDKStrategy.h"
 
diff --git a/src/Ai/Class/Dk/Strategy/DeathKnightPullStrategy.h b/src/Ai/Class/Dk/Strategy/DeathKnightPullStrategy.h
index ce80c69f6..47bc1e43a 100644
--- a/src/Ai/Class/Dk/Strategy/DeathKnightPullStrategy.h
+++ b/src/Ai/Class/Dk/Strategy/DeathKnightPullStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DEATH_KNIGHT_PULL_STRATEGY_H
-#define _PLAYERBOT_DEATH_KNIGHT_PULL_STRATEGY_H
+#ifndef PLAYERBOTS_DEATHKNIGHTPULLSTRATEGY_H
+#define PLAYERBOTS_DEATHKNIGHTPULLSTRATEGY_H
 
 #include "PullStrategy.h"
 
diff --git a/src/Ai/Class/Dk/Strategy/FrostDKStrategy.h b/src/Ai/Class/Dk/Strategy/FrostDKStrategy.h
index 948339193..59c939da6 100644
--- a/src/Ai/Class/Dk/Strategy/FrostDKStrategy.h
+++ b/src/Ai/Class/Dk/Strategy/FrostDKStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_FROSTDKSTRATEGY_H
-#define _PLAYERBOT_FROSTDKSTRATEGY_H
+#ifndef PLAYERBOTS_FROSTDKSTRATEGY_H
+#define PLAYERBOTS_FROSTDKSTRATEGY_H
 
 #include "GenericDKStrategy.h"
 
diff --git a/src/Ai/Class/Dk/Strategy/GenericDKNonCombatStrategy.h b/src/Ai/Class/Dk/Strategy/GenericDKNonCombatStrategy.h
index b7c3ad857..bd36864ea 100644
--- a/src/Ai/Class/Dk/Strategy/GenericDKNonCombatStrategy.h
+++ b/src/Ai/Class/Dk/Strategy/GenericDKNonCombatStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICDKNONCOMBATSTRATEGY_H
-#define _PLAYERBOT_GENERICDKNONCOMBATSTRATEGY_H
+#ifndef PLAYERBOTS_GENERICDKNONCOMBATSTRATEGY_H
+#define PLAYERBOTS_GENERICDKNONCOMBATSTRATEGY_H
 
 #include "GenericDKStrategy.h"
 #include "NonCombatStrategy.h"
diff --git a/src/Ai/Class/Dk/Strategy/GenericDKStrategy.h b/src/Ai/Class/Dk/Strategy/GenericDKStrategy.h
index dabe74281..4e95680a8 100644
--- a/src/Ai/Class/Dk/Strategy/GenericDKStrategy.h
+++ b/src/Ai/Class/Dk/Strategy/GenericDKStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICDKSTRATEGY_H
-#define _PLAYERBOT_GENERICDKSTRATEGY_H
+#ifndef PLAYERBOTS_GENERICDKSTRATEGY_H
+#define PLAYERBOTS_GENERICDKSTRATEGY_H
 
 #include "MeleeCombatStrategy.h"
 
diff --git a/src/Ai/Class/Dk/Strategy/UnholyDKStrategy.h b/src/Ai/Class/Dk/Strategy/UnholyDKStrategy.h
index 65ee65d92..e8f061dac 100644
--- a/src/Ai/Class/Dk/Strategy/UnholyDKStrategy.h
+++ b/src/Ai/Class/Dk/Strategy/UnholyDKStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_UNHOLYDKSTRATEGY_H
-#define _PLAYERBOT_UNHOLYDKSTRATEGY_H
+#ifndef PLAYERBOTS_UNHOLYDKSTRATEGY_H
+#define PLAYERBOTS_UNHOLYDKSTRATEGY_H
 
 #include "GenericDKStrategy.h"
 
diff --git a/src/Ai/Class/Druid/Action/DruidActions.h b/src/Ai/Class/Druid/Action/DruidActions.h
index bfe5cfc7f..fba2272e0 100644
--- a/src/Ai/Class/Druid/Action/DruidActions.h
+++ b/src/Ai/Class/Druid/Action/DruidActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DRUIDACTIONS_H
-#define _PLAYERBOT_DRUIDACTIONS_H
+#ifndef PLAYERBOTS_DRUIDACTIONS_H
+#define PLAYERBOTS_DRUIDACTIONS_H
 
 #include "GenericSpellActions.h"
 #include "SharedDefines.h"
diff --git a/src/Ai/Class/Druid/Action/DruidBearActions.h b/src/Ai/Class/Druid/Action/DruidBearActions.h
index d5354b7e6..765cd8391 100644
--- a/src/Ai/Class/Druid/Action/DruidBearActions.h
+++ b/src/Ai/Class/Druid/Action/DruidBearActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DRUIDBEARACTIONS_H
-#define _PLAYERBOT_DRUIDBEARACTIONS_H
+#ifndef PLAYERBOTS_DRUIDBEARACTIONS_H
+#define PLAYERBOTS_DRUIDBEARACTIONS_H
 
 #include "GenericSpellActions.h"
 #include "ReachTargetActions.h"
diff --git a/src/Ai/Class/Druid/Action/DruidCatActions.h b/src/Ai/Class/Druid/Action/DruidCatActions.h
index 1fdd9aba7..75d9a9e4d 100644
--- a/src/Ai/Class/Druid/Action/DruidCatActions.h
+++ b/src/Ai/Class/Druid/Action/DruidCatActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DRUIDCATACTIONS_H
-#define _PLAYERBOT_DRUIDCATACTIONS_H
+#ifndef PLAYERBOTS_DRUIDCATACTIONS_H
+#define PLAYERBOTS_DRUIDCATACTIONS_H
 
 #include "GenericSpellActions.h"
 #include "ReachTargetActions.h"
diff --git a/src/Ai/Class/Druid/Action/DruidShapeshiftActions.h b/src/Ai/Class/Druid/Action/DruidShapeshiftActions.h
index d485171d2..f03d23c69 100644
--- a/src/Ai/Class/Druid/Action/DruidShapeshiftActions.h
+++ b/src/Ai/Class/Druid/Action/DruidShapeshiftActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DRUIDSHAPESHIFTACTIONS_H
-#define _PLAYERBOT_DRUIDSHAPESHIFTACTIONS_H
+#ifndef PLAYERBOTS_DRUIDSHAPESHIFTACTIONS_H
+#define PLAYERBOTS_DRUIDSHAPESHIFTACTIONS_H
 
 #include "GenericSpellActions.h"
 
diff --git a/src/Ai/Class/Druid/DruidAiObjectContext.h b/src/Ai/Class/Druid/DruidAiObjectContext.h
index ee309e79c..7eb12243c 100644
--- a/src/Ai/Class/Druid/DruidAiObjectContext.h
+++ b/src/Ai/Class/Druid/DruidAiObjectContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DRUIDAIOBJECTCONTEXT_H
-#define _PLAYERBOT_DRUIDAIOBJECTCONTEXT_H
+#ifndef PLAYERBOTS_DRUIDAIOBJECTCONTEXT_H
+#define PLAYERBOTS_DRUIDAIOBJECTCONTEXT_H
 
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Class/Druid/DruidTriggers.h b/src/Ai/Class/Druid/DruidTriggers.h
index fa0f21132..4b6fa2709 100644
--- a/src/Ai/Class/Druid/DruidTriggers.h
+++ b/src/Ai/Class/Druid/DruidTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DRUIDTRIGGERS_H
-#define _PLAYERBOT_DRUIDTRIGGERS_H
+#ifndef PLAYERBOTS_DRUIDTRIGGERS_H
+#define PLAYERBOTS_DRUIDTRIGGERS_H
 
 #include "CureTriggers.h"
 #include "GenericTriggers.h"
diff --git a/src/Ai/Class/Druid/Strategy/BalanceDruidStrategy.h b/src/Ai/Class/Druid/Strategy/BalanceDruidStrategy.h
index d01db4901..f4eca0955 100644
--- a/src/Ai/Class/Druid/Strategy/BalanceDruidStrategy.h
+++ b/src/Ai/Class/Druid/Strategy/BalanceDruidStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_BALANCEDRUIDSTRATEGY_H
-#define _PLAYERBOT_BALANCEDRUIDSTRATEGY_H
+#ifndef PLAYERBOTS_BALANCEDRUIDSTRATEGY_H
+#define PLAYERBOTS_BALANCEDRUIDSTRATEGY_H
 
 #include "GenericDruidStrategy.h"
 
diff --git a/src/Ai/Class/Druid/Strategy/BearDruidStrategy.h b/src/Ai/Class/Druid/Strategy/BearDruidStrategy.h
index 1e47fd08a..c3e8209de 100644
--- a/src/Ai/Class/Druid/Strategy/BearDruidStrategy.h
+++ b/src/Ai/Class/Druid/Strategy/BearDruidStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_BEARDRUIDSTRATEGY_H
-#define _PLAYERBOT_BEARDRUIDSTRATEGY_H
+#ifndef PLAYERBOTS_BEARDRUIDSTRATEGY_H
+#define PLAYERBOTS_BEARDRUIDSTRATEGY_H
 
 #include "FeralDruidStrategy.h"
 
diff --git a/src/Ai/Class/Druid/Strategy/CatDruidStrategy.h b/src/Ai/Class/Druid/Strategy/CatDruidStrategy.h
index 51d80cd77..e810241e0 100644
--- a/src/Ai/Class/Druid/Strategy/CatDruidStrategy.h
+++ b/src/Ai/Class/Druid/Strategy/CatDruidStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CATDRUIDSTRATEGY_H
-#define _PLAYERBOT_CATDRUIDSTRATEGY_H
+#ifndef PLAYERBOTS_CATDRUIDSTRATEGY_H
+#define PLAYERBOTS_CATDRUIDSTRATEGY_H
 
 #include "FeralDruidStrategy.h"
 
diff --git a/src/Ai/Class/Druid/Strategy/DruidPullStrategy.h b/src/Ai/Class/Druid/Strategy/DruidPullStrategy.h
index 9a52f262a..73e437144 100644
--- a/src/Ai/Class/Druid/Strategy/DruidPullStrategy.h
+++ b/src/Ai/Class/Druid/Strategy/DruidPullStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DRUID_PULL_STRATEGY_H
-#define _PLAYERBOT_DRUID_PULL_STRATEGY_H
+#ifndef PLAYERBOTS_DRUIDPULLSTRATEGY_H
+#define PLAYERBOTS_DRUIDPULLSTRATEGY_H
 
 #include "PullStrategy.h"
 
diff --git a/src/Ai/Class/Druid/Strategy/FeralDruidStrategy.h b/src/Ai/Class/Druid/Strategy/FeralDruidStrategy.h
index ebff73de3..798d1e7a2 100644
--- a/src/Ai/Class/Druid/Strategy/FeralDruidStrategy.h
+++ b/src/Ai/Class/Druid/Strategy/FeralDruidStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_FERALDRUIDSTRATEGY_H
-#define _PLAYERBOT_FERALDRUIDSTRATEGY_H
+#ifndef PLAYERBOTS_FERALDRUIDSTRATEGY_H
+#define PLAYERBOTS_FERALDRUIDSTRATEGY_H
 
 #include "GenericDruidStrategy.h"
 
diff --git a/src/Ai/Class/Druid/Strategy/GenericDruidNonCombatStrategy.h b/src/Ai/Class/Druid/Strategy/GenericDruidNonCombatStrategy.h
index 28e154454..b7e8371a2 100644
--- a/src/Ai/Class/Druid/Strategy/GenericDruidNonCombatStrategy.h
+++ b/src/Ai/Class/Druid/Strategy/GenericDruidNonCombatStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICDRUIDNONCOMBATSTRATEGY_H
-#define _PLAYERBOT_GENERICDRUIDNONCOMBATSTRATEGY_H
+#ifndef PLAYERBOTS_GENERICDRUIDNONCOMBATSTRATEGY_H
+#define PLAYERBOTS_GENERICDRUIDNONCOMBATSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Class/Druid/Strategy/GenericDruidStrategy.h b/src/Ai/Class/Druid/Strategy/GenericDruidStrategy.h
index 1cb88f82a..e069d5273 100644
--- a/src/Ai/Class/Druid/Strategy/GenericDruidStrategy.h
+++ b/src/Ai/Class/Druid/Strategy/GenericDruidStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICDRUIDSTRATEGY_H
-#define _PLAYERBOT_GENERICDRUIDSTRATEGY_H
+#ifndef PLAYERBOTS_GENERICDRUIDSTRATEGY_H
+#define PLAYERBOTS_GENERICDRUIDSTRATEGY_H
 
 #include "CombatStrategy.h"
 
diff --git a/src/Ai/Class/Druid/Strategy/RestoDruidStrategy.h b/src/Ai/Class/Druid/Strategy/RestoDruidStrategy.h
index afc3a93bc..2c58e215e 100644
--- a/src/Ai/Class/Druid/Strategy/RestoDruidStrategy.h
+++ b/src/Ai/Class/Druid/Strategy/RestoDruidStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RESTODRUIDSTRATEGY_H
-#define _PLAYERBOT_RESTODRUIDSTRATEGY_H
+#ifndef PLAYERBOTS_RESTODRUIDSTRATEGY_H
+#define PLAYERBOTS_RESTODRUIDSTRATEGY_H
 
 #include "GenericDruidStrategy.h"
 #include "Strategy.h"
diff --git a/src/Ai/Class/Hunter/HunterActions.h b/src/Ai/Class/Hunter/HunterActions.h
index 4c7c0851b..cb150d625 100644
--- a/src/Ai/Class/Hunter/HunterActions.h
+++ b/src/Ai/Class/Hunter/HunterActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_HUNTERACTIONS_H
-#define _PLAYERBOT_HUNTERACTIONS_H
+#ifndef PLAYERBOTS_HUNTERACTIONS_H
+#define PLAYERBOTS_HUNTERACTIONS_H
 
 #include "AiObject.h"
 #include "Event.h"
diff --git a/src/Ai/Class/Hunter/HunterAiObjectContext.h b/src/Ai/Class/Hunter/HunterAiObjectContext.h
index 27178104a..1e59438db 100644
--- a/src/Ai/Class/Hunter/HunterAiObjectContext.h
+++ b/src/Ai/Class/Hunter/HunterAiObjectContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_HUNTERAIOBJECTCONTEXT_H
-#define _PLAYERBOT_HUNTERAIOBJECTCONTEXT_H
+#ifndef PLAYERBOTS_HUNTERAIOBJECTCONTEXT_H
+#define PLAYERBOTS_HUNTERAIOBJECTCONTEXT_H
 
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Class/Hunter/HunterTriggers.h b/src/Ai/Class/Hunter/HunterTriggers.h
index 7459f94bb..621b44c9a 100644
--- a/src/Ai/Class/Hunter/HunterTriggers.h
+++ b/src/Ai/Class/Hunter/HunterTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_HUNTERTRIGGERS_H
-#define _PLAYERBOT_HUNTERTRIGGERS_H
+#ifndef PLAYERBOTS_HUNTERTRIGGERS_H
+#define PLAYERBOTS_HUNTERTRIGGERS_H
 
 #include "CureTriggers.h"
 #include "GenericTriggers.h"
diff --git a/src/Ai/Class/Hunter/Strategy/BeastMasteryHunterStrategy.h b/src/Ai/Class/Hunter/Strategy/BeastMasteryHunterStrategy.h
index 5235aa861..90be3dc65 100644
--- a/src/Ai/Class/Hunter/Strategy/BeastMasteryHunterStrategy.h
+++ b/src/Ai/Class/Hunter/Strategy/BeastMasteryHunterStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_BEASTMASTERYHUNTERSTRATEGY_H
-#define _PLAYERBOT_BEASTMASTERYHUNTERSTRATEGY_H
+#ifndef PLAYERBOTS_BEASTMASTERYHUNTERSTRATEGY_H
+#define PLAYERBOTS_BEASTMASTERYHUNTERSTRATEGY_H
 
 #include "GenericHunterStrategy.h"
 #include "CombatStrategy.h"
diff --git a/src/Ai/Class/Hunter/Strategy/GenericHunterNonCombatStrategy.h b/src/Ai/Class/Hunter/Strategy/GenericHunterNonCombatStrategy.h
index 697b1e291..2ab392723 100644
--- a/src/Ai/Class/Hunter/Strategy/GenericHunterNonCombatStrategy.h
+++ b/src/Ai/Class/Hunter/Strategy/GenericHunterNonCombatStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICHUNTERNONCOMBATSTRATEGY_H
-#define _PLAYERBOT_GENERICHUNTERNONCOMBATSTRATEGY_H
+#ifndef PLAYERBOTS_GENERICHUNTERNONCOMBATSTRATEGY_H
+#define PLAYERBOTS_GENERICHUNTERNONCOMBATSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Class/Hunter/Strategy/GenericHunterStrategy.h b/src/Ai/Class/Hunter/Strategy/GenericHunterStrategy.h
index b3a2248c3..e468e2a2b 100644
--- a/src/Ai/Class/Hunter/Strategy/GenericHunterStrategy.h
+++ b/src/Ai/Class/Hunter/Strategy/GenericHunterStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICHUNTERSTRATEGY_H
-#define _PLAYERBOT_GENERICHUNTERSTRATEGY_H
+#ifndef PLAYERBOTS_GENERICHUNTERSTRATEGY_H
+#define PLAYERBOTS_GENERICHUNTERSTRATEGY_H
 
 #include "CombatStrategy.h"
 #include "Strategy.h"
diff --git a/src/Ai/Class/Hunter/Strategy/HunterBuffStrategies.h b/src/Ai/Class/Hunter/Strategy/HunterBuffStrategies.h
index 93155caeb..6453e079d 100644
--- a/src/Ai/Class/Hunter/Strategy/HunterBuffStrategies.h
+++ b/src/Ai/Class/Hunter/Strategy/HunterBuffStrategies.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_HUNTERBUFFSTRATEGIES_H
-#define _PLAYERBOT_HUNTERBUFFSTRATEGIES_H
+#ifndef PLAYERBOTS_HUNTERBUFFSTRATEGIES_H
+#define PLAYERBOTS_HUNTERBUFFSTRATEGIES_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Class/Hunter/Strategy/MarksmanshipHunterStrategy.h b/src/Ai/Class/Hunter/Strategy/MarksmanshipHunterStrategy.h
index 800d40a8a..a872f4c9d 100644
--- a/src/Ai/Class/Hunter/Strategy/MarksmanshipHunterStrategy.h
+++ b/src/Ai/Class/Hunter/Strategy/MarksmanshipHunterStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_MARKSMANSHIPHUNTERSTRATEGY_H
-#define _PLAYERBOT_MARKSMANSHIPHUNTERSTRATEGY_H
+#ifndef PLAYERBOTS_MARKSMANSHIPHUNTERSTRATEGY_H
+#define PLAYERBOTS_MARKSMANSHIPHUNTERSTRATEGY_H
 
 #include "GenericHunterStrategy.h"
 #include "CombatStrategy.h"
diff --git a/src/Ai/Class/Hunter/Strategy/SurvivalHunterStrategy.h b/src/Ai/Class/Hunter/Strategy/SurvivalHunterStrategy.h
index 2e2b52f13..648c2cca6 100644
--- a/src/Ai/Class/Hunter/Strategy/SurvivalHunterStrategy.h
+++ b/src/Ai/Class/Hunter/Strategy/SurvivalHunterStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SURVIVALHUNTERSTRATEGY_H
-#define _PLAYERBOT_SURVIVALHUNTERSTRATEGY_H
+#ifndef PLAYERBOTS_SURVIVALHUNTERSTRATEGY_H
+#define PLAYERBOTS_SURVIVALHUNTERSTRATEGY_H
 
 #include "GenericHunterStrategy.h"
 #include "CombatStrategy.h"
diff --git a/src/Ai/Class/Mage/MageActions.h b/src/Ai/Class/Mage/MageActions.h
index c394a379d..48ce5079d 100644
--- a/src/Ai/Class/Mage/MageActions.h
+++ b/src/Ai/Class/Mage/MageActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_MAGEACTIONS_H
-#define _PLAYERBOT_MAGEACTIONS_H
+#ifndef PLAYERBOTS_MAGEACTIONS_H
+#define PLAYERBOTS_MAGEACTIONS_H
 
 #include "GenericSpellActions.h"
 #include "SharedDefines.h"
diff --git a/src/Ai/Class/Mage/MageAiObjectContext.h b/src/Ai/Class/Mage/MageAiObjectContext.h
index c2cd2f5e7..9b6d8805a 100644
--- a/src/Ai/Class/Mage/MageAiObjectContext.h
+++ b/src/Ai/Class/Mage/MageAiObjectContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_MAGEAIOBJECTCONTEXT_H
-#define _PLAYERBOT_MAGEAIOBJECTCONTEXT_H
+#ifndef PLAYERBOTS_MAGEAIOBJECTCONTEXT_H
+#define PLAYERBOTS_MAGEAIOBJECTCONTEXT_H
 
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Class/Mage/MageTriggers.h b/src/Ai/Class/Mage/MageTriggers.h
index 58afab0f8..24fbb3428 100644
--- a/src/Ai/Class/Mage/MageTriggers.h
+++ b/src/Ai/Class/Mage/MageTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_MAGETRIGGERS_H
-#define _PLAYERBOT_MAGETRIGGERS_H
+#ifndef PLAYERBOTS_MAGETRIGGERS_H
+#define PLAYERBOTS_MAGETRIGGERS_H
 
 #include "CureTriggers.h"
 #include "GenericTriggers.h"
diff --git a/src/Ai/Class/Mage/Strategy/ArcaneMageStrategy.h b/src/Ai/Class/Mage/Strategy/ArcaneMageStrategy.h
index e654a655b..667f65957 100644
--- a/src/Ai/Class/Mage/Strategy/ArcaneMageStrategy.h
+++ b/src/Ai/Class/Mage/Strategy/ArcaneMageStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ARCANEMAGESTRATEGY_H
-#define _PLAYERBOT_ARCANEMAGESTRATEGY_H
+#ifndef PLAYERBOTS_ARCANEMAGESTRATEGY_H
+#define PLAYERBOTS_ARCANEMAGESTRATEGY_H
 
 #include "GenericMageStrategy.h"
 
diff --git a/src/Ai/Class/Mage/Strategy/FireMageStrategy.h b/src/Ai/Class/Mage/Strategy/FireMageStrategy.h
index 14655de3a..93d52557d 100644
--- a/src/Ai/Class/Mage/Strategy/FireMageStrategy.h
+++ b/src/Ai/Class/Mage/Strategy/FireMageStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_FIREMAGESTRATEGY_H
-#define _PLAYERBOT_FIREMAGESTRATEGY_H
+#ifndef PLAYERBOTS_FIREMAGESTRATEGY_H
+#define PLAYERBOTS_FIREMAGESTRATEGY_H
 
 #include "GenericMageStrategy.h"
 
diff --git a/src/Ai/Class/Mage/Strategy/FrostFireMageStrategy.h b/src/Ai/Class/Mage/Strategy/FrostFireMageStrategy.h
index 00bbf03a5..5c325ab12 100644
--- a/src/Ai/Class/Mage/Strategy/FrostFireMageStrategy.h
+++ b/src/Ai/Class/Mage/Strategy/FrostFireMageStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_FROSTFIREMAGESTRATEGY_H
-#define _PLAYERBOT_FROSTFIREMAGESTRATEGY_H
+#ifndef PLAYERBOTS_FROSTFIREMAGESTRATEGY_H
+#define PLAYERBOTS_FROSTFIREMAGESTRATEGY_H
 
 #include "GenericMageStrategy.h"
 
diff --git a/src/Ai/Class/Mage/Strategy/FrostMageStrategy.h b/src/Ai/Class/Mage/Strategy/FrostMageStrategy.h
index 9b027fed8..7fc90cb16 100644
--- a/src/Ai/Class/Mage/Strategy/FrostMageStrategy.h
+++ b/src/Ai/Class/Mage/Strategy/FrostMageStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_FROSTMAGESTRATEGY_H
-#define _PLAYERBOT_FROSTMAGESTRATEGY_H
+#ifndef PLAYERBOTS_FROSTMAGESTRATEGY_H
+#define PLAYERBOTS_FROSTMAGESTRATEGY_H
 
 #include "GenericMageStrategy.h"
 
diff --git a/src/Ai/Class/Mage/Strategy/GenericMageNonCombatStrategy.h b/src/Ai/Class/Mage/Strategy/GenericMageNonCombatStrategy.h
index d31261f66..b06201ae2 100644
--- a/src/Ai/Class/Mage/Strategy/GenericMageNonCombatStrategy.h
+++ b/src/Ai/Class/Mage/Strategy/GenericMageNonCombatStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICMAGENONCOMBATSTRATEGY_H
-#define _PLAYERBOT_GENERICMAGENONCOMBATSTRATEGY_H
+#ifndef PLAYERBOTS_GENERICMAGENONCOMBATSTRATEGY_H
+#define PLAYERBOTS_GENERICMAGENONCOMBATSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Class/Mage/Strategy/GenericMageStrategy.h b/src/Ai/Class/Mage/Strategy/GenericMageStrategy.h
index 939147949..dcc0144de 100644
--- a/src/Ai/Class/Mage/Strategy/GenericMageStrategy.h
+++ b/src/Ai/Class/Mage/Strategy/GenericMageStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICMAGESTRATEGY_H
-#define _PLAYERBOT_GENERICMAGESTRATEGY_H
+#ifndef PLAYERBOTS_GENERICMAGESTRATEGY_H
+#define PLAYERBOTS_GENERICMAGESTRATEGY_H
 
 #include "CombatStrategy.h"
 #include "RangedCombatStrategy.h"
diff --git a/src/Ai/Class/Paladin/Actions/PaladinActions.h b/src/Ai/Class/Paladin/Actions/PaladinActions.h
index ef59225e6..d14d108d5 100644
--- a/src/Ai/Class/Paladin/Actions/PaladinActions.h
+++ b/src/Ai/Class/Paladin/Actions/PaladinActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PALADINACTIONS_H
-#define _PLAYERBOT_PALADINACTIONS_H
+#ifndef PLAYERBOTS_PALADINACTIONS_H
+#define PLAYERBOTS_PALADINACTIONS_H
 
 #include "AiObject.h"
 #include "GenericSpellActions.h"
diff --git a/src/Ai/Class/Paladin/Actions/PaladinGreaterBlessingAction.h b/src/Ai/Class/Paladin/Actions/PaladinGreaterBlessingAction.h
index fa8c66d4a..7811a9d0f 100644
--- a/src/Ai/Class/Paladin/Actions/PaladinGreaterBlessingAction.h
+++ b/src/Ai/Class/Paladin/Actions/PaladinGreaterBlessingAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PALADINGREATERBLESSINGACTION_H
-#define _PLAYERBOT_PALADINGREATERBLESSINGACTION_H
+#ifndef PLAYERBOTS_PALADINGREATERBLESSINGACTION_H
+#define PLAYERBOTS_PALADINGREATERBLESSINGACTION_H
 
 #include <array>
 #include <string>
diff --git a/src/Ai/Class/Paladin/PaladinAiObjectContext.h b/src/Ai/Class/Paladin/PaladinAiObjectContext.h
index 4ca5f94be..310651656 100644
--- a/src/Ai/Class/Paladin/PaladinAiObjectContext.h
+++ b/src/Ai/Class/Paladin/PaladinAiObjectContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PALADINAIOBJECTCONTEXT_H
-#define _PLAYERBOT_PALADINAIOBJECTCONTEXT_H
+#ifndef PLAYERBOTS_PALADINAIOBJECTCONTEXT_H
+#define PLAYERBOTS_PALADINAIOBJECTCONTEXT_H
 
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Class/Paladin/PaladinHelper.h b/src/Ai/Class/Paladin/PaladinHelper.h
index 8e9a155f7..1c1f061b8 100644
--- a/src/Ai/Class/Paladin/PaladinHelper.h
+++ b/src/Ai/Class/Paladin/PaladinHelper.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PALADINHELPER_H
-#define _PLAYERBOT_PALADINHELPER_H
+#ifndef PLAYERBOTS_PALADINHELPER_H
+#define PLAYERBOTS_PALADINHELPER_H
 
 #include <initializer_list>
 
diff --git a/src/Ai/Class/Paladin/PaladinTriggers.h b/src/Ai/Class/Paladin/PaladinTriggers.h
index 28f4d75cb..ae3b8fb54 100644
--- a/src/Ai/Class/Paladin/PaladinTriggers.h
+++ b/src/Ai/Class/Paladin/PaladinTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PALADINTRIGGERS_H
-#define _PLAYERBOT_PALADINTRIGGERS_H
+#ifndef PLAYERBOTS_PALADINTRIGGERS_H
+#define PLAYERBOTS_PALADINTRIGGERS_H
 
 #include "CureTriggers.h"
 #include "GenericTriggers.h"
diff --git a/src/Ai/Class/Paladin/Strategy/DpsPaladinStrategy.h b/src/Ai/Class/Paladin/Strategy/DpsPaladinStrategy.h
index 9611946a3..30ae0614d 100644
--- a/src/Ai/Class/Paladin/Strategy/DpsPaladinStrategy.h
+++ b/src/Ai/Class/Paladin/Strategy/DpsPaladinStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DPSPALADINSTRATEGY_H
-#define _PLAYERBOT_DPSPALADINSTRATEGY_H
+#ifndef PLAYERBOTS_DPSPALADINSTRATEGY_H
+#define PLAYERBOTS_DPSPALADINSTRATEGY_H
 
 #include "GenericPaladinStrategy.h"
 
diff --git a/src/Ai/Class/Paladin/Strategy/GenericPaladinNonCombatStrategy.h b/src/Ai/Class/Paladin/Strategy/GenericPaladinNonCombatStrategy.h
index c4e21a561..60339355f 100644
--- a/src/Ai/Class/Paladin/Strategy/GenericPaladinNonCombatStrategy.h
+++ b/src/Ai/Class/Paladin/Strategy/GenericPaladinNonCombatStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICPALADINNONCOMBATSTRATEGY_H
-#define _PLAYERBOT_GENERICPALADINNONCOMBATSTRATEGY_H
+#ifndef PLAYERBOTS_GENERICPALADINNONCOMBATSTRATEGY_H
+#define PLAYERBOTS_GENERICPALADINNONCOMBATSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Class/Paladin/Strategy/GenericPaladinStrategy.h b/src/Ai/Class/Paladin/Strategy/GenericPaladinStrategy.h
index 2a3ec516c..3c75ceb81 100644
--- a/src/Ai/Class/Paladin/Strategy/GenericPaladinStrategy.h
+++ b/src/Ai/Class/Paladin/Strategy/GenericPaladinStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICPALADINSTRATEGY_H
-#define _PLAYERBOT_GENERICPALADINSTRATEGY_H
+#ifndef PLAYERBOTS_GENERICPALADINSTRATEGY_H
+#define PLAYERBOTS_GENERICPALADINSTRATEGY_H
 
 #include "CombatStrategy.h"
 
diff --git a/src/Ai/Class/Paladin/Strategy/GenericPaladinStrategyActionNodeFactory.h b/src/Ai/Class/Paladin/Strategy/GenericPaladinStrategyActionNodeFactory.h
index d73fcaabf..e9f310aea 100644
--- a/src/Ai/Class/Paladin/Strategy/GenericPaladinStrategyActionNodeFactory.h
+++ b/src/Ai/Class/Paladin/Strategy/GenericPaladinStrategyActionNodeFactory.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICPALADINSTRATEGYACTIONNODEFACTORY_H
-#define _PLAYERBOT_GENERICPALADINSTRATEGYACTIONNODEFACTORY_H
+#ifndef PLAYERBOTS_GENERICPALADINSTRATEGYACTIONNODEFACTORY_H
+#define PLAYERBOTS_GENERICPALADINSTRATEGYACTIONNODEFACTORY_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Class/Paladin/Strategy/HealPaladinStrategy.h b/src/Ai/Class/Paladin/Strategy/HealPaladinStrategy.h
index f7f802236..590eccaeb 100644
--- a/src/Ai/Class/Paladin/Strategy/HealPaladinStrategy.h
+++ b/src/Ai/Class/Paladin/Strategy/HealPaladinStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_HEALPALADINSTRATEGY_H
-#define _PLAYERBOT_HEALPALADINSTRATEGY_H
+#ifndef PLAYERBOTS_HEALPALADINSTRATEGY_H
+#define PLAYERBOTS_HEALPALADINSTRATEGY_H
 
 #include "GenericPaladinStrategy.h"
 
diff --git a/src/Ai/Class/Paladin/Strategy/OffhealRetPaladinStrategy.h b/src/Ai/Class/Paladin/Strategy/OffhealRetPaladinStrategy.h
index eeb9672ed..e1d614bd3 100644
--- a/src/Ai/Class/Paladin/Strategy/OffhealRetPaladinStrategy.h
+++ b/src/Ai/Class/Paladin/Strategy/OffhealRetPaladinStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
- #ifndef _PLAYERBOT_OFFHEALRETPALADINSTRATEGY_H
-#define _PLAYERBOT_OFFHEALRETPALADINSTRATEGY_H
+ #ifndef PLAYERBOTS_OFFHEALRETPALADINSTRATEGY_H
+#define PLAYERBOTS_OFFHEALRETPALADINSTRATEGY_H
 
 #include "GenericPaladinStrategy.h"
 
diff --git a/src/Ai/Class/Paladin/Strategy/PaladinBuffStrategies.h b/src/Ai/Class/Paladin/Strategy/PaladinBuffStrategies.h
index e3866d6f6..f91ae380a 100644
--- a/src/Ai/Class/Paladin/Strategy/PaladinBuffStrategies.h
+++ b/src/Ai/Class/Paladin/Strategy/PaladinBuffStrategies.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PALADINBUFFSTRATEGIES_H
-#define _PLAYERBOT_PALADINBUFFSTRATEGIES_H
+#ifndef PLAYERBOTS_PALADINBUFFSTRATEGIES_H
+#define PLAYERBOTS_PALADINBUFFSTRATEGIES_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Class/Paladin/Strategy/PaladinPullStrategy.h b/src/Ai/Class/Paladin/Strategy/PaladinPullStrategy.h
index 43d014ec7..5ad6c8656 100644
--- a/src/Ai/Class/Paladin/Strategy/PaladinPullStrategy.h
+++ b/src/Ai/Class/Paladin/Strategy/PaladinPullStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PALADIN_PULL_STRATEGY_H
-#define _PLAYERBOT_PALADIN_PULL_STRATEGY_H
+#ifndef PLAYERBOTS_PALADINPULLSTRATEGY_H
+#define PLAYERBOTS_PALADINPULLSTRATEGY_H
 
 #include "PullStrategy.h"
 
diff --git a/src/Ai/Class/Paladin/Strategy/TankPaladinStrategy.h b/src/Ai/Class/Paladin/Strategy/TankPaladinStrategy.h
index b4a0e0ca0..23d74fe07 100644
--- a/src/Ai/Class/Paladin/Strategy/TankPaladinStrategy.h
+++ b/src/Ai/Class/Paladin/Strategy/TankPaladinStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TANKPALADINSTRATEGY_H
-#define _PLAYERBOT_TANKPALADINSTRATEGY_H
+#ifndef PLAYERBOTS_TANKPALADINSTRATEGY_H
+#define PLAYERBOTS_TANKPALADINSTRATEGY_H
 
 #include "GenericPaladinStrategy.h"
 
diff --git a/src/Ai/Class/Priest/PriestActions.h b/src/Ai/Class/Priest/PriestActions.h
index 1a6ded139..fb57eaec9 100644
--- a/src/Ai/Class/Priest/PriestActions.h
+++ b/src/Ai/Class/Priest/PriestActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PRIESTACTIONS_H
-#define _PLAYERBOT_PRIESTACTIONS_H
+#ifndef PLAYERBOTS_PRIESTACTIONS_H
+#define PLAYERBOTS_PRIESTACTIONS_H
 
 #include "GenericSpellActions.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Class/Priest/PriestAiObjectContext.h b/src/Ai/Class/Priest/PriestAiObjectContext.h
index 83e3449cb..914c8f3c2 100644
--- a/src/Ai/Class/Priest/PriestAiObjectContext.h
+++ b/src/Ai/Class/Priest/PriestAiObjectContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PRIESTAIOBJECTCONTEXT_H
-#define _PLAYERBOT_PRIESTAIOBJECTCONTEXT_H
+#ifndef PLAYERBOTS_PRIESTAIOBJECTCONTEXT_H
+#define PLAYERBOTS_PRIESTAIOBJECTCONTEXT_H
 
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Class/Priest/PriestTriggers.h b/src/Ai/Class/Priest/PriestTriggers.h
index fc5b1f8cc..1bf180aa1 100644
--- a/src/Ai/Class/Priest/PriestTriggers.h
+++ b/src/Ai/Class/Priest/PriestTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PRIESTTRIGGERS_H
-#define _PLAYERBOT_PRIESTTRIGGERS_H
+#ifndef PLAYERBOTS_PRIESTTRIGGERS_H
+#define PLAYERBOTS_PRIESTTRIGGERS_H
 
 #include "CureTriggers.h"
 #include "SharedDefines.h"
diff --git a/src/Ai/Class/Priest/Strategy/GenericPriestStrategy.h b/src/Ai/Class/Priest/Strategy/GenericPriestStrategy.h
index 35fd7db13..d18c7fc50 100644
--- a/src/Ai/Class/Priest/Strategy/GenericPriestStrategy.h
+++ b/src/Ai/Class/Priest/Strategy/GenericPriestStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICPRIESTSTRATEGY_H
-#define _PLAYERBOT_GENERICPRIESTSTRATEGY_H
+#ifndef PLAYERBOTS_GENERICPRIESTSTRATEGY_H
+#define PLAYERBOTS_GENERICPRIESTSTRATEGY_H
 
 #include "CombatStrategy.h"
 #include "RangedCombatStrategy.h"
diff --git a/src/Ai/Class/Priest/Strategy/GenericPriestStrategyActionNodeFactory.h b/src/Ai/Class/Priest/Strategy/GenericPriestStrategyActionNodeFactory.h
index 904c39696..fd6705d82 100644
--- a/src/Ai/Class/Priest/Strategy/GenericPriestStrategyActionNodeFactory.h
+++ b/src/Ai/Class/Priest/Strategy/GenericPriestStrategyActionNodeFactory.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICPRIESTSTRATEGYACTIONNODEFACTORY_H
-#define _PLAYERBOT_GENERICPRIESTSTRATEGYACTIONNODEFACTORY_H
+#ifndef PLAYERBOTS_GENERICPRIESTSTRATEGYACTIONNODEFACTORY_H
+#define PLAYERBOTS_GENERICPRIESTSTRATEGYACTIONNODEFACTORY_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Class/Priest/Strategy/HealPriestStrategy.h b/src/Ai/Class/Priest/Strategy/HealPriestStrategy.h
index 49fd764e2..f6cef582b 100644
--- a/src/Ai/Class/Priest/Strategy/HealPriestStrategy.h
+++ b/src/Ai/Class/Priest/Strategy/HealPriestStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_HEALPRIESTSTRATEGY_H
-#define _PLAYERBOT_HEALPRIESTSTRATEGY_H
+#ifndef PLAYERBOTS_HEALPRIESTSTRATEGY_H
+#define PLAYERBOTS_HEALPRIESTSTRATEGY_H
 
 #include "GenericPriestStrategy.h"
 
diff --git a/src/Ai/Class/Priest/Strategy/HolyPriestStrategy.h b/src/Ai/Class/Priest/Strategy/HolyPriestStrategy.h
index 5ae94c383..ce2b42b7a 100644
--- a/src/Ai/Class/Priest/Strategy/HolyPriestStrategy.h
+++ b/src/Ai/Class/Priest/Strategy/HolyPriestStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_HOLYPRIESTSTRATEGY_H
-#define _PLAYERBOT_HOLYPRIESTSTRATEGY_H
+#ifndef PLAYERBOTS_HOLYPRIESTSTRATEGY_H
+#define PLAYERBOTS_HOLYPRIESTSTRATEGY_H
 
 #include "GenericPriestStrategyActionNodeFactory.h"
 #include "HealPriestStrategy.h"
diff --git a/src/Ai/Class/Priest/Strategy/PriestNonCombatStrategy.h b/src/Ai/Class/Priest/Strategy/PriestNonCombatStrategy.h
index 465d05a59..f2a408d5b 100644
--- a/src/Ai/Class/Priest/Strategy/PriestNonCombatStrategy.h
+++ b/src/Ai/Class/Priest/Strategy/PriestNonCombatStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PRIESTNONCOMBATSTRATEGY_H
-#define _PLAYERBOT_PRIESTNONCOMBATSTRATEGY_H
+#ifndef PLAYERBOTS_PRIESTNONCOMBATSTRATEGY_H
+#define PLAYERBOTS_PRIESTNONCOMBATSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Class/Priest/Strategy/PriestNonCombatStrategyActionNodeFactory.h b/src/Ai/Class/Priest/Strategy/PriestNonCombatStrategyActionNodeFactory.h
index 66a6a44c5..59c4d1513 100644
--- a/src/Ai/Class/Priest/Strategy/PriestNonCombatStrategyActionNodeFactory.h
+++ b/src/Ai/Class/Priest/Strategy/PriestNonCombatStrategyActionNodeFactory.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PRIESTNONCOMBATSTRATEGYACTIONNODEFACTORY_H
-#define _PLAYERBOT_PRIESTNONCOMBATSTRATEGYACTIONNODEFACTORY_H
+#ifndef PLAYERBOTS_PRIESTNONCOMBATSTRATEGYACTIONNODEFACTORY_H
+#define PLAYERBOTS_PRIESTNONCOMBATSTRATEGYACTIONNODEFACTORY_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Class/Priest/Strategy/ShadowPriestStrategy.h b/src/Ai/Class/Priest/Strategy/ShadowPriestStrategy.h
index 6bf681b76..2e84886b7 100644
--- a/src/Ai/Class/Priest/Strategy/ShadowPriestStrategy.h
+++ b/src/Ai/Class/Priest/Strategy/ShadowPriestStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SHADOWPRIESTSTRATEGY_H
-#define _PLAYERBOT_SHADOWPRIESTSTRATEGY_H
+#ifndef PLAYERBOTS_SHADOWPRIESTSTRATEGY_H
+#define PLAYERBOTS_SHADOWPRIESTSTRATEGY_H
 
 #include "GenericPriestStrategy.h"
 
diff --git a/src/Ai/Class/Priest/Strategy/ShadowPriestStrategyActionNodeFactory.h b/src/Ai/Class/Priest/Strategy/ShadowPriestStrategyActionNodeFactory.h
index 27528be68..dd2b7141b 100644
--- a/src/Ai/Class/Priest/Strategy/ShadowPriestStrategyActionNodeFactory.h
+++ b/src/Ai/Class/Priest/Strategy/ShadowPriestStrategyActionNodeFactory.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SHADOWPRIESTSTRATEGYACTIONNODEFACTORY_H
-#define _PLAYERBOT_SHADOWPRIESTSTRATEGYACTIONNODEFACTORY_H
+#ifndef PLAYERBOTS_SHADOWPRIESTSTRATEGYACTIONNODEFACTORY_H
+#define PLAYERBOTS_SHADOWPRIESTSTRATEGYACTIONNODEFACTORY_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Class/Rogue/Action/RogueActions.h b/src/Ai/Class/Rogue/Action/RogueActions.h
index 3ae1f8142..d234a53a4 100644
--- a/src/Ai/Class/Rogue/Action/RogueActions.h
+++ b/src/Ai/Class/Rogue/Action/RogueActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ROGUEACTIONS_H
-#define _PLAYERBOT_ROGUEACTIONS_H
+#ifndef PLAYERBOTS_ROGUEACTIONS_H
+#define PLAYERBOTS_ROGUEACTIONS_H
 
 #include "GenericSpellActions.h"
 #include "UseItemAction.h"
diff --git a/src/Ai/Class/Rogue/Action/RogueComboActions.h b/src/Ai/Class/Rogue/Action/RogueComboActions.h
index be840ecc7..019be8f33 100644
--- a/src/Ai/Class/Rogue/Action/RogueComboActions.h
+++ b/src/Ai/Class/Rogue/Action/RogueComboActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ROGUECOMBOACTIONS_H
-#define _PLAYERBOT_ROGUECOMBOACTIONS_H
+#ifndef PLAYERBOTS_ROGUECOMBOACTIONS_H
+#define PLAYERBOTS_ROGUECOMBOACTIONS_H
 
 #include "GenericSpellActions.h"
 
diff --git a/src/Ai/Class/Rogue/Action/RogueFinishingActions.h b/src/Ai/Class/Rogue/Action/RogueFinishingActions.h
index 333e45896..97e9c979b 100644
--- a/src/Ai/Class/Rogue/Action/RogueFinishingActions.h
+++ b/src/Ai/Class/Rogue/Action/RogueFinishingActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ROGUEFINISHINGACTIONS_H
-#define _PLAYERBOT_ROGUEFINISHINGACTIONS_H
+#ifndef PLAYERBOTS_ROGUEFINISHINGACTIONS_H
+#define PLAYERBOTS_ROGUEFINISHINGACTIONS_H
 
 #include "GenericSpellActions.h"
 
diff --git a/src/Ai/Class/Rogue/Action/RogueOpeningActions.h b/src/Ai/Class/Rogue/Action/RogueOpeningActions.h
index 8d7c64919..c2badd53f 100644
--- a/src/Ai/Class/Rogue/Action/RogueOpeningActions.h
+++ b/src/Ai/Class/Rogue/Action/RogueOpeningActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ROGUEOPENINGACTIONS_H
-#define _PLAYERBOT_ROGUEOPENINGACTIONS_H
+#ifndef PLAYERBOTS_ROGUEOPENINGACTIONS_H
+#define PLAYERBOTS_ROGUEOPENINGACTIONS_H
 
 #include "GenericSpellActions.h"
 
diff --git a/src/Ai/Class/Rogue/RogueAiObjectContext.h b/src/Ai/Class/Rogue/RogueAiObjectContext.h
index 3628f8737..1a00190f1 100644
--- a/src/Ai/Class/Rogue/RogueAiObjectContext.h
+++ b/src/Ai/Class/Rogue/RogueAiObjectContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ROGUEAIOBJECTCONTEXT_H
-#define _PLAYERBOT_ROGUEAIOBJECTCONTEXT_H
+#ifndef PLAYERBOTS_ROGUEAIOBJECTCONTEXT_H
+#define PLAYERBOTS_ROGUEAIOBJECTCONTEXT_H
 
 #include "AiObjectContext.h"
 #include "Strategy.h"
diff --git a/src/Ai/Class/Rogue/RogueTriggers.h b/src/Ai/Class/Rogue/RogueTriggers.h
index d9a184238..01391dc3e 100644
--- a/src/Ai/Class/Rogue/RogueTriggers.h
+++ b/src/Ai/Class/Rogue/RogueTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ROGUETRIGGERS_H
-#define _PLAYERBOT_ROGUETRIGGERS_H
+#ifndef PLAYERBOTS_ROGUETRIGGERS_H
+#define PLAYERBOTS_ROGUETRIGGERS_H
 
 #include "GenericTriggers.h"
 
diff --git a/src/Ai/Class/Rogue/Strategy/AssassinationRogueStrategy.h b/src/Ai/Class/Rogue/Strategy/AssassinationRogueStrategy.h
index 3a6ac209d..134f98b46 100644
--- a/src/Ai/Class/Rogue/Strategy/AssassinationRogueStrategy.h
+++ b/src/Ai/Class/Rogue/Strategy/AssassinationRogueStrategy.h
@@ -1,6 +1,6 @@
 
-#ifndef _PLAYERBOT_ASSASSINATIONROGUESTRATEGY_H
-#define _PLAYERBOT_ASSASSINATIONROGUESTRATEGY_H
+#ifndef PLAYERBOTS_ASSASSINATIONROGUESTRATEGY_H
+#define PLAYERBOTS_ASSASSINATIONROGUESTRATEGY_H
 
 #include "MeleeCombatStrategy.h"
 
diff --git a/src/Ai/Class/Rogue/Strategy/DpsRogueStrategy.h b/src/Ai/Class/Rogue/Strategy/DpsRogueStrategy.h
index ae418b6c9..95d64d667 100644
--- a/src/Ai/Class/Rogue/Strategy/DpsRogueStrategy.h
+++ b/src/Ai/Class/Rogue/Strategy/DpsRogueStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DPSROGUESTRATEGY_H
-#define _PLAYERBOT_DPSROGUESTRATEGY_H
+#ifndef PLAYERBOTS_DPSROGUESTRATEGY_H
+#define PLAYERBOTS_DPSROGUESTRATEGY_H
 
 #include "CombatStrategy.h"
 #include "MeleeCombatStrategy.h"
diff --git a/src/Ai/Class/Rogue/Strategy/GenericRogueNonCombatStrategy.h b/src/Ai/Class/Rogue/Strategy/GenericRogueNonCombatStrategy.h
index 8bc4e3c5d..1fe600eed 100644
--- a/src/Ai/Class/Rogue/Strategy/GenericRogueNonCombatStrategy.h
+++ b/src/Ai/Class/Rogue/Strategy/GenericRogueNonCombatStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICROGUENONCOMBATSTRATEGY_H
-#define _PLAYERBOT_GENERICROGUENONCOMBATSTRATEGY_H
+#ifndef PLAYERBOTS_GENERICROGUENONCOMBATSTRATEGY_H
+#define PLAYERBOTS_GENERICROGUENONCOMBATSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Class/Shaman/ShamanActions.h b/src/Ai/Class/Shaman/ShamanActions.h
index cdd661561..bd469d1a3 100644
--- a/src/Ai/Class/Shaman/ShamanActions.h
+++ b/src/Ai/Class/Shaman/ShamanActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SHAMANACTIONS_H
-#define _PLAYERBOT_SHAMANACTIONS_H
+#ifndef PLAYERBOTS_SHAMANACTIONS_H
+#define PLAYERBOTS_SHAMANACTIONS_H
 
 #include "GenericSpellActions.h"
 #include "Playerbots.h"
diff --git a/src/Ai/Class/Shaman/ShamanAiObjectContext.h b/src/Ai/Class/Shaman/ShamanAiObjectContext.h
index cb07ba6e6..1449b2248 100644
--- a/src/Ai/Class/Shaman/ShamanAiObjectContext.h
+++ b/src/Ai/Class/Shaman/ShamanAiObjectContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SHAMANAIOBJECTCONTEXT_H
-#define _PLAYERBOT_SHAMANAIOBJECTCONTEXT_H
+#ifndef PLAYERBOTS_SHAMANAIOBJECTCONTEXT_H
+#define PLAYERBOTS_SHAMANAIOBJECTCONTEXT_H
 
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Class/Shaman/ShamanTriggers.h b/src/Ai/Class/Shaman/ShamanTriggers.h
index 800dc8342..d93bcefb0 100644
--- a/src/Ai/Class/Shaman/ShamanTriggers.h
+++ b/src/Ai/Class/Shaman/ShamanTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SHAMANTRIGGERS_H
-#define _PLAYERBOT_SHAMANTRIGGERS_H
+#ifndef PLAYERBOTS_SHAMANTRIGGERS_H
+#define PLAYERBOTS_SHAMANTRIGGERS_H
 
 #include "CureTriggers.h"
 #include "GenericTriggers.h"
diff --git a/src/Ai/Class/Shaman/Strategy/ElementalShamanStrategy.h b/src/Ai/Class/Shaman/Strategy/ElementalShamanStrategy.h
index 3c5848563..353601779 100644
--- a/src/Ai/Class/Shaman/Strategy/ElementalShamanStrategy.h
+++ b/src/Ai/Class/Shaman/Strategy/ElementalShamanStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ELEMENTALSHAMANSTRATEGY_H
-#define _PLAYERBOT_ELEMENTALSHAMANSTRATEGY_H
+#ifndef PLAYERBOTS_ELEMENTALSHAMANSTRATEGY_H
+#define PLAYERBOTS_ELEMENTALSHAMANSTRATEGY_H
 
 #include "GenericShamanStrategy.h"
 
diff --git a/src/Ai/Class/Shaman/Strategy/EnhancementShamanStrategy.h b/src/Ai/Class/Shaman/Strategy/EnhancementShamanStrategy.h
index 1ebfb8694..f159966b4 100644
--- a/src/Ai/Class/Shaman/Strategy/EnhancementShamanStrategy.h
+++ b/src/Ai/Class/Shaman/Strategy/EnhancementShamanStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ENHANCEMENTSHAMANSTRATEGY_H
-#define _PLAYERBOT_ENHANCEMENTSHAMANSTRATEGY_H
+#ifndef PLAYERBOTS_ENHANCEMENTSHAMANSTRATEGY_H
+#define PLAYERBOTS_ENHANCEMENTSHAMANSTRATEGY_H
 
 #include "GenericShamanStrategy.h"
 
diff --git a/src/Ai/Class/Shaman/Strategy/GenericShamanStrategy.h b/src/Ai/Class/Shaman/Strategy/GenericShamanStrategy.h
index 953b09309..f3ce09521 100644
--- a/src/Ai/Class/Shaman/Strategy/GenericShamanStrategy.h
+++ b/src/Ai/Class/Shaman/Strategy/GenericShamanStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICSHAMANSTRATEGY_H
-#define _PLAYERBOT_GENERICSHAMANSTRATEGY_H
+#ifndef PLAYERBOTS_GENERICSHAMANSTRATEGY_H
+#define PLAYERBOTS_GENERICSHAMANSTRATEGY_H
 
 #include "CombatStrategy.h"
 
diff --git a/src/Ai/Class/Shaman/Strategy/RestoShamanStrategy.h b/src/Ai/Class/Shaman/Strategy/RestoShamanStrategy.h
index dc26d2ea6..c58cbab41 100644
--- a/src/Ai/Class/Shaman/Strategy/RestoShamanStrategy.h
+++ b/src/Ai/Class/Shaman/Strategy/RestoShamanStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RESTOSHAMANSTRATEGY_H
-#define _PLAYERBOT_RESTOSHAMANSTRATEGY_H
+#ifndef PLAYERBOTS_RESTOSHAMANSTRATEGY_H
+#define PLAYERBOTS_RESTOSHAMANSTRATEGY_H
 
 #include "GenericShamanStrategy.h"
 #include "Strategy.h"
diff --git a/src/Ai/Class/Shaman/Strategy/ShamanNonCombatStrategy.h b/src/Ai/Class/Shaman/Strategy/ShamanNonCombatStrategy.h
index 9fc34e8b0..e7042af86 100644
--- a/src/Ai/Class/Shaman/Strategy/ShamanNonCombatStrategy.h
+++ b/src/Ai/Class/Shaman/Strategy/ShamanNonCombatStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SHAMANNONCOMBATSTRATEGY_H
-#define _PLAYERBOT_SHAMANNONCOMBATSTRATEGY_H
+#ifndef PLAYERBOTS_SHAMANNONCOMBATSTRATEGY_H
+#define PLAYERBOTS_SHAMANNONCOMBATSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Class/Shaman/Strategy/TotemsShamanStrategy.h b/src/Ai/Class/Shaman/Strategy/TotemsShamanStrategy.h
index 60488740c..03faa7f5e 100644
--- a/src/Ai/Class/Shaman/Strategy/TotemsShamanStrategy.h
+++ b/src/Ai/Class/Shaman/Strategy/TotemsShamanStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TOTEMSSHAMANSTRATEGY_H
-#define _PLAYERBOT_TOTEMSSHAMANSTRATEGY_H
+#ifndef PLAYERBOTS_TOTEMSSHAMANSTRATEGY_H
+#define PLAYERBOTS_TOTEMSSHAMANSTRATEGY_H
 
 #include "GenericShamanStrategy.h"
 #include <vector>
diff --git a/src/Ai/Class/Warlock/Strategy/AfflictionWarlockStrategy.h b/src/Ai/Class/Warlock/Strategy/AfflictionWarlockStrategy.h
index 503715bd4..2eecbf3db 100644
--- a/src/Ai/Class/Warlock/Strategy/AfflictionWarlockStrategy.h
+++ b/src/Ai/Class/Warlock/Strategy/AfflictionWarlockStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_AFFLICTIONWARLOCKSTRATEGY_H
-#define _PLAYERBOT_AFFLICTIONWARLOCKSTRATEGY_H
+#ifndef PLAYERBOTS_AFFLICTIONWARLOCKSTRATEGY_H
+#define PLAYERBOTS_AFFLICTIONWARLOCKSTRATEGY_H
 
 #include "GenericWarlockStrategy.h"
 #include "CombatStrategy.h"
diff --git a/src/Ai/Class/Warlock/Strategy/DemonologyWarlockStrategy.h b/src/Ai/Class/Warlock/Strategy/DemonologyWarlockStrategy.h
index 5a84175a5..f9f55e811 100644
--- a/src/Ai/Class/Warlock/Strategy/DemonologyWarlockStrategy.h
+++ b/src/Ai/Class/Warlock/Strategy/DemonologyWarlockStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DEMONOLOGYWARLOCKSTRATEGY_H
-#define _PLAYERBOT_DEMONOLOGYWARLOCKSTRATEGY_H
+#ifndef PLAYERBOTS_DEMONOLOGYWARLOCKSTRATEGY_H
+#define PLAYERBOTS_DEMONOLOGYWARLOCKSTRATEGY_H
 
 #include "GenericWarlockStrategy.h"
 #include "CombatStrategy.h"
diff --git a/src/Ai/Class/Warlock/Strategy/DestructionWarlockStrategy.h b/src/Ai/Class/Warlock/Strategy/DestructionWarlockStrategy.h
index 68fe67bb3..27eb875ad 100644
--- a/src/Ai/Class/Warlock/Strategy/DestructionWarlockStrategy.h
+++ b/src/Ai/Class/Warlock/Strategy/DestructionWarlockStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_DESTRUCTIONWARLOCKSTRATEGY_H
-#define _PLAYERBOT_DESTRUCTIONWARLOCKSTRATEGY_H
+#ifndef PLAYERBOTS_DESTRUCTIONWARLOCKSTRATEGY_H
+#define PLAYERBOTS_DESTRUCTIONWARLOCKSTRATEGY_H
 
 #include "GenericWarlockStrategy.h"
 #include "CombatStrategy.h"
diff --git a/src/Ai/Class/Warlock/Strategy/GenericWarlockNonCombatStrategy.h b/src/Ai/Class/Warlock/Strategy/GenericWarlockNonCombatStrategy.h
index 0da7973a0..4e333e59b 100644
--- a/src/Ai/Class/Warlock/Strategy/GenericWarlockNonCombatStrategy.h
+++ b/src/Ai/Class/Warlock/Strategy/GenericWarlockNonCombatStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICWARLOCKNONCOMBATSTRATEGY_H
-#define _PLAYERBOT_GENERICWARLOCKNONCOMBATSTRATEGY_H
+#ifndef PLAYERBOTS_GENERICWARLOCKNONCOMBATSTRATEGY_H
+#define PLAYERBOTS_GENERICWARLOCKNONCOMBATSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Class/Warlock/Strategy/GenericWarlockStrategy.h b/src/Ai/Class/Warlock/Strategy/GenericWarlockStrategy.h
index a44a03de4..42185b3c9 100644
--- a/src/Ai/Class/Warlock/Strategy/GenericWarlockStrategy.h
+++ b/src/Ai/Class/Warlock/Strategy/GenericWarlockStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICWARLOCKSTRATEGY_H
-#define _PLAYERBOT_GENERICWARLOCKSTRATEGY_H
+#ifndef PLAYERBOTS_GENERICWARLOCKSTRATEGY_H
+#define PLAYERBOTS_GENERICWARLOCKSTRATEGY_H
 
 #include "CombatStrategy.h"
 
diff --git a/src/Ai/Class/Warlock/Strategy/TankWarlockStrategy.h b/src/Ai/Class/Warlock/Strategy/TankWarlockStrategy.h
index f20ffe894..d09362313 100644
--- a/src/Ai/Class/Warlock/Strategy/TankWarlockStrategy.h
+++ b/src/Ai/Class/Warlock/Strategy/TankWarlockStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TANKWARLOCKSTRATEGY_H
-#define _PLAYERBOT_TANKWARLOCKSTRATEGY_H
+#ifndef PLAYERBOTS_TANKWARLOCKSTRATEGY_H
+#define PLAYERBOTS_TANKWARLOCKSTRATEGY_H
 
 #include "GenericWarlockStrategy.h"
 
diff --git a/src/Ai/Class/Warlock/WarlockActions.h b/src/Ai/Class/Warlock/WarlockActions.h
index 8fca0fdc4..6c267a980 100644
--- a/src/Ai/Class/Warlock/WarlockActions.h
+++ b/src/Ai/Class/Warlock/WarlockActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WARLOCKACTIONS_H
-#define _PLAYERBOT_WARLOCKACTIONS_H
+#ifndef PLAYERBOTS_WARLOCKACTIONS_H
+#define PLAYERBOTS_WARLOCKACTIONS_H
 
 #include "GenericSpellActions.h"
 #include "UseItemAction.h"
diff --git a/src/Ai/Class/Warlock/WarlockAiObjectContext.h b/src/Ai/Class/Warlock/WarlockAiObjectContext.h
index 29b3792d9..5dc13c3f8 100644
--- a/src/Ai/Class/Warlock/WarlockAiObjectContext.h
+++ b/src/Ai/Class/Warlock/WarlockAiObjectContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WARLOCKAIOBJECTCONTEXT_H
-#define _PLAYERBOT_WARLOCKAIOBJECTCONTEXT_H
+#ifndef PLAYERBOTS_WARLOCKAIOBJECTCONTEXT_H
+#define PLAYERBOTS_WARLOCKAIOBJECTCONTEXT_H
 
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Class/Warlock/WarlockTriggers.h b/src/Ai/Class/Warlock/WarlockTriggers.h
index 15991e270..c42e0b22c 100644
--- a/src/Ai/Class/Warlock/WarlockTriggers.h
+++ b/src/Ai/Class/Warlock/WarlockTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WARLOCKTRIGGERS_H
-#define _PLAYERBOT_WARLOCKTRIGGERS_H
+#ifndef PLAYERBOTS_WARLOCKTRIGGERS_H
+#define PLAYERBOTS_WARLOCKTRIGGERS_H
 
 #include "GenericTriggers.h"
 #include "PlayerbotAI.h"
diff --git a/src/Ai/Class/Warrior/Strategy/ArmsWarriorStrategy.h b/src/Ai/Class/Warrior/Strategy/ArmsWarriorStrategy.h
index 126d16210..55da377ff 100644
--- a/src/Ai/Class/Warrior/Strategy/ArmsWarriorStrategy.h
+++ b/src/Ai/Class/Warrior/Strategy/ArmsWarriorStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ARMSWARRIORSTRATEGY_H
-#define _PLAYERBOT_ARMSWARRIORSTRATEGY_H
+#ifndef PLAYERBOTS_ARMSWARRIORSTRATEGY_H
+#define PLAYERBOTS_ARMSWARRIORSTRATEGY_H
 
 #include "GenericWarriorStrategy.h"
 
diff --git a/src/Ai/Class/Warrior/Strategy/FuryWarriorStrategy.h b/src/Ai/Class/Warrior/Strategy/FuryWarriorStrategy.h
index 79413960b..8a5c6a572 100644
--- a/src/Ai/Class/Warrior/Strategy/FuryWarriorStrategy.h
+++ b/src/Ai/Class/Warrior/Strategy/FuryWarriorStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_FURYWARRIORSTRATEGY_H
-#define _PLAYERBOT_FURYWARRIORSTRATEGY_H
+#ifndef PLAYERBOTS_FURYWARRIORSTRATEGY_H
+#define PLAYERBOTS_FURYWARRIORSTRATEGY_H
 
 #include "GenericWarriorStrategy.h"
 
diff --git a/src/Ai/Class/Warrior/Strategy/GenericWarriorNonCombatStrategy.h b/src/Ai/Class/Warrior/Strategy/GenericWarriorNonCombatStrategy.h
index 160d8df8f..b941c877f 100644
--- a/src/Ai/Class/Warrior/Strategy/GenericWarriorNonCombatStrategy.h
+++ b/src/Ai/Class/Warrior/Strategy/GenericWarriorNonCombatStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICWARRIORNONCOBATSTRATEGY_H
-#define _PLAYERBOT_GENERICWARRIORNONCOBATSTRATEGY_H
+#ifndef PLAYERBOTS_GENERICWARRIORNONCOMBATSTRATEGY_H
+#define PLAYERBOTS_GENERICWARRIORNONCOMBATSTRATEGY_H
 
 #include "NonCombatStrategy.h"
 
diff --git a/src/Ai/Class/Warrior/Strategy/GenericWarriorStrategy.h b/src/Ai/Class/Warrior/Strategy/GenericWarriorStrategy.h
index 5a336be20..efd7eba28 100644
--- a/src/Ai/Class/Warrior/Strategy/GenericWarriorStrategy.h
+++ b/src/Ai/Class/Warrior/Strategy/GenericWarriorStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GENERICWARRIORSTRATEGY_H
-#define _PLAYERBOT_GENERICWARRIORSTRATEGY_H
+#ifndef PLAYERBOTS_GENERICWARRIORSTRATEGY_H
+#define PLAYERBOTS_GENERICWARRIORSTRATEGY_H
 
 #include "CombatStrategy.h"
 
diff --git a/src/Ai/Class/Warrior/Strategy/TankWarriorStrategy.h b/src/Ai/Class/Warrior/Strategy/TankWarriorStrategy.h
index b52824297..794462704 100644
--- a/src/Ai/Class/Warrior/Strategy/TankWarriorStrategy.h
+++ b/src/Ai/Class/Warrior/Strategy/TankWarriorStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TANKWARRIORSTRATEGY_H
-#define _PLAYERBOT_TANKWARRIORSTRATEGY_H
+#ifndef PLAYERBOTS_TANKWARRIORSTRATEGY_H
+#define PLAYERBOTS_TANKWARRIORSTRATEGY_H
 
 #include "GenericWarriorStrategy.h"
 #include "WarriorTriggers.h"
diff --git a/src/Ai/Class/Warrior/Strategy/WarriorPullStrategy.h b/src/Ai/Class/Warrior/Strategy/WarriorPullStrategy.h
index c63bb21ee..a1b2217b7 100644
--- a/src/Ai/Class/Warrior/Strategy/WarriorPullStrategy.h
+++ b/src/Ai/Class/Warrior/Strategy/WarriorPullStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WARRIOR_PULL_STRATEGY_H
-#define _PLAYERBOT_WARRIOR_PULL_STRATEGY_H
+#ifndef PLAYERBOTS_WARRIORPULLSTRATEGY_H
+#define PLAYERBOTS_WARRIORPULLSTRATEGY_H
 
 #include "PullStrategy.h"
 
diff --git a/src/Ai/Class/Warrior/WarriorActions.h b/src/Ai/Class/Warrior/WarriorActions.h
index da004fc70..f1316c2cb 100644
--- a/src/Ai/Class/Warrior/WarriorActions.h
+++ b/src/Ai/Class/Warrior/WarriorActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WARRIORACTIONS_H
-#define _PLAYERBOT_WARRIORACTIONS_H
+#ifndef PLAYERBOTS_WARRIORACTIONS_H
+#define PLAYERBOTS_WARRIORACTIONS_H
 
 #include "AiObject.h"
 #include "GenericSpellActions.h"
diff --git a/src/Ai/Class/Warrior/WarriorAiObjectContext.h b/src/Ai/Class/Warrior/WarriorAiObjectContext.h
index b4f3449b7..b7a5d6049 100644
--- a/src/Ai/Class/Warrior/WarriorAiObjectContext.h
+++ b/src/Ai/Class/Warrior/WarriorAiObjectContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WARRIORAIOBJECTCONTEXT_H
-#define _PLAYERBOT_WARRIORAIOBJECTCONTEXT_H
+#ifndef PLAYERBOTS_WARRIORAIOBJECTCONTEXT_H
+#define PLAYERBOTS_WARRIORAIOBJECTCONTEXT_H
 
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Class/Warrior/WarriorTriggers.h b/src/Ai/Class/Warrior/WarriorTriggers.h
index 8a9ed9248..15865744e 100644
--- a/src/Ai/Class/Warrior/WarriorTriggers.h
+++ b/src/Ai/Class/Warrior/WarriorTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WARRIORTRIGGERS_H
-#define _PLAYERBOT_WARRIORTRIGGERS_H
+#ifndef PLAYERBOTS_WARRIORTRIGGERS_H
+#define PLAYERBOTS_WARRIORTRIGGERS_H
 
 #include "GenericTriggers.h"
 #include "PlayerbotAI.h"
diff --git a/src/Ai/Dungeon/AC/ACActionContext.h b/src/Ai/Dungeon/AC/ACActionContext.h
index 40921e361..a0b7eba4d 100644
--- a/src/Ai/Dungeon/AC/ACActionContext.h
+++ b/src/Ai/Dungeon/AC/ACActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_TBCDUNGEONAUCHENAICRYPTSACTIONCONTEXT_H
-#define _PLAYERBOT_TBCDUNGEONAUCHENAICRYPTSACTIONCONTEXT_H
+#ifndef PLAYERBOTS_ACACTIONCONTEXT_H
+#define PLAYERBOTS_ACACTIONCONTEXT_H
 
 #include "AiObjectContext.h"
 #include "Action.h"
diff --git a/src/Ai/Dungeon/AC/ACActions.h b/src/Ai/Dungeon/AC/ACActions.h
index 50240ae0b..35880ba3e 100644
--- a/src/Ai/Dungeon/AC/ACActions.h
+++ b/src/Ai/Dungeon/AC/ACActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_TBCDUNGEONAUCHENAICRYPTSACTIONS_H
-#define _PLAYERBOT_TBCDUNGEONAUCHENAICRYPTSACTIONS_H
+#ifndef PLAYERBOTS_ACACTIONS_H
+#define PLAYERBOTS_ACACTIONS_H
 
 #include "AttackAction.h"
 #include "MovementActions.h"
diff --git a/src/Ai/Dungeon/AC/ACMultipliers.h b/src/Ai/Dungeon/AC/ACMultipliers.h
index df5de2318..ea13f1f2b 100644
--- a/src/Ai/Dungeon/AC/ACMultipliers.h
+++ b/src/Ai/Dungeon/AC/ACMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_TBCDUNGEONAUCHENAICRYPTSMULTIPLIERS_H
-#define _PLAYERBOT_TBCDUNGEONAUCHENAICRYPTSMULTIPLIERS_H
+#ifndef PLAYERBOTS_ACMULTIPLIERS_H
+#define PLAYERBOTS_ACMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Dungeon/AC/ACStrategy.h b/src/Ai/Dungeon/AC/ACStrategy.h
index ff82a0266..4d841d7e8 100644
--- a/src/Ai/Dungeon/AC/ACStrategy.h
+++ b/src/Ai/Dungeon/AC/ACStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_TBCDUNGEONAUCHENAICRYPTSSTRATEGY_H
-#define _PLAYERBOT_TBCDUNGEONAUCHENAICRYPTSSTRATEGY_H
+#ifndef PLAYERBOTS_ACSTRATEGY_H
+#define PLAYERBOTS_ACSTRATEGY_H
 
 #include "AiObjectContext.h"
 #include "Strategy.h"
diff --git a/src/Ai/Dungeon/AC/ACTriggerContext.h b/src/Ai/Dungeon/AC/ACTriggerContext.h
index f9c7299b4..289f69580 100644
--- a/src/Ai/Dungeon/AC/ACTriggerContext.h
+++ b/src/Ai/Dungeon/AC/ACTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_TBCDUNGEONAUCHENAICRYPTSTRIGGERCONTEXT_H
-#define _PLAYERBOT_TBCDUNGEONAUCHENAICRYPTSTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_ACTRIGGERCONTEXT_H
+#define PLAYERBOTS_ACTRIGGERCONTEXT_H
 
 #include "AiObjectContext.h"
 #include "TriggerContext.h"
diff --git a/src/Ai/Dungeon/AC/ACTriggers.h b/src/Ai/Dungeon/AC/ACTriggers.h
index 1d3144194..92ca47668 100644
--- a/src/Ai/Dungeon/AC/ACTriggers.h
+++ b/src/Ai/Dungeon/AC/ACTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_TBCDUNGEONAUCHENAICRYPTSTRIGGERS_H
-#define _PLAYERBOT_TBCDUNGEONAUCHENAICRYPTSTRIGGERS_H
+#ifndef PLAYERBOTS_ACTRIGGERS_H
+#define PLAYERBOTS_ACTRIGGERS_H
 
 #include "Trigger.h"
 #include "GenericTriggers.h"
diff --git a/src/Ai/Dungeon/AK/AKActionContext.h b/src/Ai/Dungeon/AK/AKActionContext.h
index e462de443..a087739ce 100644
--- a/src/Ai/Dungeon/AK/AKActionContext.h
+++ b/src/Ai/Dungeon/AK/AKActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONOKACTIONCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONOKACTIONCONTEXT_H
+#ifndef PLAYERBOTS_AKACTIONCONTEXT_H
+#define PLAYERBOTS_AKACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Dungeon/AK/AKActions.h b/src/Ai/Dungeon/AK/AKActions.h
index 62223022c..25d278c6b 100644
--- a/src/Ai/Dungeon/AK/AKActions.h
+++ b/src/Ai/Dungeon/AK/AKActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONOKACTIONS_H
-#define _PLAYERBOT_WOTLKDUNGEONOKACTIONS_H
+#ifndef PLAYERBOTS_AKACTIONS_H
+#define PLAYERBOTS_AKACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Dungeon/AK/AKMultipliers.h b/src/Ai/Dungeon/AK/AKMultipliers.h
index 88ae2fa51..a0bf9bf39 100644
--- a/src/Ai/Dungeon/AK/AKMultipliers.h
+++ b/src/Ai/Dungeon/AK/AKMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONOKMULTIPLIERS_H
-#define _PLAYERBOT_WOTLKDUNGEONOKMULTIPLIERS_H
+#ifndef PLAYERBOTS_AKMULTIPLIERS_H
+#define PLAYERBOTS_AKMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Dungeon/AK/AKStrategy.h b/src/Ai/Dungeon/AK/AKStrategy.h
index 75c475559..21b4a22e0 100644
--- a/src/Ai/Dungeon/AK/AKStrategy.h
+++ b/src/Ai/Dungeon/AK/AKStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONOKSTRATEGY_H
-#define _PLAYERBOT_WOTLKDUNGEONOKSTRATEGY_H
+#ifndef PLAYERBOTS_AKSTRATEGY_H
+#define PLAYERBOTS_AKSTRATEGY_H
 
 #include "Multiplier.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/AK/AKTriggerContext.h b/src/Ai/Dungeon/AK/AKTriggerContext.h
index 72d8e6076..ff2f4ca0c 100644
--- a/src/Ai/Dungeon/AK/AKTriggerContext.h
+++ b/src/Ai/Dungeon/AK/AKTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONOKTRIGGERCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONOKTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_AKTRIGGERCONTEXT_H
+#define PLAYERBOTS_AKTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/AK/AKTriggers.h b/src/Ai/Dungeon/AK/AKTriggers.h
index 2aa77986e..07506bd90 100644
--- a/src/Ai/Dungeon/AK/AKTriggers.h
+++ b/src/Ai/Dungeon/AK/AKTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONOKTRIGGERS_H
-#define _PLAYERBOT_WOTLKDUNGEONOKTRIGGERS_H
+#ifndef PLAYERBOTS_AKTRIGGERS_H
+#define PLAYERBOTS_AKTRIGGERS_H
 
 #include "Trigger.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Dungeon/AN/ANActionContext.h b/src/Ai/Dungeon/AN/ANActionContext.h
index 11a5c4fe5..2252a7710 100644
--- a/src/Ai/Dungeon/AN/ANActionContext.h
+++ b/src/Ai/Dungeon/AN/ANActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONANACTIONCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONANACTIONCONTEXT_H
+#ifndef PLAYERBOTS_ANACTIONCONTEXT_H
+#define PLAYERBOTS_ANACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Dungeon/AN/ANActions.h b/src/Ai/Dungeon/AN/ANActions.h
index 69bcc15b7..3338a540d 100644
--- a/src/Ai/Dungeon/AN/ANActions.h
+++ b/src/Ai/Dungeon/AN/ANActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONANACTIONS_H
-#define _PLAYERBOT_WOTLKDUNGEONANACTIONS_H
+#ifndef PLAYERBOTS_ANACTIONS_H
+#define PLAYERBOTS_ANACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Dungeon/AN/ANMultipliers.h b/src/Ai/Dungeon/AN/ANMultipliers.h
index bb01115e2..a6c610b64 100644
--- a/src/Ai/Dungeon/AN/ANMultipliers.h
+++ b/src/Ai/Dungeon/AN/ANMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONANMULTIPLIERS_H
-#define _PLAYERBOT_WOTLKDUNGEONANMULTIPLIERS_H
+#ifndef PLAYERBOTS_ANMULTIPLIERS_H
+#define PLAYERBOTS_ANMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Dungeon/AN/ANStrategy.h b/src/Ai/Dungeon/AN/ANStrategy.h
index 70196e6e4..6fb77809a 100644
--- a/src/Ai/Dungeon/AN/ANStrategy.h
+++ b/src/Ai/Dungeon/AN/ANStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONANSTRATEGY_H
-#define _PLAYERBOT_WOTLKDUNGEONANSTRATEGY_H
+#ifndef PLAYERBOTS_ANSTRATEGY_H
+#define PLAYERBOTS_ANSTRATEGY_H
 
 #include "Multiplier.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/AN/ANTriggerContext.h b/src/Ai/Dungeon/AN/ANTriggerContext.h
index 95131501d..59f6bf9a7 100644
--- a/src/Ai/Dungeon/AN/ANTriggerContext.h
+++ b/src/Ai/Dungeon/AN/ANTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONANTRIGGERCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONANTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_ANTRIGGERCONTEXT_H
+#define PLAYERBOTS_ANTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/AN/ANTriggers.h b/src/Ai/Dungeon/AN/ANTriggers.h
index 5d12b5960..357239c11 100644
--- a/src/Ai/Dungeon/AN/ANTriggers.h
+++ b/src/Ai/Dungeon/AN/ANTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONANTRIGGERS_H
-#define _PLAYERBOT_WOTLKDUNGEONANTRIGGERS_H
+#ifndef PLAYERBOTS_ANTRIGGERS_H
+#define PLAYERBOTS_ANTRIGGERS_H
 
 #include "Trigger.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Dungeon/CoS/CoSActionContext.h b/src/Ai/Dungeon/CoS/CoSActionContext.h
index 782c0202b..df1e5953f 100644
--- a/src/Ai/Dungeon/CoS/CoSActionContext.h
+++ b/src/Ai/Dungeon/CoS/CoSActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONCOSACTIONCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONCOSACTIONCONTEXT_H
+#ifndef PLAYERBOTS_COSACTIONCONTEXT_H
+#define PLAYERBOTS_COSACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Dungeon/CoS/CoSActions.h b/src/Ai/Dungeon/CoS/CoSActions.h
index 98ece6eb5..50350d88a 100644
--- a/src/Ai/Dungeon/CoS/CoSActions.h
+++ b/src/Ai/Dungeon/CoS/CoSActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONCOSACTIONS_H
-#define _PLAYERBOT_WOTLKDUNGEONCOSACTIONS_H
+#ifndef PLAYERBOTS_COSACTIONS_H
+#define PLAYERBOTS_COSACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Dungeon/CoS/CoSMultipliers.h b/src/Ai/Dungeon/CoS/CoSMultipliers.h
index 587b0f704..ea03479f7 100644
--- a/src/Ai/Dungeon/CoS/CoSMultipliers.h
+++ b/src/Ai/Dungeon/CoS/CoSMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONCOSMULTIPLIERS_H
-#define _PLAYERBOT_WOTLKDUNGEONCOSMULTIPLIERS_H
+#ifndef PLAYERBOTS_COSMULTIPLIERS_H
+#define PLAYERBOTS_COSMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Dungeon/CoS/CoSStrategy.h b/src/Ai/Dungeon/CoS/CoSStrategy.h
index bff126743..32aad4310 100644
--- a/src/Ai/Dungeon/CoS/CoSStrategy.h
+++ b/src/Ai/Dungeon/CoS/CoSStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONCOSSTRATEGY_H
-#define _PLAYERBOT_WOTLKDUNGEONCOSSTRATEGY_H
+#ifndef PLAYERBOTS_COSSTRATEGY_H
+#define PLAYERBOTS_COSSTRATEGY_H
 
 #include "Multiplier.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/CoS/CoSTriggerContext.h b/src/Ai/Dungeon/CoS/CoSTriggerContext.h
index 302d99381..b379b330e 100644
--- a/src/Ai/Dungeon/CoS/CoSTriggerContext.h
+++ b/src/Ai/Dungeon/CoS/CoSTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONCOSTRIGGERCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONCOSTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_COSTRIGGERCONTEXT_H
+#define PLAYERBOTS_COSTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/CoS/CoSTriggers.h b/src/Ai/Dungeon/CoS/CoSTriggers.h
index 28fafa368..8be602aae 100644
--- a/src/Ai/Dungeon/CoS/CoSTriggers.h
+++ b/src/Ai/Dungeon/CoS/CoSTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONCOSTRIGGERS_H
-#define _PLAYERBOT_WOTLKDUNGEONCOSTRIGGERS_H
+#ifndef PLAYERBOTS_COSTRIGGERS_H
+#define PLAYERBOTS_COSTRIGGERS_H
 
 #include "Trigger.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Dungeon/DTK/DTKActionContext.h b/src/Ai/Dungeon/DTK/DTKActionContext.h
index 61c163292..c46620b26 100644
--- a/src/Ai/Dungeon/DTK/DTKActionContext.h
+++ b/src/Ai/Dungeon/DTK/DTKActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONDTKACTIONCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONDTKACTIONCONTEXT_H
+#ifndef PLAYERBOTS_DTKACTIONCONTEXT_H
+#define PLAYERBOTS_DTKACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Dungeon/DTK/DTKActions.h b/src/Ai/Dungeon/DTK/DTKActions.h
index 5eaca264a..5ceda8f14 100644
--- a/src/Ai/Dungeon/DTK/DTKActions.h
+++ b/src/Ai/Dungeon/DTK/DTKActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONDTKACTIONS_H
-#define _PLAYERBOT_WOTLKDUNGEONDTKACTIONS_H
+#ifndef PLAYERBOTS_DTKACTIONS_H
+#define PLAYERBOTS_DTKACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Dungeon/DTK/DTKMultipliers.h b/src/Ai/Dungeon/DTK/DTKMultipliers.h
index c8f3c8135..2f2f7b2e0 100644
--- a/src/Ai/Dungeon/DTK/DTKMultipliers.h
+++ b/src/Ai/Dungeon/DTK/DTKMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONDTKMULTIPLIERS_H
-#define _PLAYERBOT_WOTLKDUNGEONDTKMULTIPLIERS_H
+#ifndef PLAYERBOTS_DTKMULTIPLIERS_H
+#define PLAYERBOTS_DTKMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Dungeon/DTK/DTKStrategy.h b/src/Ai/Dungeon/DTK/DTKStrategy.h
index 41ef0ced6..2c9089585 100644
--- a/src/Ai/Dungeon/DTK/DTKStrategy.h
+++ b/src/Ai/Dungeon/DTK/DTKStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONDTKSTRATEGY_H
-#define _PLAYERBOT_WOTLKDUNGEONDTKSTRATEGY_H
+#ifndef PLAYERBOTS_DTKSTRATEGY_H
+#define PLAYERBOTS_DTKSTRATEGY_H
 
 #include "Multiplier.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/DTK/DTKTriggerContext.h b/src/Ai/Dungeon/DTK/DTKTriggerContext.h
index 954c1da05..c00115b9c 100644
--- a/src/Ai/Dungeon/DTK/DTKTriggerContext.h
+++ b/src/Ai/Dungeon/DTK/DTKTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONDTKTRIGGERCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONDTKTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_DTKTRIGGERCONTEXT_H
+#define PLAYERBOTS_DTKTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/DTK/DTKTriggers.h b/src/Ai/Dungeon/DTK/DTKTriggers.h
index 627200e8d..76db32575 100644
--- a/src/Ai/Dungeon/DTK/DTKTriggers.h
+++ b/src/Ai/Dungeon/DTK/DTKTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONDTKTRIGGERS_H
-#define _PLAYERBOT_WOTLKDUNGEONDTKTRIGGERS_H
+#ifndef PLAYERBOTS_DTKTRIGGERS_H
+#define PLAYERBOTS_DTKTRIGGERS_H
 
 #include "Trigger.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Dungeon/DungeonStrategyContext.h b/src/Ai/Dungeon/DungeonStrategyContext.h
index e2365ea75..81fead567 100644
--- a/src/Ai/Dungeon/DungeonStrategyContext.h
+++ b/src/Ai/Dungeon/DungeonStrategyContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_DUNGEONSTRATEGYCONTEXT_H
-#define _PLAYERBOT_DUNGEONSTRATEGYCONTEXT_H
+#ifndef PLAYERBOTS_DUNGEONSTRATEGYCONTEXT_H
+#define PLAYERBOTS_DUNGEONSTRATEGYCONTEXT_H
 
 #include "Strategy.h"
 #include "ACStrategy.h"
diff --git a/src/Ai/Dungeon/DungeonStrategyUtils.h b/src/Ai/Dungeon/DungeonStrategyUtils.h
index 3f67f4b4d..c70ac1a01 100644
--- a/src/Ai/Dungeon/DungeonStrategyUtils.h
+++ b/src/Ai/Dungeon/DungeonStrategyUtils.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_DUNGEONUTILS_H
-#define _PLAYERBOT_DUNGEONUTILS_H
+#ifndef PLAYERBOTS_DUNGEONSTRATEGYUTILS_H
+#define PLAYERBOTS_DUNGEONSTRATEGYUTILS_H
 
 template<class T> inline
 const T& DUNGEON_MODE(Player* bot, const T& normal5, const T& heroic10)
diff --git a/src/Ai/Dungeon/FoS/FoSActionContext.h b/src/Ai/Dungeon/FoS/FoSActionContext.h
index 1a87e2647..5a0f3d93b 100644
--- a/src/Ai/Dungeon/FoS/FoSActionContext.h
+++ b/src/Ai/Dungeon/FoS/FoSActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONFOSACTIONCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONFOSACTIONCONTEXT_H
+#ifndef PLAYERBOTS_FOSACTIONCONTEXT_H
+#define PLAYERBOTS_FOSACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Dungeon/FoS/FoSActions.h b/src/Ai/Dungeon/FoS/FoSActions.h
index f91c93a21..8a566e458 100644
--- a/src/Ai/Dungeon/FoS/FoSActions.h
+++ b/src/Ai/Dungeon/FoS/FoSActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONFOSACTIONS_H
-#define _PLAYERBOT_WOTLKDUNGEONFOSACTIONS_H
+#ifndef PLAYERBOTS_FOSACTIONS_H
+#define PLAYERBOTS_FOSACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Dungeon/FoS/FoSMultipliers.h b/src/Ai/Dungeon/FoS/FoSMultipliers.h
index 1c89bb096..a39ccfac9 100644
--- a/src/Ai/Dungeon/FoS/FoSMultipliers.h
+++ b/src/Ai/Dungeon/FoS/FoSMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONFOSMULTIPLIERS_H
-#define _PLAYERBOT_WOTLKDUNGEONFOSMULTIPLIERS_H
+#ifndef PLAYERBOTS_FOSMULTIPLIERS_H
+#define PLAYERBOTS_FOSMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Dungeon/FoS/FoSStrategy.h b/src/Ai/Dungeon/FoS/FoSStrategy.h
index 79d58334a..490cc7086 100644
--- a/src/Ai/Dungeon/FoS/FoSStrategy.h
+++ b/src/Ai/Dungeon/FoS/FoSStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONFOSSTRATEGY_H
-#define _PLAYERBOT_WOTLKDUNGEONFOSSTRATEGY_H
+#ifndef PLAYERBOTS_FOSSTRATEGY_H
+#define PLAYERBOTS_FOSSTRATEGY_H
 #include "Multiplier.h"
 #include "Strategy.h"
 
diff --git a/src/Ai/Dungeon/FoS/FoSTriggerContext.h b/src/Ai/Dungeon/FoS/FoSTriggerContext.h
index aa8a0d4af..615e28c77 100644
--- a/src/Ai/Dungeon/FoS/FoSTriggerContext.h
+++ b/src/Ai/Dungeon/FoS/FoSTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONFOSTRIGGERCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONFOSTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_FOSTRIGGERCONTEXT_H
+#define PLAYERBOTS_FOSTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/FoS/FoSTriggers.h b/src/Ai/Dungeon/FoS/FoSTriggers.h
index 59dd202d4..bb4e282f5 100644
--- a/src/Ai/Dungeon/FoS/FoSTriggers.h
+++ b/src/Ai/Dungeon/FoS/FoSTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONFOSTRIGGERS_H
-#define _PLAYERBOT_WOTLKDUNGEONFOSTRIGGERS_H
+#ifndef PLAYERBOTS_FOSTRIGGERS_H
+#define PLAYERBOTS_FOSTRIGGERS_H
 
 #include "Trigger.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Dungeon/GD/GDActionContext.h b/src/Ai/Dungeon/GD/GDActionContext.h
index 3dd4f7164..c8d50abfe 100644
--- a/src/Ai/Dungeon/GD/GDActionContext.h
+++ b/src/Ai/Dungeon/GD/GDActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONGDACTIONCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONGDACTIONCONTEXT_H
+#ifndef PLAYERBOTS_GDACTIONCONTEXT_H
+#define PLAYERBOTS_GDACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Dungeon/GD/GDActions.h b/src/Ai/Dungeon/GD/GDActions.h
index 17070ac1e..029a534b7 100644
--- a/src/Ai/Dungeon/GD/GDActions.h
+++ b/src/Ai/Dungeon/GD/GDActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONGDACTIONS_H
-#define _PLAYERBOT_WOTLKDUNGEONGDACTIONS_H
+#ifndef PLAYERBOTS_GDACTIONS_H
+#define PLAYERBOTS_GDACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Dungeon/GD/GDMultipliers.h b/src/Ai/Dungeon/GD/GDMultipliers.h
index e1ceb0b62..c49e5eb4f 100644
--- a/src/Ai/Dungeon/GD/GDMultipliers.h
+++ b/src/Ai/Dungeon/GD/GDMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONGDMULTIPLIERS_H
-#define _PLAYERBOT_WOTLKDUNGEONGDMULTIPLIERS_H
+#ifndef PLAYERBOTS_GDMULTIPLIERS_H
+#define PLAYERBOTS_GDMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Dungeon/GD/GDStrategy.h b/src/Ai/Dungeon/GD/GDStrategy.h
index 47f8617f1..7a377064e 100644
--- a/src/Ai/Dungeon/GD/GDStrategy.h
+++ b/src/Ai/Dungeon/GD/GDStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONGDSTRATEGY_H
-#define _PLAYERBOT_WOTLKDUNGEONGDSTRATEGY_H
+#ifndef PLAYERBOTS_GDSTRATEGY_H
+#define PLAYERBOTS_GDSTRATEGY_H
 
 #include "Multiplier.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/GD/GDTriggerContext.h b/src/Ai/Dungeon/GD/GDTriggerContext.h
index e85e61a1d..8173fa6d2 100644
--- a/src/Ai/Dungeon/GD/GDTriggerContext.h
+++ b/src/Ai/Dungeon/GD/GDTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONGDTRIGGERCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONGDTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_GDTRIGGERCONTEXT_H
+#define PLAYERBOTS_GDTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/GD/GDTriggers.h b/src/Ai/Dungeon/GD/GDTriggers.h
index e8a5c25f1..16736f8b4 100644
--- a/src/Ai/Dungeon/GD/GDTriggers.h
+++ b/src/Ai/Dungeon/GD/GDTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONGDTRIGGERS_H
-#define _PLAYERBOT_WOTLKDUNGEONGDTRIGGERS_H
+#ifndef PLAYERBOTS_GDTRIGGERS_H
+#define PLAYERBOTS_GDTRIGGERS_H
 
 #include "Trigger.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Dungeon/HoL/HoLActionContext.h b/src/Ai/Dungeon/HoL/HoLActionContext.h
index f17380c9a..d5f2b0b19 100644
--- a/src/Ai/Dungeon/HoL/HoLActionContext.h
+++ b/src/Ai/Dungeon/HoL/HoLActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONHOLACTIONCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONHOLACTIONCONTEXT_H
+#ifndef PLAYERBOTS_HOLACTIONCONTEXT_H
+#define PLAYERBOTS_HOLACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Dungeon/HoL/HoLActions.h b/src/Ai/Dungeon/HoL/HoLActions.h
index 80bb51c22..edf51aa6d 100644
--- a/src/Ai/Dungeon/HoL/HoLActions.h
+++ b/src/Ai/Dungeon/HoL/HoLActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONHOLACTIONS_H
-#define _PLAYERBOT_WOTLKDUNGEONHOLACTIONS_H
+#ifndef PLAYERBOTS_HOLACTIONS_H
+#define PLAYERBOTS_HOLACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Dungeon/HoL/HoLMultipliers.h b/src/Ai/Dungeon/HoL/HoLMultipliers.h
index 8cc439677..209d60ce5 100644
--- a/src/Ai/Dungeon/HoL/HoLMultipliers.h
+++ b/src/Ai/Dungeon/HoL/HoLMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONHOLMULTIPLIERS_H
-#define _PLAYERBOT_WOTLKDUNGEONHOLMULTIPLIERS_H
+#ifndef PLAYERBOTS_HOLMULTIPLIERS_H
+#define PLAYERBOTS_HOLMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Dungeon/HoL/HoLStrategy.h b/src/Ai/Dungeon/HoL/HoLStrategy.h
index 6463033b3..ac394052f 100644
--- a/src/Ai/Dungeon/HoL/HoLStrategy.h
+++ b/src/Ai/Dungeon/HoL/HoLStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONHOLSTRATEGY_H
-#define _PLAYERBOT_WOTLKDUNGEONHOLSTRATEGY_H
+#ifndef PLAYERBOTS_HOLSTRATEGY_H
+#define PLAYERBOTS_HOLSTRATEGY_H
 
 #include "Multiplier.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/HoL/HoLTriggerContext.h b/src/Ai/Dungeon/HoL/HoLTriggerContext.h
index 999abaa24..bc01ef4e0 100644
--- a/src/Ai/Dungeon/HoL/HoLTriggerContext.h
+++ b/src/Ai/Dungeon/HoL/HoLTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONHOLTRIGGERCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONHOLTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_HOLTRIGGERCONTEXT_H
+#define PLAYERBOTS_HOLTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/HoL/HoLTriggers.h b/src/Ai/Dungeon/HoL/HoLTriggers.h
index 7dbbc4610..db0e62a1f 100644
--- a/src/Ai/Dungeon/HoL/HoLTriggers.h
+++ b/src/Ai/Dungeon/HoL/HoLTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONHOLTRIGGERS_H
-#define _PLAYERBOT_WOTLKDUNGEONHOLTRIGGERS_H
+#ifndef PLAYERBOTS_HOLTRIGGERS_H
+#define PLAYERBOTS_HOLTRIGGERS_H
 
 #include "Trigger.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Dungeon/HoS/HoSActionContext.h b/src/Ai/Dungeon/HoS/HoSActionContext.h
index 44ccfafcd..c44d67400 100644
--- a/src/Ai/Dungeon/HoS/HoSActionContext.h
+++ b/src/Ai/Dungeon/HoS/HoSActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONHOSACTIONCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONHOSACTIONCONTEXT_H
+#ifndef PLAYERBOTS_HOSACTIONCONTEXT_H
+#define PLAYERBOTS_HOSACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Dungeon/HoS/HoSActions.h b/src/Ai/Dungeon/HoS/HoSActions.h
index a564a968e..31d314d60 100644
--- a/src/Ai/Dungeon/HoS/HoSActions.h
+++ b/src/Ai/Dungeon/HoS/HoSActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONHOSACTIONS_H
-#define _PLAYERBOT_WOTLKDUNGEONHOSACTIONS_H
+#ifndef PLAYERBOTS_HOSACTIONS_H
+#define PLAYERBOTS_HOSACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Dungeon/HoS/HoSMultipliers.h b/src/Ai/Dungeon/HoS/HoSMultipliers.h
index 543d389a8..2d57f9bec 100644
--- a/src/Ai/Dungeon/HoS/HoSMultipliers.h
+++ b/src/Ai/Dungeon/HoS/HoSMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONHOSMULTIPLIERS_H
-#define _PLAYERBOT_WOTLKDUNGEONHOSMULTIPLIERS_H
+#ifndef PLAYERBOTS_HOSMULTIPLIERS_H
+#define PLAYERBOTS_HOSMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Dungeon/HoS/HoSStrategy.h b/src/Ai/Dungeon/HoS/HoSStrategy.h
index ee26aa2cd..4d993266d 100644
--- a/src/Ai/Dungeon/HoS/HoSStrategy.h
+++ b/src/Ai/Dungeon/HoS/HoSStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONHOSSTRATEGY_H
-#define _PLAYERBOT_WOTLKDUNGEONHOSSTRATEGY_H
+#ifndef PLAYERBOTS_HOSSTRATEGY_H
+#define PLAYERBOTS_HOSSTRATEGY_H
 
 #include "Multiplier.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/HoS/HoSTriggerContext.h b/src/Ai/Dungeon/HoS/HoSTriggerContext.h
index c6da70b69..cf0b3a505 100644
--- a/src/Ai/Dungeon/HoS/HoSTriggerContext.h
+++ b/src/Ai/Dungeon/HoS/HoSTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONHOSTRIGGERCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONHOSTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_HOSTRIGGERCONTEXT_H
+#define PLAYERBOTS_HOSTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/HoS/HoSTriggers.h b/src/Ai/Dungeon/HoS/HoSTriggers.h
index 53a15b6f2..85cf94288 100644
--- a/src/Ai/Dungeon/HoS/HoSTriggers.h
+++ b/src/Ai/Dungeon/HoS/HoSTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONHOSTRIGGERS_H
-#define _PLAYERBOT_WOTLKDUNGEONHOSTRIGGERS_H
+#ifndef PLAYERBOTS_HOSTRIGGERS_H
+#define PLAYERBOTS_HOSTRIGGERS_H
 
 #include "Trigger.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Dungeon/Nex/NexActionContext.h b/src/Ai/Dungeon/Nex/NexActionContext.h
index e8d91ba75..0acce7de8 100644
--- a/src/Ai/Dungeon/Nex/NexActionContext.h
+++ b/src/Ai/Dungeon/Nex/NexActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONNEXACTIONCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONNEXACTIONCONTEXT_H
+#ifndef PLAYERBOTS_NEXACTIONCONTEXT_H
+#define PLAYERBOTS_NEXACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Dungeon/Nex/NexActions.h b/src/Ai/Dungeon/Nex/NexActions.h
index 672cf0778..fa88fbdc2 100644
--- a/src/Ai/Dungeon/Nex/NexActions.h
+++ b/src/Ai/Dungeon/Nex/NexActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONNEXACTIONS_H
-#define _PLAYERBOT_WOTLKDUNGEONNEXACTIONS_H
+#ifndef PLAYERBOTS_NEXACTIONS_H
+#define PLAYERBOTS_NEXACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Dungeon/Nex/NexMultipliers.h b/src/Ai/Dungeon/Nex/NexMultipliers.h
index 00373ebd9..9f7ee24fc 100644
--- a/src/Ai/Dungeon/Nex/NexMultipliers.h
+++ b/src/Ai/Dungeon/Nex/NexMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONNEXMULTIPLIERS_H
-#define _PLAYERBOT_WOTLKDUNGEONNEXMULTIPLIERS_H
+#ifndef PLAYERBOTS_NEXMULTIPLIERS_H
+#define PLAYERBOTS_NEXMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Dungeon/Nex/NexStrategy.h b/src/Ai/Dungeon/Nex/NexStrategy.h
index c78225b93..c0e80d51b 100644
--- a/src/Ai/Dungeon/Nex/NexStrategy.h
+++ b/src/Ai/Dungeon/Nex/NexStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONNEXSTRATEGY_H
-#define _PLAYERBOT_WOTLKDUNGEONNEXSTRATEGY_H
+#ifndef PLAYERBOTS_NEXSTRATEGY_H
+#define PLAYERBOTS_NEXSTRATEGY_H
 
 #include "Multiplier.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/Nex/NexTriggerContext.h b/src/Ai/Dungeon/Nex/NexTriggerContext.h
index 706215c2f..6368aee92 100644
--- a/src/Ai/Dungeon/Nex/NexTriggerContext.h
+++ b/src/Ai/Dungeon/Nex/NexTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONNEXTRIGGERCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONNEXTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_NEXTRIGGERCONTEXT_H
+#define PLAYERBOTS_NEXTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/Nex/NexTriggers.h b/src/Ai/Dungeon/Nex/NexTriggers.h
index ac5d88a48..6be739ac6 100644
--- a/src/Ai/Dungeon/Nex/NexTriggers.h
+++ b/src/Ai/Dungeon/Nex/NexTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONNEXTRIGGERS_H
-#define _PLAYERBOT_WOTLKDUNGEONNEXTRIGGERS_H
+#ifndef PLAYERBOTS_NEXTRIGGERS_H
+#define PLAYERBOTS_NEXTRIGGERS_H
 
 #include "Trigger.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Dungeon/OC/OCActionContext.h b/src/Ai/Dungeon/OC/OCActionContext.h
index fefeecd44..433c2daa0 100644
--- a/src/Ai/Dungeon/OC/OCActionContext.h
+++ b/src/Ai/Dungeon/OC/OCActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONOCCACTIONCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONOCCACTIONCONTEXT_H
+#ifndef PLAYERBOTS_OCACTIONCONTEXT_H
+#define PLAYERBOTS_OCACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Dungeon/OC/OCActions.h b/src/Ai/Dungeon/OC/OCActions.h
index 6616ce884..6d9353352 100644
--- a/src/Ai/Dungeon/OC/OCActions.h
+++ b/src/Ai/Dungeon/OC/OCActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONOCCACTIONS_H
-#define _PLAYERBOT_WOTLKDUNGEONOCCACTIONS_H
+#ifndef PLAYERBOTS_OCACTIONS_H
+#define PLAYERBOTS_OCACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Dungeon/OC/OCMultipliers.h b/src/Ai/Dungeon/OC/OCMultipliers.h
index 423364b09..b867ab45c 100644
--- a/src/Ai/Dungeon/OC/OCMultipliers.h
+++ b/src/Ai/Dungeon/OC/OCMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONOCCMULTIPLIERS_H
-#define _PLAYERBOT_WOTLKDUNGEONOCCMULTIPLIERS_H
+#ifndef PLAYERBOTS_OCMULTIPLIERS_H
+#define PLAYERBOTS_OCMULTIPLIERS_H
 
 #include "Multiplier.h"
 #include "Unit.h"
diff --git a/src/Ai/Dungeon/OC/OCStrategy.h b/src/Ai/Dungeon/OC/OCStrategy.h
index 2accfd8f4..edc1a8e50 100644
--- a/src/Ai/Dungeon/OC/OCStrategy.h
+++ b/src/Ai/Dungeon/OC/OCStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONOCCSTRATEGY_H
-#define _PLAYERBOT_WOTLKDUNGEONOCCSTRATEGY_H
+#ifndef PLAYERBOTS_OCSTRATEGY_H
+#define PLAYERBOTS_OCSTRATEGY_H
 
 #include "Multiplier.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/OC/OCTriggerContext.h b/src/Ai/Dungeon/OC/OCTriggerContext.h
index da92923d9..9db778e00 100644
--- a/src/Ai/Dungeon/OC/OCTriggerContext.h
+++ b/src/Ai/Dungeon/OC/OCTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONOCCTRIGGERCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONOCCTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_OCTRIGGERCONTEXT_H
+#define PLAYERBOTS_OCTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/OC/OCTriggers.h b/src/Ai/Dungeon/OC/OCTriggers.h
index 8d2d55d16..8d106f1dd 100644
--- a/src/Ai/Dungeon/OC/OCTriggers.h
+++ b/src/Ai/Dungeon/OC/OCTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONOCCTRIGGERS_H
-#define _PLAYERBOT_WOTLKDUNGEONOCCTRIGGERS_H
+#ifndef PLAYERBOTS_OCTRIGGERS_H
+#define PLAYERBOTS_OCTRIGGERS_H
 
 #include "Trigger.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Dungeon/PoS/PoSActionContext.h b/src/Ai/Dungeon/PoS/PoSActionContext.h
index b2bf1a16a..2a0601309 100644
--- a/src/Ai/Dungeon/PoS/PoSActionContext.h
+++ b/src/Ai/Dungeon/PoS/PoSActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONPOSACTIONCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONPOSACTIONCONTEXT_H
+#ifndef PLAYERBOTS_POSACTIONCONTEXT_H
+#define PLAYERBOTS_POSACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Dungeon/PoS/PoSActions.h b/src/Ai/Dungeon/PoS/PoSActions.h
index b61b863b4..11f5911d1 100644
--- a/src/Ai/Dungeon/PoS/PoSActions.h
+++ b/src/Ai/Dungeon/PoS/PoSActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONPOSACTIONS_H
-#define _PLAYERBOT_WOTLKDUNGEONPOSACTIONS_H
+#ifndef PLAYERBOTS_POSACTIONS_H
+#define PLAYERBOTS_POSACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Dungeon/PoS/PoSMultipliers.h b/src/Ai/Dungeon/PoS/PoSMultipliers.h
index bcafc01a4..9fad7a369 100644
--- a/src/Ai/Dungeon/PoS/PoSMultipliers.h
+++ b/src/Ai/Dungeon/PoS/PoSMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONPOSMULTIPLIERS_H
-#define _PLAYERBOT_WOTLKDUNGEONPOSMULTIPLIERS_H
+#ifndef PLAYERBOTS_POSMULTIPLIERS_H
+#define PLAYERBOTS_POSMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Dungeon/PoS/PoSStrategy.h b/src/Ai/Dungeon/PoS/PoSStrategy.h
index 4098378d7..f73f56c64 100644
--- a/src/Ai/Dungeon/PoS/PoSStrategy.h
+++ b/src/Ai/Dungeon/PoS/PoSStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONPOSSTRATEGY_H
-#define _PLAYERBOT_WOTLKDUNGEONPOSSTRATEGY_H
+#ifndef PLAYERBOTS_POSSTRATEGY_H
+#define PLAYERBOTS_POSSTRATEGY_H
 #include "Multiplier.h"
 #include "Strategy.h"
 
diff --git a/src/Ai/Dungeon/PoS/PoSTriggerContext.h b/src/Ai/Dungeon/PoS/PoSTriggerContext.h
index b6f3b2cf0..7a36ff1c8 100644
--- a/src/Ai/Dungeon/PoS/PoSTriggerContext.h
+++ b/src/Ai/Dungeon/PoS/PoSTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONPOSTRIGGERCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONPOSTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_POSTRIGGERCONTEXT_H
+#define PLAYERBOTS_POSTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/PoS/PoSTriggers.h b/src/Ai/Dungeon/PoS/PoSTriggers.h
index 9205026fb..03cd35e8b 100644
--- a/src/Ai/Dungeon/PoS/PoSTriggers.h
+++ b/src/Ai/Dungeon/PoS/PoSTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONPOSTRIGGERS_H
-#define _PLAYERBOT_WOTLKDUNGEONPOSTRIGGERS_H
+#ifndef PLAYERBOTS_POSTRIGGERS_H
+#define PLAYERBOTS_POSTRIGGERS_H
 
 #include "Trigger.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Dungeon/TOC/TOCActionContext.h b/src/Ai/Dungeon/TOC/TOCActionContext.h
index ae6804b86..fd62273b4 100644
--- a/src/Ai/Dungeon/TOC/TOCActionContext.h
+++ b/src/Ai/Dungeon/TOC/TOCActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONTOCACTIONCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONTOCACTIONCONTEXT_H
+#ifndef PLAYERBOTS_TOCACTIONCONTEXT_H
+#define PLAYERBOTS_TOCACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Dungeon/TOC/TOCActions.h b/src/Ai/Dungeon/TOC/TOCActions.h
index ad1c0fa26..fca8a321d 100644
--- a/src/Ai/Dungeon/TOC/TOCActions.h
+++ b/src/Ai/Dungeon/TOC/TOCActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONTOCACTIONS_H
-#define _PLAYERBOT_WOTLKDUNGEONTOCACTIONS_H
+#ifndef PLAYERBOTS_TOCACTIONS_H
+#define PLAYERBOTS_TOCACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Dungeon/TOC/TOCMultipliers.h b/src/Ai/Dungeon/TOC/TOCMultipliers.h
index bf9412639..92a52c8b6 100644
--- a/src/Ai/Dungeon/TOC/TOCMultipliers.h
+++ b/src/Ai/Dungeon/TOC/TOCMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONTOCMULTIPLIERS_H
-#define _PLAYERBOT_WOTLKDUNGEONTOCMULTIPLIERS_H
+#ifndef PLAYERBOTS_TOCMULTIPLIERS_H
+#define PLAYERBOTS_TOCMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Dungeon/TOC/TOCStrategy.h b/src/Ai/Dungeon/TOC/TOCStrategy.h
index 4a0c7c783..8798b4064 100644
--- a/src/Ai/Dungeon/TOC/TOCStrategy.h
+++ b/src/Ai/Dungeon/TOC/TOCStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONTOCSTRATEGY_H
-#define _PLAYERBOT_WOTLKDUNGEONTOCSTRATEGY_H
+#ifndef PLAYERBOTS_TOCSTRATEGY_H
+#define PLAYERBOTS_TOCSTRATEGY_H
 
 #include "AiObjectContext.h"
 #include "Multiplier.h"
diff --git a/src/Ai/Dungeon/TOC/TOCTriggerContext.h b/src/Ai/Dungeon/TOC/TOCTriggerContext.h
index 2e27aeeef..b157bf8c3 100644
--- a/src/Ai/Dungeon/TOC/TOCTriggerContext.h
+++ b/src/Ai/Dungeon/TOC/TOCTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONTOCTRIGGERCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONTOCTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_TOCTRIGGERCONTEXT_H
+#define PLAYERBOTS_TOCTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/TOC/TOCTriggers.h b/src/Ai/Dungeon/TOC/TOCTriggers.h
index 0daaf914a..71d436405 100644
--- a/src/Ai/Dungeon/TOC/TOCTriggers.h
+++ b/src/Ai/Dungeon/TOC/TOCTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONTOCTRIGGERS_H
-#define _PLAYERBOT_WOTLKDUNGEONTOCTRIGGERS_H
+#ifndef PLAYERBOTS_TOCTRIGGERS_H
+#define PLAYERBOTS_TOCTRIGGERS_H
 
 #include "Trigger.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Dungeon/TbcDungeonActionContext.h b/src/Ai/Dungeon/TbcDungeonActionContext.h
index 6b4bf72a8..8da253a65 100644
--- a/src/Ai/Dungeon/TbcDungeonActionContext.h
+++ b/src/Ai/Dungeon/TbcDungeonActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_TBCDUNGEONACTIONCONTEXT_H
-#define _PLAYERBOT_TBCDUNGEONACTIONCONTEXT_H
+#ifndef PLAYERBOTS_TBCDUNGEONACTIONCONTEXT_H
+#define PLAYERBOTS_TBCDUNGEONACTIONCONTEXT_H
 
 #include "ACActionContext.h"
 
diff --git a/src/Ai/Dungeon/TbcDungeonTriggerContext.h b/src/Ai/Dungeon/TbcDungeonTriggerContext.h
index f28933999..d5a5825ec 100644
--- a/src/Ai/Dungeon/TbcDungeonTriggerContext.h
+++ b/src/Ai/Dungeon/TbcDungeonTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_TBCDUNGEONTRIGGERCONTEXT_H
-#define _PLAYERBOT_TBCDUNGEONTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_TBCDUNGEONTRIGGERCONTEXT_H
+#define PLAYERBOTS_TBCDUNGEONTRIGGERCONTEXT_H
 
 #include "ACTriggerContext.h"
 
diff --git a/src/Ai/Dungeon/UK/UKActionContext.h b/src/Ai/Dungeon/UK/UKActionContext.h
index b52aa1846..a5990c069 100644
--- a/src/Ai/Dungeon/UK/UKActionContext.h
+++ b/src/Ai/Dungeon/UK/UKActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONUKACTIONCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONUKACTIONCONTEXT_H
+#ifndef PLAYERBOTS_UKACTIONCONTEXT_H
+#define PLAYERBOTS_UKACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Dungeon/UK/UKActions.h b/src/Ai/Dungeon/UK/UKActions.h
index c7d4c59d4..91d8c0d09 100644
--- a/src/Ai/Dungeon/UK/UKActions.h
+++ b/src/Ai/Dungeon/UK/UKActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONUKACTIONS_H
-#define _PLAYERBOT_WOTLKDUNGEONUKACTIONS_H
+#ifndef PLAYERBOTS_UKACTIONS_H
+#define PLAYERBOTS_UKACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Dungeon/UK/UKMultipliers.h b/src/Ai/Dungeon/UK/UKMultipliers.h
index e0b8e7af0..e80074784 100644
--- a/src/Ai/Dungeon/UK/UKMultipliers.h
+++ b/src/Ai/Dungeon/UK/UKMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONUKMULTIPLIERS_H
-#define _PLAYERBOT_WOTLKDUNGEONUKMULTIPLIERS_H
+#ifndef PLAYERBOTS_UKMULTIPLIERS_H
+#define PLAYERBOTS_UKMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Dungeon/UK/UKStrategy.h b/src/Ai/Dungeon/UK/UKStrategy.h
index 41ce1e76e..f879b1ee5 100644
--- a/src/Ai/Dungeon/UK/UKStrategy.h
+++ b/src/Ai/Dungeon/UK/UKStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONUKSTRATEGY_H
-#define _PLAYERBOT_WOTLKDUNGEONUKSTRATEGY_H
+#ifndef PLAYERBOTS_UKSTRATEGY_H
+#define PLAYERBOTS_UKSTRATEGY_H
 
 #include "Multiplier.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/UK/UKTriggerContext.h b/src/Ai/Dungeon/UK/UKTriggerContext.h
index 59bc18972..a2cc5d050 100644
--- a/src/Ai/Dungeon/UK/UKTriggerContext.h
+++ b/src/Ai/Dungeon/UK/UKTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONUKTRIGGERCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONUKTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_UKTRIGGERCONTEXT_H
+#define PLAYERBOTS_UKTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/UK/UKTriggers.h b/src/Ai/Dungeon/UK/UKTriggers.h
index 237721a6e..2f1a2c1ba 100644
--- a/src/Ai/Dungeon/UK/UKTriggers.h
+++ b/src/Ai/Dungeon/UK/UKTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONUKTRIGGERS_H
-#define _PLAYERBOT_WOTLKDUNGEONUKTRIGGERS_H
+#ifndef PLAYERBOTS_UKTRIGGERS_H
+#define PLAYERBOTS_UKTRIGGERS_H
 
 #include "Trigger.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Dungeon/UP/UPActionContext.h b/src/Ai/Dungeon/UP/UPActionContext.h
index bab3c83b2..e5bbbb34b 100644
--- a/src/Ai/Dungeon/UP/UPActionContext.h
+++ b/src/Ai/Dungeon/UP/UPActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONUPACTIONCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONUPACTIONCONTEXT_H
+#ifndef PLAYERBOTS_UPACTIONCONTEXT_H
+#define PLAYERBOTS_UPACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Dungeon/UP/UPActions.h b/src/Ai/Dungeon/UP/UPActions.h
index 444b0e184..7866aa5c8 100644
--- a/src/Ai/Dungeon/UP/UPActions.h
+++ b/src/Ai/Dungeon/UP/UPActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONUPACTIONS_H
-#define _PLAYERBOT_WOTLKDUNGEONUPACTIONS_H
+#ifndef PLAYERBOTS_UPACTIONS_H
+#define PLAYERBOTS_UPACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Dungeon/UP/UPMultipliers.h b/src/Ai/Dungeon/UP/UPMultipliers.h
index 06cb85783..7e8307b11 100644
--- a/src/Ai/Dungeon/UP/UPMultipliers.h
+++ b/src/Ai/Dungeon/UP/UPMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONUPMULTIPLIERS_H
-#define _PLAYERBOT_WOTLKDUNGEONUPMULTIPLIERS_H
+#ifndef PLAYERBOTS_UPMULTIPLIERS_H
+#define PLAYERBOTS_UPMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Dungeon/UP/UPStrategy.h b/src/Ai/Dungeon/UP/UPStrategy.h
index 8ce816f80..f5ec1c16a 100644
--- a/src/Ai/Dungeon/UP/UPStrategy.h
+++ b/src/Ai/Dungeon/UP/UPStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONUPSTRATEGY_H
-#define _PLAYERBOT_WOTLKDUNGEONUPSTRATEGY_H
+#ifndef PLAYERBOTS_UPSTRATEGY_H
+#define PLAYERBOTS_UPSTRATEGY_H
 
 #include "Multiplier.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/UP/UPTriggerContext.h b/src/Ai/Dungeon/UP/UPTriggerContext.h
index ffcafad67..93f9deb0a 100644
--- a/src/Ai/Dungeon/UP/UPTriggerContext.h
+++ b/src/Ai/Dungeon/UP/UPTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONUPTRIGGERCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONUPTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_UPTRIGGERCONTEXT_H
+#define PLAYERBOTS_UPTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/UP/UPTriggers.h b/src/Ai/Dungeon/UP/UPTriggers.h
index 72bf59f8c..0db4805b0 100644
--- a/src/Ai/Dungeon/UP/UPTriggers.h
+++ b/src/Ai/Dungeon/UP/UPTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONUPTRIGGERS_H
-#define _PLAYERBOT_WOTLKDUNGEONUPTRIGGERS_H
+#ifndef PLAYERBOTS_UPTRIGGERS_H
+#define PLAYERBOTS_UPTRIGGERS_H
 
 #include "Trigger.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Dungeon/VH/VHActionContext.h b/src/Ai/Dungeon/VH/VHActionContext.h
index 783d49081..a23c3975e 100644
--- a/src/Ai/Dungeon/VH/VHActionContext.h
+++ b/src/Ai/Dungeon/VH/VHActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONVHACTIONCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONVHACTIONCONTEXT_H
+#ifndef PLAYERBOTS_VHACTIONCONTEXT_H
+#define PLAYERBOTS_VHACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Dungeon/VH/VHActions.h b/src/Ai/Dungeon/VH/VHActions.h
index 64e5e74f5..89051c725 100644
--- a/src/Ai/Dungeon/VH/VHActions.h
+++ b/src/Ai/Dungeon/VH/VHActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONVHACTIONS_H
-#define _PLAYERBOT_WOTLKDUNGEONVHACTIONS_H
+#ifndef PLAYERBOTS_VHACTIONS_H
+#define PLAYERBOTS_VHACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Dungeon/VH/VHMultipliers.h b/src/Ai/Dungeon/VH/VHMultipliers.h
index 67952a16b..592dae727 100644
--- a/src/Ai/Dungeon/VH/VHMultipliers.h
+++ b/src/Ai/Dungeon/VH/VHMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONVHMULTIPLIERS_H
-#define _PLAYERBOT_WOTLKDUNGEONVHMULTIPLIERS_H
+#ifndef PLAYERBOTS_VHMULTIPLIERS_H
+#define PLAYERBOTS_VHMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Dungeon/VH/VHStrategy.h b/src/Ai/Dungeon/VH/VHStrategy.h
index a06f64ce3..911f575ab 100644
--- a/src/Ai/Dungeon/VH/VHStrategy.h
+++ b/src/Ai/Dungeon/VH/VHStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONVHSTRATEGY_H
-#define _PLAYERBOT_WOTLKDUNGEONVHSTRATEGY_H
+#ifndef PLAYERBOTS_VHSTRATEGY_H
+#define PLAYERBOTS_VHSTRATEGY_H
 
 #include "Multiplier.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/VH/VHTriggerContext.h b/src/Ai/Dungeon/VH/VHTriggerContext.h
index 9106f2a13..34fcb0cb6 100644
--- a/src/Ai/Dungeon/VH/VHTriggerContext.h
+++ b/src/Ai/Dungeon/VH/VHTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONVHTRIGGERCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONVHTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_VHTRIGGERCONTEXT_H
+#define PLAYERBOTS_VHTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
diff --git a/src/Ai/Dungeon/VH/VHTriggers.h b/src/Ai/Dungeon/VH/VHTriggers.h
index b5a306d42..9878dfe1c 100644
--- a/src/Ai/Dungeon/VH/VHTriggers.h
+++ b/src/Ai/Dungeon/VH/VHTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONVHTRIGGERS_H
-#define _PLAYERBOT_WOTLKDUNGEONVHTRIGGERS_H
+#ifndef PLAYERBOTS_VHTRIGGERS_H
+#define PLAYERBOTS_VHTRIGGERS_H
 
 #include "Trigger.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Dungeon/WotlkDungeonActionContext.h b/src/Ai/Dungeon/WotlkDungeonActionContext.h
index b77f94fcc..c38c1ac83 100644
--- a/src/Ai/Dungeon/WotlkDungeonActionContext.h
+++ b/src/Ai/Dungeon/WotlkDungeonActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONACTIONCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONACTIONCONTEXT_H
+#ifndef PLAYERBOTS_WOTLKDUNGEONACTIONCONTEXT_H
+#define PLAYERBOTS_WOTLKDUNGEONACTIONCONTEXT_H
 
 #include "UKActionContext.h"
 #include "NexActionContext.h"
diff --git a/src/Ai/Dungeon/WotlkDungeonTriggerContext.h b/src/Ai/Dungeon/WotlkDungeonTriggerContext.h
index b07973d6b..adf4b681e 100644
--- a/src/Ai/Dungeon/WotlkDungeonTriggerContext.h
+++ b/src/Ai/Dungeon/WotlkDungeonTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONTRIGGERCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_WOTLKDUNGEONTRIGGERCONTEXT_H
+#define PLAYERBOTS_WOTLKDUNGEONTRIGGERCONTEXT_H
 
 #include "UKTriggerContext.h"
 #include "NexTriggerContext.h"
diff --git a/src/Ai/Raid/Aq20/Aq20ActionContext.h b/src/Ai/Raid/Aq20/Aq20ActionContext.h
index cde831f5c..0648bffb6 100644
--- a/src/Ai/Raid/Aq20/Aq20ActionContext.h
+++ b/src/Ai/Raid/Aq20/Aq20ActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDAQ20ACTIONCONTEXT_H
-#define _PLAYERBOT_RAIDAQ20ACTIONCONTEXT_H
+#ifndef PLAYERBOTS_AQ20ACTIONCONTEXT_H
+#define PLAYERBOTS_AQ20ACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/Aq20/Aq20Actions.h b/src/Ai/Raid/Aq20/Aq20Actions.h
index 59a9b4376..22801cdef 100644
--- a/src/Ai/Raid/Aq20/Aq20Actions.h
+++ b/src/Ai/Raid/Aq20/Aq20Actions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDAQ20ACTIONS_H
-#define _PLAYERBOT_RAIDAQ20ACTIONS_H
+#ifndef PLAYERBOTS_AQ20ACTIONS_H
+#define PLAYERBOTS_AQ20ACTIONS_H
 
 #include "MovementActions.h"
 #include "PlayerbotAI.h"
diff --git a/src/Ai/Raid/Aq20/Aq20Strategy.h b/src/Ai/Raid/Aq20/Aq20Strategy.h
index 86bcf8e47..aab4e8d4a 100644
--- a/src/Ai/Raid/Aq20/Aq20Strategy.h
+++ b/src/Ai/Raid/Aq20/Aq20Strategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDAQ20STRATEGY_H
-#define _PLAYERBOT_RAIDAQ20STRATEGY_H
+#ifndef PLAYERBOTS_AQ20STRATEGY_H
+#define PLAYERBOTS_AQ20STRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/Aq20/Aq20TriggerContext.h b/src/Ai/Raid/Aq20/Aq20TriggerContext.h
index cdc101da1..dec8ed39a 100644
--- a/src/Ai/Raid/Aq20/Aq20TriggerContext.h
+++ b/src/Ai/Raid/Aq20/Aq20TriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDAQ20TRIGGERCONTEXT_H
-#define _PLAYERBOT_RAIDAQ20TRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_AQ20TRIGGERCONTEXT_H
+#define PLAYERBOTS_AQ20TRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "Aq20Triggers.h"
diff --git a/src/Ai/Raid/Aq20/Aq20Triggers.h b/src/Ai/Raid/Aq20/Aq20Triggers.h
index 219de8f48..d36558e34 100644
--- a/src/Ai/Raid/Aq20/Aq20Triggers.h
+++ b/src/Ai/Raid/Aq20/Aq20Triggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDAQ20TRIGGERS_H
-#define _PLAYERBOT_RAIDAQ20TRIGGERS_H
+#ifndef PLAYERBOTS_AQ20TRIGGERS_H
+#define PLAYERBOTS_AQ20TRIGGERS_H
 
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
diff --git a/src/Ai/Raid/Aq20/Aq20Utils.h b/src/Ai/Raid/Aq20/Aq20Utils.h
index b78340d0e..36139be8a 100644
--- a/src/Ai/Raid/Aq20/Aq20Utils.h
+++ b/src/Ai/Raid/Aq20/Aq20Utils.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDAQ20UTILS_H
-#define _PLAYERBOT_RAIDAQ20UTILS_H
+#ifndef PLAYERBOTS_AQ20UTILS_H
+#define PLAYERBOTS_AQ20UTILS_H
 
 #include "GameObject.h"
 #include "Unit.h"
diff --git a/src/Ai/Raid/BT/BTActionContext.h b/src/Ai/Raid/BT/BTActionContext.h
index 7a962857e..7cd28de77 100644
--- a/src/Ai/Raid/BT/BTActionContext.h
+++ b/src/Ai/Raid/BT/BTActionContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDBLACKTEMPLEACTIONCONTEXT_H
-#define _PLAYERBOT_RAIDBLACKTEMPLEACTIONCONTEXT_H
+#ifndef PLAYERBOTS_BTACTIONCONTEXT_H
+#define PLAYERBOTS_BTACTIONCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "BTActions.h"
diff --git a/src/Ai/Raid/BT/BTActions.h b/src/Ai/Raid/BT/BTActions.h
index b4386f892..32ae6ad96 100644
--- a/src/Ai/Raid/BT/BTActions.h
+++ b/src/Ai/Raid/BT/BTActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDBLACKTEMPLEACTIONS_H
-#define _PLAYERBOT_RAIDBLACKTEMPLEACTIONS_H
+#ifndef PLAYERBOTS_BTACTIONS_H
+#define PLAYERBOTS_BTACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Raid/BT/BTHelpers.h b/src/Ai/Raid/BT/BTHelpers.h
index 9ea6cb7df..985408592 100644
--- a/src/Ai/Raid/BT/BTHelpers.h
+++ b/src/Ai/Raid/BT/BTHelpers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDBLACKTEMPLEHELPERS_H_
-#define _PLAYERBOT_RAIDBLACKTEMPLEHELPERS_H_
+#ifndef PLAYERBOTS_BTHELPERS_H
+#define PLAYERBOTS_BTHELPERS_H
 
 #include <array>
 #include <unordered_map>
diff --git a/src/Ai/Raid/BT/BTMultipliers.h b/src/Ai/Raid/BT/BTMultipliers.h
index ba82e0100..b08fc0e7c 100644
--- a/src/Ai/Raid/BT/BTMultipliers.h
+++ b/src/Ai/Raid/BT/BTMultipliers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDBLACKTEMPLEMULTIPLIERS_H
-#define _PLAYERBOT_RAIDBLACKTEMPLEMULTIPLIERS_H
+#ifndef PLAYERBOTS_BTMULTIPLIERS_H
+#define PLAYERBOTS_BTMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Raid/BT/BTStrategy.h b/src/Ai/Raid/BT/BTStrategy.h
index 2f1cc4205..279a654e9 100644
--- a/src/Ai/Raid/BT/BTStrategy.h
+++ b/src/Ai/Raid/BT/BTStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDBLACKTEMPLESTRATEGY_H_
-#define _PLAYERBOT_RAIDBLACKTEMPLESTRATEGY_H_
+#ifndef PLAYERBOTS_BTSTRATEGY_H
+#define PLAYERBOTS_BTSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/BT/BTTriggerContext.h b/src/Ai/Raid/BT/BTTriggerContext.h
index ee10108ad..d9ab08576 100644
--- a/src/Ai/Raid/BT/BTTriggerContext.h
+++ b/src/Ai/Raid/BT/BTTriggerContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDBLACKTEMPLETRIGGERCONTEXT_H
-#define _PLAYERBOT_RAIDBLACKTEMPLETRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_BTTRIGGERCONTEXT_H
+#define PLAYERBOTS_BTTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "BTTriggers.h"
diff --git a/src/Ai/Raid/BT/BTTriggers.h b/src/Ai/Raid/BT/BTTriggers.h
index 0113b4b14..d05dd9e43 100644
--- a/src/Ai/Raid/BT/BTTriggers.h
+++ b/src/Ai/Raid/BT/BTTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDBLACKTEMPLETRIGGERS_H
-#define _PLAYERBOT_RAIDBLACKTEMPLETRIGGERS_H
+#ifndef PLAYERBOTS_BTTRIGGERS_H
+#define PLAYERBOTS_BTTRIGGERS_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/Raid/BWL/BWLActionContext.h b/src/Ai/Raid/BWL/BWLActionContext.h
index fe59bf158..ca0b6671f 100644
--- a/src/Ai/Raid/BWL/BWLActionContext.h
+++ b/src/Ai/Raid/BWL/BWLActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDBWLACTIONCONTEXT_H
-#define _PLAYERBOT_RAIDBWLACTIONCONTEXT_H
+#ifndef PLAYERBOTS_BWLACTIONCONTEXT_H
+#define PLAYERBOTS_BWLACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/BWL/BWLActions.h b/src/Ai/Raid/BWL/BWLActions.h
index 9556c7569..80fafc491 100644
--- a/src/Ai/Raid/BWL/BWLActions.h
+++ b/src/Ai/Raid/BWL/BWLActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDBWLACTIONS_H
-#define _PLAYERBOT_RAIDBWLACTIONS_H
+#ifndef PLAYERBOTS_BWLACTIONS_H
+#define PLAYERBOTS_BWLACTIONS_H
 
 #include "Action.h"
 #include "MovementActions.h"
diff --git a/src/Ai/Raid/BWL/BWLHelpers.h b/src/Ai/Raid/BWL/BWLHelpers.h
index 0f7969f48..cd735c86e 100644
--- a/src/Ai/Raid/BWL/BWLHelpers.h
+++ b/src/Ai/Raid/BWL/BWLHelpers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDBWLHELPERS_H
-#define _PLAYERBOT_RAIDBWLHELPERS_H
+#ifndef PLAYERBOTS_BWLHELPERS_H
+#define PLAYERBOTS_BWLHELPERS_H
 
 #include "Player.h"
 
diff --git a/src/Ai/Raid/BWL/BWLStrategy.h b/src/Ai/Raid/BWL/BWLStrategy.h
index 375ddad71..6731ff10e 100644
--- a/src/Ai/Raid/BWL/BWLStrategy.h
+++ b/src/Ai/Raid/BWL/BWLStrategy.h
@@ -1,6 +1,6 @@
 
-#ifndef _PLAYERBOT_RAIDBWLSTRATEGY_H
-#define _PLAYERBOT_RAIDBWLSTRATEGY_H
+#ifndef PLAYERBOTS_BWLSTRATEGY_H
+#define PLAYERBOTS_BWLSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/BWL/BWLTriggerContext.h b/src/Ai/Raid/BWL/BWLTriggerContext.h
index 337fad7ba..50e9ce53b 100644
--- a/src/Ai/Raid/BWL/BWLTriggerContext.h
+++ b/src/Ai/Raid/BWL/BWLTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDBWLTRIGGERCONTEXT_H
-#define _PLAYERBOT_RAIDBWLTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_BWLTRIGGERCONTEXT_H
+#define PLAYERBOTS_BWLTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "BWLTriggers.h"
diff --git a/src/Ai/Raid/BWL/BWLTriggers.h b/src/Ai/Raid/BWL/BWLTriggers.h
index 9998b3fb6..5993d764e 100644
--- a/src/Ai/Raid/BWL/BWLTriggers.h
+++ b/src/Ai/Raid/BWL/BWLTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDBWLTRIGGERS_H
-#define _PLAYERBOT_RAIDBWLTRIGGERS_H
+#ifndef PLAYERBOTS_BWLTRIGGERS_H
+#define PLAYERBOTS_BWLTRIGGERS_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/Raid/EoE/EoEActionContext.h b/src/Ai/Raid/EoE/EoEActionContext.h
index 230c417b4..56bfa427b 100644
--- a/src/Ai/Raid/EoE/EoEActionContext.h
+++ b/src/Ai/Raid/EoE/EoEActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDEOEACTIONCONTEXT_H
-#define _PLAYERBOT_RAIDEOEACTIONCONTEXT_H
+#ifndef PLAYERBOTS_EOEACTIONCONTEXT_H
+#define PLAYERBOTS_EOEACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/EoE/EoEActions.h b/src/Ai/Raid/EoE/EoEActions.h
index 0d5b6fcc3..05ee907ae 100644
--- a/src/Ai/Raid/EoE/EoEActions.h
+++ b/src/Ai/Raid/EoE/EoEActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDEOEACTIONS_H
-#define _PLAYERBOT_RAIDEOEACTIONS_H
+#ifndef PLAYERBOTS_EOEACTIONS_H
+#define PLAYERBOTS_EOEACTIONS_H
 
 #include "AttackAction.h"
 #include "GenericSpellActions.h"
diff --git a/src/Ai/Raid/EoE/EoEMultipliers.h b/src/Ai/Raid/EoE/EoEMultipliers.h
index 05db5ee9e..fd423e723 100644
--- a/src/Ai/Raid/EoE/EoEMultipliers.h
+++ b/src/Ai/Raid/EoE/EoEMultipliers.h
@@ -1,6 +1,6 @@
 
-#ifndef _PLAYERRBOT_RAIDEOEMULTIPLIERS_H
-#define _PLAYERRBOT_RAIDEOEMULTIPLIERS_H
+#ifndef PLAYERBOTS_EOEMULTIPLIERS_H
+#define PLAYERBOTS_EOEMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Raid/EoE/EoEStrategy.h b/src/Ai/Raid/EoE/EoEStrategy.h
index ba9802116..0fee37f70 100644
--- a/src/Ai/Raid/EoE/EoEStrategy.h
+++ b/src/Ai/Raid/EoE/EoEStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDEOESTRATEGY_H
-#define _PLAYERBOT_RAIDEOESTRATEGY_H
+#ifndef PLAYERBOTS_EOESTRATEGY_H
+#define PLAYERBOTS_EOESTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/EoE/EoETriggerContext.h b/src/Ai/Raid/EoE/EoETriggerContext.h
index fee06ac20..cfdd622cb 100644
--- a/src/Ai/Raid/EoE/EoETriggerContext.h
+++ b/src/Ai/Raid/EoE/EoETriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDEOETRIGGERCONTEXT_H
-#define _PLAYERBOT_RAIDEOETRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_EOETRIGGERCONTEXT_H
+#define PLAYERBOTS_EOETRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "EoETriggers.h"
diff --git a/src/Ai/Raid/EoE/EoETriggers.h b/src/Ai/Raid/EoE/EoETriggers.h
index 3d01daa59..c07b84f57 100644
--- a/src/Ai/Raid/EoE/EoETriggers.h
+++ b/src/Ai/Raid/EoE/EoETriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDEOETRIGGERS_H
-#define _PLAYERBOT_RAIDEOETRIGGERS_H
+#ifndef PLAYERBOTS_EOETRIGGERS_H
+#define PLAYERBOTS_EOETRIGGERS_H
 
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
diff --git a/src/Ai/Raid/Gruul/GruulActionContext.h b/src/Ai/Raid/Gruul/GruulActionContext.h
index 1e39d5bfe..1e88b8f79 100644
--- a/src/Ai/Raid/Gruul/GruulActionContext.h
+++ b/src/Ai/Raid/Gruul/GruulActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDGRUULSLAIRACTIONCONTEXT_H
-#define _PLAYERBOT_RAIDGRUULSLAIRACTIONCONTEXT_H
+#ifndef PLAYERBOTS_RAIDGRUULSLAIRACTIONCONTEXT_H
+#define PLAYERBOTS_RAIDGRUULSLAIRACTIONCONTEXT_H
 
 #include "GruulActions.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/Gruul/GruulActions.h b/src/Ai/Raid/Gruul/GruulActions.h
index 525e0ee6d..1ac4e4d1d 100644
--- a/src/Ai/Raid/Gruul/GruulActions.h
+++ b/src/Ai/Raid/Gruul/GruulActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDGRUULSLAIRACTIONS_H
-#define _PLAYERBOT_RAIDGRUULSLAIRACTIONS_H
+#ifndef PLAYERBOTS_RAIDGRUULSLAIRACTIONS_H
+#define PLAYERBOTS_RAIDGRUULSLAIRACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Raid/Gruul/GruulMultipliers.h b/src/Ai/Raid/Gruul/GruulMultipliers.h
index d67e8523e..f64294968 100644
--- a/src/Ai/Raid/Gruul/GruulMultipliers.h
+++ b/src/Ai/Raid/Gruul/GruulMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDGRUULSLAIRMULTIPLIERS_H
-#define _PLAYERBOT_RAIDGRUULSLAIRMULTIPLIERS_H
+#ifndef PLAYERBOTS_RAIDGRUULSLAIRMULTIPLIERS_H
+#define PLAYERBOTS_RAIDGRUULSLAIRMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Raid/Gruul/GruulStrategy.h b/src/Ai/Raid/Gruul/GruulStrategy.h
index 0d41d57a8..a494d5c20 100644
--- a/src/Ai/Raid/Gruul/GruulStrategy.h
+++ b/src/Ai/Raid/Gruul/GruulStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDGRUULSLAIRSTRATEGY_H
-#define _PLAYERBOT_RAIDGRUULSLAIRSTRATEGY_H
+#ifndef PLAYERBOTS_RAIDGRUULSLAIRSTRATEGY_H
+#define PLAYERBOTS_RAIDGRUULSLAIRSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/Gruul/GruulTriggerContext.h b/src/Ai/Raid/Gruul/GruulTriggerContext.h
index 110a69e35..b1adf8dec 100644
--- a/src/Ai/Raid/Gruul/GruulTriggerContext.h
+++ b/src/Ai/Raid/Gruul/GruulTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDGRUULSLAIRTRIGGERCONTEXT_H
-#define _PLAYERBOT_RAIDGRUULSLAIRTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_RAIDGRUULSLAIRTRIGGERCONTEXT_H
+#define PLAYERBOTS_RAIDGRUULSLAIRTRIGGERCONTEXT_H
 
 #include "GruulTriggers.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/Gruul/GruulTriggers.h b/src/Ai/Raid/Gruul/GruulTriggers.h
index 583b8b75f..6a30fd857 100644
--- a/src/Ai/Raid/Gruul/GruulTriggers.h
+++ b/src/Ai/Raid/Gruul/GruulTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDGRUULSLAIRTRIGGERS_H
-#define _PLAYERBOT_RAIDGRUULSLAIRTRIGGERS_H
+#ifndef PLAYERBOTS_RAIDGRUULSLAIRTRIGGERS_H
+#define PLAYERBOTS_RAIDGRUULSLAIRTRIGGERS_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/Raid/Hyjal/HyjalActionContext.h b/src/Ai/Raid/Hyjal/HyjalActionContext.h
index f19778500..da0ff6e51 100644
--- a/src/Ai/Raid/Hyjal/HyjalActionContext.h
+++ b/src/Ai/Raid/Hyjal/HyjalActionContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDHYJALSUMMITACTIONCONTEXT_H
-#define _PLAYERBOT_RAIDHYJALSUMMITACTIONCONTEXT_H
+#ifndef PLAYERBOTS_HYJALACTIONCONTEXT_H
+#define PLAYERBOTS_HYJALACTIONCONTEXT_H
 
 #include "HyjalActions.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/Hyjal/HyjalActions.h b/src/Ai/Raid/Hyjal/HyjalActions.h
index e741a7d26..62778b932 100644
--- a/src/Ai/Raid/Hyjal/HyjalActions.h
+++ b/src/Ai/Raid/Hyjal/HyjalActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDHYJALSUMMITACTIONS_H
-#define _PLAYERBOT_RAIDHYJALSUMMITACTIONS_H
+#ifndef PLAYERBOTS_HYJALACTIONS_H
+#define PLAYERBOTS_HYJALACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Raid/Hyjal/HyjalMultipliers.h b/src/Ai/Raid/Hyjal/HyjalMultipliers.h
index 9fa9dd885..463e23b3e 100644
--- a/src/Ai/Raid/Hyjal/HyjalMultipliers.h
+++ b/src/Ai/Raid/Hyjal/HyjalMultipliers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDHYJALSUMMITMULTIPLIERS_H
-#define _PLAYERBOT_RAIDHYJALSUMMITMULTIPLIERS_H
+#ifndef PLAYERBOTS_HYJALMULTIPLIERS_H
+#define PLAYERBOTS_HYJALMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Raid/Hyjal/HyjalStrategy.h b/src/Ai/Raid/Hyjal/HyjalStrategy.h
index 8f0e0d882..9843a9ce8 100644
--- a/src/Ai/Raid/Hyjal/HyjalStrategy.h
+++ b/src/Ai/Raid/Hyjal/HyjalStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDHYJALSUMMITSTRATEGY_H_
-#define _PLAYERBOT_RAIDHYJALSUMMITSTRATEGY_H_
+#ifndef PLAYERBOTS_HYJALSTRATEGY_H
+#define PLAYERBOTS_HYJALSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/Hyjal/HyjalTriggerContext.h b/src/Ai/Raid/Hyjal/HyjalTriggerContext.h
index 93aef5d9c..074a5d6a3 100644
--- a/src/Ai/Raid/Hyjal/HyjalTriggerContext.h
+++ b/src/Ai/Raid/Hyjal/HyjalTriggerContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDHYJALSUMMITTRIGGERCONTEXT_H
-#define _PLAYERBOT_RAIDHYJALSUMMITTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_HYJALTRIGGERCONTEXT_H
+#define PLAYERBOTS_HYJALTRIGGERCONTEXT_H
 
 #include "HyjalTriggers.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/Hyjal/HyjalTriggers.h b/src/Ai/Raid/Hyjal/HyjalTriggers.h
index 5c8fc9f01..fd21292cd 100644
--- a/src/Ai/Raid/Hyjal/HyjalTriggers.h
+++ b/src/Ai/Raid/Hyjal/HyjalTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDHYJALSUMMITTRIGGERS_H
-#define _PLAYERBOT_RAIDHYJALSUMMITTRIGGERS_H
+#ifndef PLAYERBOTS_HYJALTRIGGERS_H
+#define PLAYERBOTS_HYJALTRIGGERS_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/Raid/Hyjal/Util/HyjalHelpers.h b/src/Ai/Raid/Hyjal/Util/HyjalHelpers.h
index d5c8f9997..bed6fa71b 100644
--- a/src/Ai/Raid/Hyjal/Util/HyjalHelpers.h
+++ b/src/Ai/Raid/Hyjal/Util/HyjalHelpers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDHYJALSUMMITHELPERS_H_
-#define _PLAYERBOT_RAIDHYJALSUMMITHELPERS_H_
+#ifndef PLAYERBOTS_HYJALHELPERS_H
+#define PLAYERBOTS_HYJALHELPERS_H
 
 #include <unordered_map>
 #include <utility>
diff --git a/src/Ai/Raid/ICC/Action/ICCActions.h b/src/Ai/Raid/ICC/Action/ICCActions.h
index 23a8d2c69..e124deab9 100644
--- a/src/Ai/Raid/ICC/Action/ICCActions.h
+++ b/src/Ai/Raid/ICC/Action/ICCActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_ICCA_H
-#define _PLAYERBOT_ICCA_H
+#ifndef PLAYERBOTS_ICCACTIONS_H
+#define PLAYERBOTS_ICCACTIONS_H
 
 #include <set>
 
diff --git a/src/Ai/Raid/ICC/ICCActionContext.h b/src/Ai/Raid/ICC/ICCActionContext.h
index 2c1c4c961..f812151c5 100644
--- a/src/Ai/Raid/ICC/ICCActionContext.h
+++ b/src/Ai/Raid/ICC/ICCActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_ICCACTIONCONTEXT_H
-#define _PLAYERBOT_ICCACTIONCONTEXT_H
+#ifndef PLAYERBOTS_ICCACTIONCONTEXT_H
+#define PLAYERBOTS_ICCACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/ICC/ICCMultipliers.h b/src/Ai/Raid/ICC/ICCMultipliers.h
index 245b4d132..0f2316d7a 100644
--- a/src/Ai/Raid/ICC/ICCMultipliers.h
+++ b/src/Ai/Raid/ICC/ICCMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_ICCM_H
-#define _PLAYERBOT_ICCM_H
+#ifndef PLAYERBOTS_ICCMULTIPLIERS_H
+#define PLAYERBOTS_ICCMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Raid/ICC/ICCScripts.h b/src/Ai/Raid/ICC/ICCScripts.h
index 28e02b002..1b3cdc548 100644
--- a/src/Ai/Raid/ICC/ICCScripts.h
+++ b/src/Ai/Raid/ICC/ICCScripts.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_ICCSCRIPTS_H
-#define _PLAYERBOT_ICCSCRIPTS_H
+#ifndef PLAYERBOTS_ICCSCRIPTS_H
+#define PLAYERBOTS_ICCSCRIPTS_H
 
 #include <map>
 #include <unordered_map>
diff --git a/src/Ai/Raid/ICC/ICCStrategy.h b/src/Ai/Raid/ICC/ICCStrategy.h
index 8f331eba3..cec0b48a1 100644
--- a/src/Ai/Raid/ICC/ICCStrategy.h
+++ b/src/Ai/Raid/ICC/ICCStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_ICCS_H
-#define _PLAYERBOT_ICCS_H
+#ifndef PLAYERBOTS_ICCSTRATEGY_H
+#define PLAYERBOTS_ICCSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/ICC/ICCTriggerContext.h b/src/Ai/Raid/ICC/ICCTriggerContext.h
index ca6e8f7da..8cb7aa298 100644
--- a/src/Ai/Raid/ICC/ICCTriggerContext.h
+++ b/src/Ai/Raid/ICC/ICCTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_ICCTRIGGERCONTEXT_H
-#define _PLAYERBOT_ICCTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_ICCTRIGGERCONTEXT_H
+#define PLAYERBOTS_ICCTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "ICCTriggers.h"
diff --git a/src/Ai/Raid/ICC/ICCTriggers.h b/src/Ai/Raid/ICC/ICCTriggers.h
index 96b8af5a4..4d68dffea 100644
--- a/src/Ai/Raid/ICC/ICCTriggers.h
+++ b/src/Ai/Raid/ICC/ICCTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_ICCT_H
-#define _PLAYERBOT_ICCT_H
+#ifndef PLAYERBOTS_ICCTRIGGERS_H
+#define PLAYERBOTS_ICCTRIGGERS_H
 
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
diff --git a/src/Ai/Raid/Kara/KaraActionContext.h b/src/Ai/Raid/Kara/KaraActionContext.h
index 63d64174f..449d27852 100644
--- a/src/Ai/Raid/Kara/KaraActionContext.h
+++ b/src/Ai/Raid/Kara/KaraActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDKARAZHANACTIONCONTEXT_H
-#define _PLAYERBOT_RAIDKARAZHANACTIONCONTEXT_H
+#ifndef PLAYERBOTS_KARAACTIONCONTEXT_H
+#define PLAYERBOTS_KARAACTIONCONTEXT_H
 
 #include "KaraActions.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/Kara/KaraActions.h b/src/Ai/Raid/Kara/KaraActions.h
index 6fca1bcbb..db58778b3 100644
--- a/src/Ai/Raid/Kara/KaraActions.h
+++ b/src/Ai/Raid/Kara/KaraActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDKARAZHANACTIONS_H
-#define _PLAYERBOT_RAIDKARAZHANACTIONS_H
+#ifndef PLAYERBOTS_KARAACTIONS_H
+#define PLAYERBOTS_KARAACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Raid/Kara/KaraHelpers.h b/src/Ai/Raid/Kara/KaraHelpers.h
index 055a93a58..13e11b3e0 100644
--- a/src/Ai/Raid/Kara/KaraHelpers.h
+++ b/src/Ai/Raid/Kara/KaraHelpers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDKARAZHANHELPERS_H_
-#define _PLAYERBOT_RAIDKARAZHANHELPERS_H_
+#ifndef PLAYERBOTS_KARAHELPERS_H
+#define PLAYERBOTS_KARAHELPERS_H
 
 #include <ctime>
 #include <unordered_map>
diff --git a/src/Ai/Raid/Kara/KaraMultipliers.h b/src/Ai/Raid/Kara/KaraMultipliers.h
index 23f5617d6..a261c1319 100644
--- a/src/Ai/Raid/Kara/KaraMultipliers.h
+++ b/src/Ai/Raid/Kara/KaraMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDKARAZHANMULTIPLIERS_H
-#define _PLAYERBOT_RAIDKARAZHANMULTIPLIERS_H
+#ifndef PLAYERBOTS_KARAMULTIPLIERS_H
+#define PLAYERBOTS_KARAMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Raid/Kara/KaraStrategy.h b/src/Ai/Raid/Kara/KaraStrategy.h
index 4f95bf7b4..d78c5d036 100644
--- a/src/Ai/Raid/Kara/KaraStrategy.h
+++ b/src/Ai/Raid/Kara/KaraStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDKARAZHANSTRATEGY_H_
-#define _PLAYERBOT_RAIDKARAZHANSTRATEGY_H_
+#ifndef PLAYERBOTS_KARASTRATEGY_H
+#define PLAYERBOTS_KARASTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/Kara/KaraTriggerContext.h b/src/Ai/Raid/Kara/KaraTriggerContext.h
index 77d3090e7..0b70a5ebd 100644
--- a/src/Ai/Raid/Kara/KaraTriggerContext.h
+++ b/src/Ai/Raid/Kara/KaraTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDKARAZHANTRIGGERCONTEXT_H
-#define _PLAYERBOT_RAIDKARAZHANTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_KARATRIGGERCONTEXT_H
+#define PLAYERBOTS_KARATRIGGERCONTEXT_H
 
 #include "KaraTriggers.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/Kara/KaraTriggers.h b/src/Ai/Raid/Kara/KaraTriggers.h
index e3465ef1e..f0c5e0bf9 100644
--- a/src/Ai/Raid/Kara/KaraTriggers.h
+++ b/src/Ai/Raid/Kara/KaraTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDKARAZHANTRIGGERS_H
-#define _PLAYERBOT_RAIDKARAZHANTRIGGERS_H
+#ifndef PLAYERBOTS_KARATRIGGERS_H
+#define PLAYERBOTS_KARATRIGGERS_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/Raid/MC/MCActionContext.h b/src/Ai/Raid/MC/MCActionContext.h
index 111e63922..c2d5a592c 100644
--- a/src/Ai/Raid/MC/MCActionContext.h
+++ b/src/Ai/Raid/MC/MCActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDMCACTIONCONTEXT_H
-#define _PLAYERBOT_RAIDMCACTIONCONTEXT_H
+#ifndef PLAYERBOTS_MCACTIONCONTEXT_H
+#define PLAYERBOTS_MCACTIONCONTEXT_H
 
 #include "Action.h"
 #include "BossAuraActions.h"
diff --git a/src/Ai/Raid/MC/MCActions.h b/src/Ai/Raid/MC/MCActions.h
index ad4d47a91..346db0e60 100644
--- a/src/Ai/Raid/MC/MCActions.h
+++ b/src/Ai/Raid/MC/MCActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDMCACTIONS_H
-#define _PLAYERBOT_RAIDMCACTIONS_H
+#ifndef PLAYERBOTS_MCACTIONS_H
+#define PLAYERBOTS_MCACTIONS_H
 
 #include "AttackAction.h"
 #include "MovementActions.h"
diff --git a/src/Ai/Raid/MC/MCHelpers.h b/src/Ai/Raid/MC/MCHelpers.h
index 139cde423..b38f2b56b 100644
--- a/src/Ai/Raid/MC/MCHelpers.h
+++ b/src/Ai/Raid/MC/MCHelpers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDMCHELPERS_H
-#define _PLAYERBOT_RAIDMCHELPERS_H
+#ifndef PLAYERBOTS_MCHELPERS_H
+#define PLAYERBOTS_MCHELPERS_H
 
 namespace MoltenCoreHelpers
 {
diff --git a/src/Ai/Raid/MC/MCMultipliers.h b/src/Ai/Raid/MC/MCMultipliers.h
index 56dc7a5f8..3289027f1 100644
--- a/src/Ai/Raid/MC/MCMultipliers.h
+++ b/src/Ai/Raid/MC/MCMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDMCMULTIPLIERS_H
-#define _PLAYERBOT_RAIDMCMULTIPLIERS_H
+#ifndef PLAYERBOTS_MCMULTIPLIERS_H
+#define PLAYERBOTS_MCMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Raid/MC/MCStrategy.h b/src/Ai/Raid/MC/MCStrategy.h
index 6e77910ec..0b8970974 100644
--- a/src/Ai/Raid/MC/MCStrategy.h
+++ b/src/Ai/Raid/MC/MCStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDMCSTRATEGY_H
-#define _PLAYERBOT_RAIDMCSTRATEGY_H
+#ifndef PLAYERBOTS_MCSTRATEGY_H
+#define PLAYERBOTS_MCSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/MC/MCTriggerContext.h b/src/Ai/Raid/MC/MCTriggerContext.h
index 67d8b3935..1e0d92906 100644
--- a/src/Ai/Raid/MC/MCTriggerContext.h
+++ b/src/Ai/Raid/MC/MCTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDMCTRIGGERCONTEXT_H
-#define _PLAYERBOT_RAIDMCTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_MCTRIGGERCONTEXT_H
+#define PLAYERBOTS_MCTRIGGERCONTEXT_H
 
 #include "BossAuraTriggers.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/MC/MCTriggers.h b/src/Ai/Raid/MC/MCTriggers.h
index 7d91bb1e7..88e0d2e2e 100644
--- a/src/Ai/Raid/MC/MCTriggers.h
+++ b/src/Ai/Raid/MC/MCTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDMCTRIGGERS_H
-#define _PLAYERBOT_RAIDMCTRIGGERS_H
+#ifndef PLAYERBOTS_MCTRIGGERS_H
+#define PLAYERBOTS_MCTRIGGERS_H
 
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
diff --git a/src/Ai/Raid/Mag/MagActionContext.h b/src/Ai/Raid/Mag/MagActionContext.h
index 2a040ebcd..5b6d6aaa2 100644
--- a/src/Ai/Raid/Mag/MagActionContext.h
+++ b/src/Ai/Raid/Mag/MagActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDMAGTHERIDONACTIONCONTEXT_H
-#define _PLAYERBOT_RAIDMAGTHERIDONACTIONCONTEXT_H
+#ifndef PLAYERBOTS_MAGACTIONCONTEXT_H
+#define PLAYERBOTS_MAGACTIONCONTEXT_H
 
 #include "MagActions.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/Mag/MagActions.h b/src/Ai/Raid/Mag/MagActions.h
index dd1660d40..32232cd0d 100644
--- a/src/Ai/Raid/Mag/MagActions.h
+++ b/src/Ai/Raid/Mag/MagActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDMAGTHERIDONACTIONS_H
-#define _PLAYERBOT_RAIDMAGTHERIDONACTIONS_H
+#ifndef PLAYERBOTS_MAGACTIONS_H
+#define PLAYERBOTS_MAGACTIONS_H
 
 #include "MagHelpers.h"
 #include "Action.h"
diff --git a/src/Ai/Raid/Mag/MagHelpers.h b/src/Ai/Raid/Mag/MagHelpers.h
index 1335aff46..999b17240 100644
--- a/src/Ai/Raid/Mag/MagHelpers.h
+++ b/src/Ai/Raid/Mag/MagHelpers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDMAGTHERIDONHELPERS_H
-#define _PLAYERBOT_RAIDMAGTHERIDONHELPERS_H
+#ifndef PLAYERBOTS_MAGHELPERS_H
+#define PLAYERBOTS_MAGHELPERS_H
 
 #include <ctime>
 #include <unordered_map>
diff --git a/src/Ai/Raid/Mag/MagMultipliers.h b/src/Ai/Raid/Mag/MagMultipliers.h
index 2cce516b6..de4bfdb45 100644
--- a/src/Ai/Raid/Mag/MagMultipliers.h
+++ b/src/Ai/Raid/Mag/MagMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDMAGTHERIDONMULTIPLIERS_H
-#define _PLAYERBOT_RAIDMAGTHERIDONMULTIPLIERS_H
+#ifndef PLAYERBOTS_MAGMULTIPLIERS_H
+#define PLAYERBOTS_MAGMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Raid/Mag/MagStrategy.h b/src/Ai/Raid/Mag/MagStrategy.h
index 4d21464ae..090317f9f 100644
--- a/src/Ai/Raid/Mag/MagStrategy.h
+++ b/src/Ai/Raid/Mag/MagStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDMAGTHERIDONSTRATEGY_H
-#define _PLAYERBOT_RAIDMAGTHERIDONSTRATEGY_H
+#ifndef PLAYERBOTS_MAGSTRATEGY_H
+#define PLAYERBOTS_MAGSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/Mag/MagTriggerContext.h b/src/Ai/Raid/Mag/MagTriggerContext.h
index dcaa08fa0..8c144ff2c 100644
--- a/src/Ai/Raid/Mag/MagTriggerContext.h
+++ b/src/Ai/Raid/Mag/MagTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDMAGTHERIDONTRIGGERCONTEXT_H
-#define _PLAYERBOT_RAIDMAGTHERIDONTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_MAGTRIGGERCONTEXT_H
+#define PLAYERBOTS_MAGTRIGGERCONTEXT_H
 
 #include "MagTriggers.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/Mag/MagTriggers.h b/src/Ai/Raid/Mag/MagTriggers.h
index 0039c4e27..535a4478a 100644
--- a/src/Ai/Raid/Mag/MagTriggers.h
+++ b/src/Ai/Raid/Mag/MagTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDMAGTHERIDONTRIGGERS_H
-#define _PLAYERBOT_RAIDMAGTHERIDONTRIGGERS_H
+#ifndef PLAYERBOTS_MAGTRIGGERS_H
+#define PLAYERBOTS_MAGTRIGGERS_H
 
 #include "Trigger.h"
 #include "PlayerbotAI.h"
diff --git a/src/Ai/Raid/Naxx/Action/NaxxActions.h b/src/Ai/Raid/Naxx/Action/NaxxActions.h
index 8b854130e..d80ca6ada 100644
--- a/src/Ai/Raid/Naxx/Action/NaxxActions.h
+++ b/src/Ai/Raid/Naxx/Action/NaxxActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDNAXXACTIONS_H
-#define _PLAYERBOT_RAIDNAXXACTIONS_H
+#ifndef PLAYERBOTS_NAXXACTIONS_H
+#define PLAYERBOTS_NAXXACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Raid/Naxx/NaxxActionContext.h b/src/Ai/Raid/Naxx/NaxxActionContext.h
index 46645e315..44a0b181c 100644
--- a/src/Ai/Raid/Naxx/NaxxActionContext.h
+++ b/src/Ai/Raid/Naxx/NaxxActionContext.h
@@ -3,8 +3,8 @@
 //  and/or modify it under version 3 of the License, or (at your option), any later version.
 //  */
 
-#ifndef _PLAYERBOT_RAIDNAXXACTIONCONTEXT_H
-#define _PLAYERBOT_RAIDNAXXACTIONCONTEXT_H
+#ifndef PLAYERBOTS_NAXXACTIONCONTEXT_H
+#define PLAYERBOTS_NAXXACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/Naxx/NaxxBossHelper.h b/src/Ai/Raid/Naxx/NaxxBossHelper.h
index 2df40a701..0715f33ea 100644
--- a/src/Ai/Raid/Naxx/NaxxBossHelper.h
+++ b/src/Ai/Raid/Naxx/NaxxBossHelper.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDNAXXBOSSHELPER_H
-#define _PLAYERBOT_RAIDNAXXBOSSHELPER_H
+#ifndef PLAYERBOTS_NAXXBOSSHELPER_H
+#define PLAYERBOTS_NAXXBOSSHELPER_H
 
 #include <string>
 
diff --git a/src/Ai/Raid/Naxx/NaxxMultipliers.h b/src/Ai/Raid/Naxx/NaxxMultipliers.h
index d7eed4029..2b81ac6ce 100644
--- a/src/Ai/Raid/Naxx/NaxxMultipliers.h
+++ b/src/Ai/Raid/Naxx/NaxxMultipliers.h
@@ -1,6 +1,6 @@
 
-#ifndef _PLAYERBOT_RAIDNAXXMULTIPLIERS_H
-#define _PLAYERBOT_RAIDNAXXMULTIPLIERS_H
+#ifndef PLAYERBOTS_NAXXMULTIPLIERS_H
+#define PLAYERBOTS_NAXXMULTIPLIERS_H
 
 #include "Multiplier.h"
 #include "NaxxBossHelper.h"
diff --git a/src/Ai/Raid/Naxx/NaxxSpellIds.h b/src/Ai/Raid/Naxx/NaxxSpellIds.h
index 2a7308d81..92c96ddf5 100644
--- a/src/Ai/Raid/Naxx/NaxxSpellIds.h
+++ b/src/Ai/Raid/Naxx/NaxxSpellIds.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDNAXXSPELLIDS_H
-#define _PLAYERBOT_RAIDNAXXSPELLIDS_H
+#ifndef PLAYERBOTS_NAXXSPELLIDS_H
+#define PLAYERBOTS_NAXXSPELLIDS_H
 
 #include <initializer_list>
 
diff --git a/src/Ai/Raid/Naxx/NaxxStrategy.h b/src/Ai/Raid/Naxx/NaxxStrategy.h
index d2ce821a8..eaeb54b33 100644
--- a/src/Ai/Raid/Naxx/NaxxStrategy.h
+++ b/src/Ai/Raid/Naxx/NaxxStrategy.h
@@ -1,6 +1,6 @@
 
-#ifndef _PLAYERBOT_RAIDNAXXSTRATEGY_H
-#define _PLAYERBOT_RAIDNAXXSTRATEGY_H
+#ifndef PLAYERBOTS_NAXXSTRATEGY_H
+#define PLAYERBOTS_NAXXSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/Naxx/NaxxTriggerContext.h b/src/Ai/Raid/Naxx/NaxxTriggerContext.h
index 52d40cd64..e286540da 100644
--- a/src/Ai/Raid/Naxx/NaxxTriggerContext.h
+++ b/src/Ai/Raid/Naxx/NaxxTriggerContext.h
@@ -3,8 +3,8 @@
 //  and/or modify it under version 3 of the License, or (at your option), any later version.
 //  */
 
-#ifndef _PLAYERBOT_RAIDNAXXTRIGGERCONTEXT_H
-#define _PLAYERBOT_RAIDNAXXTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_NAXXTRIGGERCONTEXT_H
+#define PLAYERBOTS_NAXXTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "NaxxTriggers.h"
diff --git a/src/Ai/Raid/Naxx/NaxxTriggers.h b/src/Ai/Raid/Naxx/NaxxTriggers.h
index 58b1640b3..027f5950a 100644
--- a/src/Ai/Raid/Naxx/NaxxTriggers.h
+++ b/src/Ai/Raid/Naxx/NaxxTriggers.h
@@ -1,6 +1,6 @@
 
-#ifndef _PLAYERBOT_RAIDNAXXTRIGGERS_H
-#define _PLAYERBOT_RAIDNAXXTRIGGERS_H
+#ifndef PLAYERBOTS_NAXXTRIGGERS_H
+#define PLAYERBOTS_NAXXTRIGGERS_H
 
 #include "EventMap.h"
 #include "GenericTriggers.h"
diff --git a/src/Ai/Raid/OS/OSActionContext.h b/src/Ai/Raid/OS/OSActionContext.h
index 1d3dc7aa9..c273af33f 100644
--- a/src/Ai/Raid/OS/OSActionContext.h
+++ b/src/Ai/Raid/OS/OSActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDOSACTIONCONTEXT_H
-#define _PLAYERBOT_RAIDOSACTIONCONTEXT_H
+#ifndef PLAYERBOTS_OSACTIONCONTEXT_H
+#define PLAYERBOTS_OSACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/OS/OSActions.h b/src/Ai/Raid/OS/OSActions.h
index eba7c11d3..6bb64bce3 100644
--- a/src/Ai/Raid/OS/OSActions.h
+++ b/src/Ai/Raid/OS/OSActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDOSACTIONS_H
-#define _PLAYERBOT_RAIDOSACTIONS_H
+#ifndef PLAYERBOTS_OSACTIONS_H
+#define PLAYERBOTS_OSACTIONS_H
 
 #include "MovementActions.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Raid/OS/OSMultipliers.h b/src/Ai/Raid/OS/OSMultipliers.h
index 802335e13..8cfc4b13d 100644
--- a/src/Ai/Raid/OS/OSMultipliers.h
+++ b/src/Ai/Raid/OS/OSMultipliers.h
@@ -1,6 +1,6 @@
 
-#ifndef _PLAYERRBOT_RAIDOSMULTIPLIERS_H
-#define _PLAYERRBOT_RAIDOSMULTIPLIERS_H
+#ifndef PLAYERBOTS_OSMULTIPLIERS_H
+#define PLAYERBOTS_OSMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Raid/OS/OSStrategy.h b/src/Ai/Raid/OS/OSStrategy.h
index 0d9ae7871..ebf0d3a0c 100644
--- a/src/Ai/Raid/OS/OSStrategy.h
+++ b/src/Ai/Raid/OS/OSStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDOSSTRATEGY_H
-#define _PLAYERBOT_RAIDOSSTRATEGY_H
+#ifndef PLAYERBOTS_OSSTRATEGY_H
+#define PLAYERBOTS_OSSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/OS/OSTriggerContext.h b/src/Ai/Raid/OS/OSTriggerContext.h
index e9195bcc2..6a0cb1a37 100644
--- a/src/Ai/Raid/OS/OSTriggerContext.h
+++ b/src/Ai/Raid/OS/OSTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDOSTRIGGERCONTEXT_H
-#define _PLAYERBOT_RAIDOSTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_OSTRIGGERCONTEXT_H
+#define PLAYERBOTS_OSTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "OSTriggers.h"
diff --git a/src/Ai/Raid/OS/OSTriggers.h b/src/Ai/Raid/OS/OSTriggers.h
index b7a457036..f079faf5c 100644
--- a/src/Ai/Raid/OS/OSTriggers.h
+++ b/src/Ai/Raid/OS/OSTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDOSTRIGGERS_H
-#define _PLAYERBOT_RAIDOSTRIGGERS_H
+#ifndef PLAYERBOTS_OSTRIGGERS_H
+#define PLAYERBOTS_OSTRIGGERS_H
 
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
diff --git a/src/Ai/Raid/Ony/OnyActionContext.h b/src/Ai/Raid/Ony/OnyActionContext.h
index 923186f61..f439bb964 100644
--- a/src/Ai/Raid/Ony/OnyActionContext.h
+++ b/src/Ai/Raid/Ony/OnyActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDONYXIAACTIONS_CONTEXT_H
-#define _PLAYERBOT_RAIDONYXIAACTIONS_CONTEXT_H
+#ifndef PLAYERBOTS_ONYACTIONCONTEXT_H
+#define PLAYERBOTS_ONYACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/Ony/OnyActions.h b/src/Ai/Raid/Ony/OnyActions.h
index d5b8eafd9..d2f6d502a 100644
--- a/src/Ai/Raid/Ony/OnyActions.h
+++ b/src/Ai/Raid/Ony/OnyActions.h
@@ -1,6 +1,6 @@
 // RaidOnyxiaActions.h
-#ifndef _PLAYERBOT_RAIDONYXIAACTIONS_H_
-#define _PLAYERBOT_RAIDONYXIAACTIONS_H_
+#ifndef PLAYERBOTS_ONYACTIONS_H
+#define PLAYERBOTS_ONYACTIONS_H
 
 #include "AttackAction.h"
 #include "GenericSpellActions.h"
diff --git a/src/Ai/Raid/Ony/OnyStrategy.h b/src/Ai/Raid/Ony/OnyStrategy.h
index 189b2491f..e94e29fc8 100644
--- a/src/Ai/Raid/Ony/OnyStrategy.h
+++ b/src/Ai/Raid/Ony/OnyStrategy.h
@@ -1,7 +1,7 @@
 
 // RaidOnyxiaStrategy.h
-#ifndef _PLAYERBOT_RAIDONYXIASTRATEGY_H_
-#define _PLAYERBOT_RAIDONYXIASTRATEGY_H_
+#ifndef PLAYERBOTS_ONYSTRATEGY_H
+#define PLAYERBOTS_ONYSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/Ony/OnyTriggerContext.h b/src/Ai/Raid/Ony/OnyTriggerContext.h
index 1c8425608..ec6f57b58 100644
--- a/src/Ai/Raid/Ony/OnyTriggerContext.h
+++ b/src/Ai/Raid/Ony/OnyTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDONYXIATRIGGERCONTEXT_H
-#define _PLAYERBOT_RAIDONYXIATRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_ONYTRIGGERCONTEXT_H
+#define PLAYERBOTS_ONYTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "OnyTriggers.h"
diff --git a/src/Ai/Raid/Ony/OnyTriggers.h b/src/Ai/Raid/Ony/OnyTriggers.h
index d8205357b..c30fc9460 100644
--- a/src/Ai/Raid/Ony/OnyTriggers.h
+++ b/src/Ai/Raid/Ony/OnyTriggers.h
@@ -1,6 +1,6 @@
 // OnyxiaTriggers.h
-#ifndef _PLAYERBOT_ONYXIATRIGGERS_H_
-#define _PLAYERBOT_ONYXIATRIGGERS_H_
+#ifndef PLAYERBOTS_ONYTRIGGERS_H
+#define PLAYERBOTS_ONYTRIGGERS_H
 
 #include "PlayerbotAI.h"
 #include "Trigger.h"
diff --git a/src/Ai/Raid/RaidBossHelpers.h b/src/Ai/Raid/RaidBossHelpers.h
index 31df8c3a2..123e0e872 100644
--- a/src/Ai/Raid/RaidBossHelpers.h
+++ b/src/Ai/Raid/RaidBossHelpers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDBOSSHELPERS_H_
-#define _PLAYERBOT_RAIDBOSSHELPERS_H_
+#ifndef PLAYERBOTS_RAIDBOSSHELPERS_H
+#define PLAYERBOTS_RAIDBOSSHELPERS_H
 
 #include "AiObject.h"
 #include "Unit.h"
diff --git a/src/Ai/Raid/RaidStrategyContext.h b/src/Ai/Raid/RaidStrategyContext.h
index ddb288e33..2bc91048f 100644
--- a/src/Ai/Raid/RaidStrategyContext.h
+++ b/src/Ai/Raid/RaidStrategyContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDSTRATEGYCONTEXT_H_
-#define _PLAYERBOT_RAIDSTRATEGYCONTEXT_H_
+#ifndef PLAYERBOTS_RAIDSTRATEGYCONTEXT_H
+#define PLAYERBOTS_RAIDSTRATEGYCONTEXT_H
 
 #include "Strategy.h"
 #include "Aq20Strategy.h"
diff --git a/src/Ai/Raid/SSC/SSCActionContext.h b/src/Ai/Raid/SSC/SSCActionContext.h
index 4a14a747c..cf5e90341 100644
--- a/src/Ai/Raid/SSC/SSCActionContext.h
+++ b/src/Ai/Raid/SSC/SSCActionContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDSSCACTIONCONTEXT_H
-#define _PLAYERBOT_RAIDSSCACTIONCONTEXT_H
+#ifndef PLAYERBOTS_SSCACTIONCONTEXT_H
+#define PLAYERBOTS_SSCACTIONCONTEXT_H
 
 #include "SSCActions.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/SSC/SSCActions.h b/src/Ai/Raid/SSC/SSCActions.h
index 9443354c4..1c265016c 100644
--- a/src/Ai/Raid/SSC/SSCActions.h
+++ b/src/Ai/Raid/SSC/SSCActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDSSCACTIONS_H
-#define _PLAYERBOT_RAIDSSCACTIONS_H
+#ifndef PLAYERBOTS_SSCACTIONS_H
+#define PLAYERBOTS_SSCACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Raid/SSC/SSCHelpers.h b/src/Ai/Raid/SSC/SSCHelpers.h
index 67b262357..410d421bd 100644
--- a/src/Ai/Raid/SSC/SSCHelpers.h
+++ b/src/Ai/Raid/SSC/SSCHelpers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDSSCHELPERS_H_
-#define _PLAYERBOT_RAIDSSCHELPERS_H_
+#ifndef PLAYERBOTS_SSCHELPERS_H
+#define PLAYERBOTS_SSCHELPERS_H
 
 #include <ctime>
 #include <unordered_map>
diff --git a/src/Ai/Raid/SSC/SSCMultipliers.h b/src/Ai/Raid/SSC/SSCMultipliers.h
index 19ba73528..5d9cb96b4 100644
--- a/src/Ai/Raid/SSC/SSCMultipliers.h
+++ b/src/Ai/Raid/SSC/SSCMultipliers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDSSCMULTIPLIERS_H
-#define _PLAYERBOT_RAIDSSCMULTIPLIERS_H
+#ifndef PLAYERBOTS_SSCMULTIPLIERS_H
+#define PLAYERBOTS_SSCMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Raid/SSC/SSCStrategy.h b/src/Ai/Raid/SSC/SSCStrategy.h
index 08d315d5a..2d84aee2c 100644
--- a/src/Ai/Raid/SSC/SSCStrategy.h
+++ b/src/Ai/Raid/SSC/SSCStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDSSCSTRATEGY_H_
-#define _PLAYERBOT_RAIDSSCSTRATEGY_H_
+#ifndef PLAYERBOTS_SSCSTRATEGY_H
+#define PLAYERBOTS_SSCSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/SSC/SSCTriggerContext.h b/src/Ai/Raid/SSC/SSCTriggerContext.h
index ac1ce5876..f75efc7ef 100644
--- a/src/Ai/Raid/SSC/SSCTriggerContext.h
+++ b/src/Ai/Raid/SSC/SSCTriggerContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDSSCTRIGGERCONTEXT_H
-#define _PLAYERBOT_RAIDSSCTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_SSCTRIGGERCONTEXT_H
+#define PLAYERBOTS_SSCTRIGGERCONTEXT_H
 
 #include "SSCTriggers.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/SSC/SSCTriggers.h b/src/Ai/Raid/SSC/SSCTriggers.h
index 4bf9e7416..da351ac80 100644
--- a/src/Ai/Raid/SSC/SSCTriggers.h
+++ b/src/Ai/Raid/SSC/SSCTriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDSSCTRIGGERS_H
-#define _PLAYERBOT_RAIDSSCTRIGGERS_H
+#ifndef PLAYERBOTS_SSCTRIGGERS_H
+#define PLAYERBOTS_SSCTRIGGERS_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/Raid/TK/TKActionContext.h b/src/Ai/Raid/TK/TKActionContext.h
index 0c2c1cd71..6dbf641d2 100644
--- a/src/Ai/Raid/TK/TKActionContext.h
+++ b/src/Ai/Raid/TK/TKActionContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDTEMPESTKEEPACTIONCONTEXT_H
-#define _PLAYERBOT_RAIDTEMPESTKEEPACTIONCONTEXT_H
+#ifndef PLAYERBOTS_TKACTIONCONTEXT_H
+#define PLAYERBOTS_TKACTIONCONTEXT_H
 
 #include "TKActions.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/TK/TKActions.h b/src/Ai/Raid/TK/TKActions.h
index 0d751ac16..c4b359a0b 100644
--- a/src/Ai/Raid/TK/TKActions.h
+++ b/src/Ai/Raid/TK/TKActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDTEMPESTKEEPACTIONS_H
-#define _PLAYERBOT_RAIDTEMPESTKEEPACTIONS_H
+#ifndef PLAYERBOTS_TKACTIONS_H
+#define PLAYERBOTS_TKACTIONS_H
 
 #include "TKHelpers.h"
 #include "TKKaelthasBossAI.h"
diff --git a/src/Ai/Raid/TK/TKMultipliers.h b/src/Ai/Raid/TK/TKMultipliers.h
index d43d4a639..1e98fd78c 100644
--- a/src/Ai/Raid/TK/TKMultipliers.h
+++ b/src/Ai/Raid/TK/TKMultipliers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDTEMPESTKEEPMULTIPLIERS_H
-#define _PLAYERBOT_RAIDTEMPESTKEEPMULTIPLIERS_H
+#ifndef PLAYERBOTS_TKMULTIPLIERS_H
+#define PLAYERBOTS_TKMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Raid/TK/TKStrategy.h b/src/Ai/Raid/TK/TKStrategy.h
index b19600bab..1f8f4dbb7 100644
--- a/src/Ai/Raid/TK/TKStrategy.h
+++ b/src/Ai/Raid/TK/TKStrategy.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDTEMPESTKEEPSTRATEGY_H_
-#define _PLAYERBOT_RAIDTEMPESTKEEPSTRATEGY_H_
+#ifndef PLAYERBOTS_TKSTRATEGY_H
+#define PLAYERBOTS_TKSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/TK/TKTriggerContext.h b/src/Ai/Raid/TK/TKTriggerContext.h
index baa11694c..508066b2b 100644
--- a/src/Ai/Raid/TK/TKTriggerContext.h
+++ b/src/Ai/Raid/TK/TKTriggerContext.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDTEMPESTKEEPTRIGGERCONTEXT_H
-#define _PLAYERBOT_RAIDTEMPESTKEEPTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_TKTRIGGERCONTEXT_H
+#define PLAYERBOTS_TKTRIGGERCONTEXT_H
 
 #include "TKTriggers.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/TK/TKTriggers.h b/src/Ai/Raid/TK/TKTriggers.h
index 13b94c68d..852b3188a 100644
--- a/src/Ai/Raid/TK/TKTriggers.h
+++ b/src/Ai/Raid/TK/TKTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDTEMPESTKEEPTRIGGERS_H
-#define _PLAYERBOT_RAIDTEMPESTKEEPTRIGGERS_H
+#ifndef PLAYERBOTS_TKTRIGGERS_H
+#define PLAYERBOTS_TKTRIGGERS_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/Raid/TK/Util/TKHelpers.h b/src/Ai/Raid/TK/Util/TKHelpers.h
index e99781f1f..813312ec9 100644
--- a/src/Ai/Raid/TK/Util/TKHelpers.h
+++ b/src/Ai/Raid/TK/Util/TKHelpers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDTEMPESTKEEPHELPERS_H_
-#define _PLAYERBOT_RAIDTEMPESTKEEPHELPERS_H_
+#ifndef PLAYERBOTS_TKHELPERS_H
+#define PLAYERBOTS_TKHELPERS_H
 
 #include <ctime>
 #include <unordered_map>
diff --git a/src/Ai/Raid/TK/Util/TKKaelthasBossAI.h b/src/Ai/Raid/TK/Util/TKKaelthasBossAI.h
index 598c80614..40639358d 100644
--- a/src/Ai/Raid/TK/Util/TKKaelthasBossAI.h
+++ b/src/Ai/Raid/TK/Util/TKKaelthasBossAI.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDTEMPESTKEEPKAELTHASBOSSAI_H_
-#define _PLAYERBOT_RAIDTEMPESTKEEPKAELTHASBOSSAI_H_
+#ifndef PLAYERBOTS_TKKAELTHASBOSSAI_H
+#define PLAYERBOTS_TKKAELTHASBOSSAI_H
 
 #include "ScriptedCreature.h"
 
diff --git a/src/Ai/Raid/Uld/UldActionContext.h b/src/Ai/Raid/Uld/UldActionContext.h
index aec2e68e7..6e624e8e1 100644
--- a/src/Ai/Raid/Uld/UldActionContext.h
+++ b/src/Ai/Raid/Uld/UldActionContext.h
@@ -3,8 +3,8 @@
 //  and/or modify it under version 3 of the License, or (at your option), any later version.
 //  */
 
-#ifndef _PLAYERBOT_RAIDULDUARACTIONCONTEXT_H
-#define _PLAYERBOT_RAIDULDUARACTIONCONTEXT_H
+#ifndef PLAYERBOTS_ULDACTIONCONTEXT_H
+#define PLAYERBOTS_ULDACTIONCONTEXT_H
 
 #include "Action.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/Uld/UldActions.h b/src/Ai/Raid/Uld/UldActions.h
index 152de3fcb..ebcdedcad 100644
--- a/src/Ai/Raid/Uld/UldActions.h
+++ b/src/Ai/Raid/Uld/UldActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDULDUARACTIONS_H
-#define _PLAYERBOT_RAIDULDUARACTIONS_H
+#ifndef PLAYERBOTS_ULDACTIONS_H
+#define PLAYERBOTS_ULDACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Raid/Uld/UldStrategy.h b/src/Ai/Raid/Uld/UldStrategy.h
index c391f6bdb..95d12fe95 100644
--- a/src/Ai/Raid/Uld/UldStrategy.h
+++ b/src/Ai/Raid/Uld/UldStrategy.h
@@ -1,6 +1,6 @@
 
-#ifndef _PLAYERBOT_RAIDULDUARSTRATEGY_H
-#define _PLAYERBOT_RAIDULDUARSTRATEGY_H
+#ifndef PLAYERBOTS_ULDSTRATEGY_H
+#define PLAYERBOTS_ULDSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/Uld/UldTriggerContext.h b/src/Ai/Raid/Uld/UldTriggerContext.h
index c1bdb4476..ac25bce2b 100644
--- a/src/Ai/Raid/Uld/UldTriggerContext.h
+++ b/src/Ai/Raid/Uld/UldTriggerContext.h
@@ -3,8 +3,8 @@
 //  and/or modify it under version 3 of the License, or (at your option), any later version.
 //  */
 
-#ifndef _PLAYERBOT_RAIDULDUARTRIGGERCONTEXT_H
-#define _PLAYERBOT_RAIDULDUARTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_ULDTRIGGERCONTEXT_H
+#define PLAYERBOTS_ULDTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
 #include "UldTriggers.h"
diff --git a/src/Ai/Raid/Uld/UldTriggers.h b/src/Ai/Raid/Uld/UldTriggers.h
index f827745fc..2596ebb16 100644
--- a/src/Ai/Raid/Uld/UldTriggers.h
+++ b/src/Ai/Raid/Uld/UldTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDULDUARTRIGGERS_H
-#define _PLAYERBOT_RAIDULDUARTRIGGERS_H
+#ifndef PLAYERBOTS_ULDTRIGGERS_H
+#define PLAYERBOTS_ULDTRIGGERS_H
 
 #include "EventMap.h"
 #include "GenericTriggers.h"
diff --git a/src/Ai/Raid/Uld/Util/UldBossHelper.h b/src/Ai/Raid/Uld/Util/UldBossHelper.h
index b3d49ff58..acc45a5d9 100644
--- a/src/Ai/Raid/Uld/Util/UldBossHelper.h
+++ b/src/Ai/Raid/Uld/Util/UldBossHelper.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDULDUARBOSSHELPER_H
-#define _PLAYERBOT_RAIDULDUARBOSSHELPER_H
+#ifndef PLAYERBOTS_ULDBOSSHELPER_H
+#define PLAYERBOTS_ULDBOSSHELPER_H
 
 #include <string>
 #include <unordered_map>
diff --git a/src/Ai/Raid/Uld/Util/UldScripts.h b/src/Ai/Raid/Uld/Util/UldScripts.h
index 14af97b96..4ecd64dbc 100644
--- a/src/Ai/Raid/Uld/Util/UldScripts.h
+++ b/src/Ai/Raid/Uld/Util/UldScripts.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDULDUARSCRIPTS_H
-#define _PLAYERBOT_RAIDULDUARSCRIPTS_H
+#ifndef PLAYERBOTS_ULDSCRIPTS_H
+#define PLAYERBOTS_ULDSCRIPTS_H
 
 #include "../../../../src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h"
 
diff --git a/src/Ai/Raid/VoA/VoAActionContext.h b/src/Ai/Raid/VoA/VoAActionContext.h
index 312f36a67..ef5071d18 100644
--- a/src/Ai/Raid/VoA/VoAActionContext.h
+++ b/src/Ai/Raid/VoA/VoAActionContext.h
@@ -3,8 +3,8 @@
 //  and/or modify it under version 3 of the License, or (at your option), any later version.
 //  */
 
-#ifndef _PLAYERBOT_RAIDVOAACTIONCONTEXT_H
-#define _PLAYERBOT_RAIDVOAACTIONCONTEXT_H
+#ifndef PLAYERBOTS_VOAACTIONCONTEXT_H
+#define PLAYERBOTS_VOAACTIONCONTEXT_H
 
 #include "Action.h"
 #include "BossAuraActions.h"
diff --git a/src/Ai/Raid/VoA/VoAActions.h b/src/Ai/Raid/VoA/VoAActions.h
index 7aa72a234..146858b38 100644
--- a/src/Ai/Raid/VoA/VoAActions.h
+++ b/src/Ai/Raid/VoA/VoAActions.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDVOAACTIONS_H
-#define _PLAYERBOT_RAIDVOAACTIONS_H
+#ifndef PLAYERBOTS_VOAACTIONS_H
+#define PLAYERBOTS_VOAACTIONS_H
 
 #include "Action.h"
 #include "MovementActions.h"
diff --git a/src/Ai/Raid/VoA/VoAStrategy.h b/src/Ai/Raid/VoA/VoAStrategy.h
index c30261fe8..e01a8860c 100644
--- a/src/Ai/Raid/VoA/VoAStrategy.h
+++ b/src/Ai/Raid/VoA/VoAStrategy.h
@@ -1,6 +1,6 @@
 
-#ifndef _PLAYERBOT_RAIDVOASTRATEGY_H
-#define _PLAYERBOT_RAIDVOASTRATEGY_H
+#ifndef PLAYERBOTS_VOASTRATEGY_H
+#define PLAYERBOTS_VOASTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/VoA/VoATriggerContext.h b/src/Ai/Raid/VoA/VoATriggerContext.h
index 54f38ecb7..a56eca0d9 100644
--- a/src/Ai/Raid/VoA/VoATriggerContext.h
+++ b/src/Ai/Raid/VoA/VoATriggerContext.h
@@ -3,8 +3,8 @@
 //  and/or modify it under version 3 of the License, or (at your option), any later version.
 //  */
 
-#ifndef _PLAYERBOT_RAIDVOATRIGGERCONTEXT_H
-#define _PLAYERBOT_RAIDVOATRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_VOATRIGGERCONTEXT_H
+#define PLAYERBOTS_VOATRIGGERCONTEXT_H
 
 #include "BossAuraTriggers.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/VoA/VoATriggers.h b/src/Ai/Raid/VoA/VoATriggers.h
index e952b2357..cb0bdc5e6 100644
--- a/src/Ai/Raid/VoA/VoATriggers.h
+++ b/src/Ai/Raid/VoA/VoATriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_RAIDVOATRIGGERS_H
-#define _PLAYERBOT_RAIDVOATRIGGERS_H
+#ifndef PLAYERBOTS_VOATRIGGERS_H
+#define PLAYERBOTS_VOATRIGGERS_H
 
 #include "EventMap.h"
 #include "GenericTriggers.h"
diff --git a/src/Ai/Raid/ZA/ZAActionContext.h b/src/Ai/Raid/ZA/ZAActionContext.h
index fd83a4073..ee956cb7c 100644
--- a/src/Ai/Raid/ZA/ZAActionContext.h
+++ b/src/Ai/Raid/ZA/ZAActionContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDZULAMANACTIONCONTEXT_H
-#define _PLAYERBOT_RAIDZULAMANACTIONCONTEXT_H
+#ifndef PLAYERBOTS_ZAACTIONCONTEXT_H
+#define PLAYERBOTS_ZAACTIONCONTEXT_H
 
 #include "ZAActions.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/ZA/ZAActions.h b/src/Ai/Raid/ZA/ZAActions.h
index 5542e8f38..30431cf5a 100644
--- a/src/Ai/Raid/ZA/ZAActions.h
+++ b/src/Ai/Raid/ZA/ZAActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDZULAMANACTIONS_H
-#define _PLAYERBOT_RAIDZULAMANACTIONS_H
+#ifndef PLAYERBOTS_ZAACTIONS_H
+#define PLAYERBOTS_ZAACTIONS_H
 
 #include "Action.h"
 #include "AttackAction.h"
diff --git a/src/Ai/Raid/ZA/ZAHelpers.h b/src/Ai/Raid/ZA/ZAHelpers.h
index 5da447a7e..147fa8ed0 100644
--- a/src/Ai/Raid/ZA/ZAHelpers.h
+++ b/src/Ai/Raid/ZA/ZAHelpers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDZULAMANHELPERS_H_
-#define _PLAYERBOT_RAIDZULAMANHELPERS_H_
+#ifndef PLAYERBOTS_ZAHELPERS_H
+#define PLAYERBOTS_ZAHELPERS_H
 
 #include <unordered_map>
 
diff --git a/src/Ai/Raid/ZA/ZAMultipliers.h b/src/Ai/Raid/ZA/ZAMultipliers.h
index c3bdffbe1..4fcc657e8 100644
--- a/src/Ai/Raid/ZA/ZAMultipliers.h
+++ b/src/Ai/Raid/ZA/ZAMultipliers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDZULAMANMULTIPLIERS_H
-#define _PLAYERBOT_RAIDZULAMANMULTIPLIERS_H
+#ifndef PLAYERBOTS_ZAMULTIPLIERS_H
+#define PLAYERBOTS_ZAMULTIPLIERS_H
 
 #include "Multiplier.h"
 
diff --git a/src/Ai/Raid/ZA/ZAStrategy.h b/src/Ai/Raid/ZA/ZAStrategy.h
index 2cb5e8171..ed3847350 100644
--- a/src/Ai/Raid/ZA/ZAStrategy.h
+++ b/src/Ai/Raid/ZA/ZAStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDZULAMANSTRATEGY_H_
-#define _PLAYERBOT_RAIDZULAMANSTRATEGY_H_
+#ifndef PLAYERBOTS_ZASTRATEGY_H
+#define PLAYERBOTS_ZASTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/ZA/ZATriggerContext.h b/src/Ai/Raid/ZA/ZATriggerContext.h
index 15fd30b20..1461d4bd1 100644
--- a/src/Ai/Raid/ZA/ZATriggerContext.h
+++ b/src/Ai/Raid/ZA/ZATriggerContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDZULAMANTRIGGERCONTEXT_H
-#define _PLAYERBOT_RAIDZULAMANTRIGGERCONTEXT_H
+#ifndef PLAYERBOTS_ZATRIGGERCONTEXT_H
+#define PLAYERBOTS_ZATRIGGERCONTEXT_H
 
 #include "ZATriggers.h"
 #include "NamedObjectContext.h"
diff --git a/src/Ai/Raid/ZA/ZATriggers.h b/src/Ai/Raid/ZA/ZATriggers.h
index 8d0cc1e54..7a50c5732 100644
--- a/src/Ai/Raid/ZA/ZATriggers.h
+++ b/src/Ai/Raid/ZA/ZATriggers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RAIDZULAMANTRIGGERS_H
-#define _PLAYERBOT_RAIDZULAMANTRIGGERS_H
+#ifndef PLAYERBOTS_ZATRIGGERS_H
+#define PLAYERBOTS_ZATRIGGERS_H
 
 #include "Trigger.h"
 
diff --git a/src/Ai/World/Rpg/Action/NewRpgAction.h b/src/Ai/World/Rpg/Action/NewRpgAction.h
index 83594204b..97a7f5742 100644
--- a/src/Ai/World/Rpg/Action/NewRpgAction.h
+++ b/src/Ai/World/Rpg/Action/NewRpgAction.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_NEWRPGACTION_H
-#define _PLAYERBOT_NEWRPGACTION_H
+#ifndef PLAYERBOTS_NEWRPGACTION_H
+#define PLAYERBOTS_NEWRPGACTION_H
 
 #include "Duration.h"
 #include "MovementActions.h"
diff --git a/src/Ai/World/Rpg/Action/NewRpgBaseAction.h b/src/Ai/World/Rpg/Action/NewRpgBaseAction.h
index e73a23219..1cef54abb 100644
--- a/src/Ai/World/Rpg/Action/NewRpgBaseAction.h
+++ b/src/Ai/World/Rpg/Action/NewRpgBaseAction.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_NEWRPGBASEACTION_H
-#define _PLAYERBOT_NEWRPGBASEACTION_H
+#ifndef PLAYERBOTS_NEWRPGBASEACTION_H
+#define PLAYERBOTS_NEWRPGBASEACTION_H
 
 #include "Duration.h"
 #include "LastMovementValue.h"
diff --git a/src/Ai/World/Rpg/Action/NewRpgOutdoorPvP.h b/src/Ai/World/Rpg/Action/NewRpgOutdoorPvP.h
index 0487b9891..6dbd696ad 100644
--- a/src/Ai/World/Rpg/Action/NewRpgOutdoorPvP.h
+++ b/src/Ai/World/Rpg/Action/NewRpgOutdoorPvP.h
@@ -1,5 +1,5 @@
-#ifndef PLAYERBOT_NEWRPGOUTDOORPVP_H
-#define PLAYERBOT_NEWRPGOUTDOORPVP_H
+#ifndef PLAYERBOTS_NEWRPGOUTDOORPVP_H
+#define PLAYERBOTS_NEWRPGOUTDOORPVP_H
 
 #include "NewRpgBaseAction.h"
 #include "OutdoorPvP.h"
diff --git a/src/Ai/World/Rpg/Action/RpgAction.h b/src/Ai/World/Rpg/Action/RpgAction.h
index c0485a8e7..ac01b4f1f 100644
--- a/src/Ai/World/Rpg/Action/RpgAction.h
+++ b/src/Ai/World/Rpg/Action/RpgAction.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RPGACTION_H
-#define _PLAYERBOT_RPGACTION_H
+#ifndef PLAYERBOTS_RPGACTION_H
+#define PLAYERBOTS_RPGACTION_H
 
 #include "MovementActions.h"
 
diff --git a/src/Ai/World/Rpg/Action/RpgSubActions.h b/src/Ai/World/Rpg/Action/RpgSubActions.h
index d5add6425..95bcac6ee 100644
--- a/src/Ai/World/Rpg/Action/RpgSubActions.h
+++ b/src/Ai/World/Rpg/Action/RpgSubActions.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RPGSUBACTIONS_H
-#define _PLAYERBOT_RPGSUBACTIONS_H
+#ifndef PLAYERBOTS_RPGSUBACTIONS_H
+#define PLAYERBOTS_RPGSUBACTIONS_H
 
 #include "Action.h"
 #include "AiObject.h"
diff --git a/src/Ai/World/Rpg/NewRpgInfo.h b/src/Ai/World/Rpg/NewRpgInfo.h
index 5896915a4..7d2140b0f 100644
--- a/src/Ai/World/Rpg/NewRpgInfo.h
+++ b/src/Ai/World/Rpg/NewRpgInfo.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_NEWRPGINFO_H
-#define _PLAYERBOT_NEWRPGINFO_H
+#ifndef PLAYERBOTS_NEWRPGINFO_H
+#define PLAYERBOTS_NEWRPGINFO_H
 
 #include "Define.h"
 #include "ObjectGuid.h"
diff --git a/src/Ai/World/Rpg/RpgValues.h b/src/Ai/World/Rpg/RpgValues.h
index bff78cc84..7170cb5bc 100644
--- a/src/Ai/World/Rpg/RpgValues.h
+++ b/src/Ai/World/Rpg/RpgValues.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RPGVALUES_H
-#define _PLAYERBOT_RPGVALUES_H
+#ifndef PLAYERBOTS_RPGVALUES_H
+#define PLAYERBOTS_RPGVALUES_H
 
 #include "Value.h"
 
diff --git a/src/Ai/World/Rpg/Strategy/NewRpgStrategy.h b/src/Ai/World/Rpg/Strategy/NewRpgStrategy.h
index 47b2a550d..31f332bac 100644
--- a/src/Ai/World/Rpg/Strategy/NewRpgStrategy.h
+++ b/src/Ai/World/Rpg/Strategy/NewRpgStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_NEWRPGSTRATEGY_H
-#define _PLAYERBOT_NEWRPGSTRATEGY_H
+#ifndef PLAYERBOTS_NEWRPGSTRATEGY_H
+#define PLAYERBOTS_NEWRPGSTRATEGY_H
 
 #include "Strategy.h"
 #include "TravelMgr.h"
diff --git a/src/Ai/World/Rpg/Strategy/RpgStrategy.h b/src/Ai/World/Rpg/Strategy/RpgStrategy.h
index cb1db7042..9aad1721a 100644
--- a/src/Ai/World/Rpg/Strategy/RpgStrategy.h
+++ b/src/Ai/World/Rpg/Strategy/RpgStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RPGSTRATEGY_H
-#define _PLAYERBOT_RPGSTRATEGY_H
+#ifndef PLAYERBOTS_RPGSTRATEGY_H
+#define PLAYERBOTS_RPGSTRATEGY_H
 
 #include "Strategy.h"
 
diff --git a/src/Ai/World/Rpg/Trigger/NewRpgTriggers.h b/src/Ai/World/Rpg/Trigger/NewRpgTriggers.h
index fe2efe3e2..15b2243dc 100644
--- a/src/Ai/World/Rpg/Trigger/NewRpgTriggers.h
+++ b/src/Ai/World/Rpg/Trigger/NewRpgTriggers.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_NEWRPGTRIGGERS_H
-#define _PLAYERBOT_NEWRPGTRIGGERS_H
+#ifndef PLAYERBOTS_NEWRPGTRIGGERS_H
+#define PLAYERBOTS_NEWRPGTRIGGERS_H
 
 #include "NewRpgStrategy.h"
 #include "Trigger.h"
diff --git a/src/Bot/Cmd/ChatFilter.h b/src/Bot/Cmd/ChatFilter.h
index ebb1d9cff..0b86152c9 100644
--- a/src/Bot/Cmd/ChatFilter.h
+++ b/src/Bot/Cmd/ChatFilter.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CHATFILTER_H
-#define _PLAYERBOT_CHATFILTER_H
+#ifndef PLAYERBOTS_CHATFILTER_H
+#define PLAYERBOTS_CHATFILTER_H
 
 #include <vector>
 
diff --git a/src/Bot/Cmd/ChatHelper.h b/src/Bot/Cmd/ChatHelper.h
index 5069fcb50..ade8d22b8 100644
--- a/src/Bot/Cmd/ChatHelper.h
+++ b/src/Bot/Cmd/ChatHelper.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CHATHELPER_H
-#define _PLAYERBOT_CHATHELPER_H
+#ifndef PLAYERBOTS_CHATHELPER_H
+#define PLAYERBOTS_CHATHELPER_H
 
 #include <map>
 
diff --git a/src/Bot/Cmd/PlayerbotCommandServer.h b/src/Bot/Cmd/PlayerbotCommandServer.h
index eb410c644..b8d1d5d49 100644
--- a/src/Bot/Cmd/PlayerbotCommandServer.h
+++ b/src/Bot/Cmd/PlayerbotCommandServer.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PLAYERBOTCOMMANDSERVER_H
-#define _PLAYERBOT_PLAYERBOTCOMMANDSERVER_H
+#ifndef PLAYERBOTS_PLAYERBOTCOMMANDSERVER_H
+#define PLAYERBOTS_PLAYERBOTCOMMANDSERVER_H
 
 class PlayerbotCommandServer
 {
diff --git a/src/Bot/Debug/PerfMonitor.h b/src/Bot/Debug/PerfMonitor.h
index 156392ee2..e069cc72c 100644
--- a/src/Bot/Debug/PerfMonitor.h
+++ b/src/Bot/Debug/PerfMonitor.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PERFORMANCEMONITOR_H
-#define _PLAYERBOT_PERFORMANCEMONITOR_H
+#ifndef PLAYERBOTS_PERFMONITOR_H
+#define PLAYERBOTS_PERFMONITOR_H
 
 #include <chrono>
 #include <ctime>
diff --git a/src/Bot/Engine/Action/Action.h b/src/Bot/Engine/Action/Action.h
index 084a40a55..2457d3d64 100644
--- a/src/Bot/Engine/Action/Action.h
+++ b/src/Bot/Engine/Action/Action.h
@@ -3,7 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#pragma once
+#ifndef PLAYERBOTS_ACTION_H
+#define PLAYERBOTS_ACTION_H
 
 #include "AiObject.h"
 #include "Event.h"
@@ -163,3 +164,5 @@ private:
     Event event;
     uint32_t created;
 };
+
+#endif
diff --git a/src/Bot/Engine/AiObject.h b/src/Bot/Engine/AiObject.h
index c161d4edb..81b5e62c3 100644
--- a/src/Bot/Engine/AiObject.h
+++ b/src/Bot/Engine/AiObject.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_AIOBJECT_H
-#define _PLAYERBOT_AIOBJECT_H
+#ifndef PLAYERBOTS_AIOBJECT_H
+#define PLAYERBOTS_AIOBJECT_H
 
 #include "Common.h"
 #include "PlayerbotAIAware.h"
diff --git a/src/Bot/Engine/AiObjectContext.h b/src/Bot/Engine/AiObjectContext.h
index 3ffd1850f..d223a9cdc 100644
--- a/src/Bot/Engine/AiObjectContext.h
+++ b/src/Bot/Engine/AiObjectContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_AIOBJECTCONTEXT_H
-#define _PLAYERBOT_AIOBJECTCONTEXT_H
+#ifndef PLAYERBOTS_AIOBJECTCONTEXT_H
+#define PLAYERBOTS_AIOBJECTCONTEXT_H
 
 #include <sstream>
 #include <string>
diff --git a/src/Bot/Engine/Engine.h b/src/Bot/Engine/Engine.h
index 976252cc5..adebf96a5 100644
--- a/src/Bot/Engine/Engine.h
+++ b/src/Bot/Engine/Engine.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ENGINE_H
-#define _PLAYERBOT_ENGINE_H
+#ifndef PLAYERBOTS_ENGINE_H
+#define PLAYERBOTS_ENGINE_H
 
 #include <map>
 
diff --git a/src/Bot/Engine/ExternalEventHelper.h b/src/Bot/Engine/ExternalEventHelper.h
index 7e95c556d..fb4a1c410 100644
--- a/src/Bot/Engine/ExternalEventHelper.h
+++ b/src/Bot/Engine/ExternalEventHelper.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_EXTERNALEVENTHELPER_H
-#define _PLAYERBOT_EXTERNALEVENTHELPER_H
+#ifndef PLAYERBOTS_EXTERNALEVENTHELPER_H
+#define PLAYERBOTS_EXTERNALEVENTHELPER_H
 
 #include <map>
 
diff --git a/src/Bot/Engine/Multiplier.h b/src/Bot/Engine/Multiplier.h
index 5a8bba68b..660a3b5a8 100644
--- a/src/Bot/Engine/Multiplier.h
+++ b/src/Bot/Engine/Multiplier.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_MULTIPLIER_H
-#define _PLAYERBOT_MULTIPLIER_H
+#ifndef PLAYERBOTS_MULTIPLIER_H
+#define PLAYERBOTS_MULTIPLIER_H
 
 #include "AiObject.h"
 
diff --git a/src/Bot/Engine/NamedObjectContext.h b/src/Bot/Engine/NamedObjectContext.h
index b60232a5c..0ec63ec28 100644
--- a/src/Bot/Engine/NamedObjectContext.h
+++ b/src/Bot/Engine/NamedObjectContext.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_NAMEDOBJECTCONEXT_H
-#define _PLAYERBOT_NAMEDOBJECTCONEXT_H
+#ifndef PLAYERBOTS_NAMEDOBJECTCONTEXT_H
+#define PLAYERBOTS_NAMEDOBJECTCONTEXT_H
 
 #include <list>
 #include <set>
diff --git a/src/Bot/Engine/PassiveMultiplier.h b/src/Bot/Engine/PassiveMultiplier.h
index b407f9337..1af8f36dd 100644
--- a/src/Bot/Engine/PassiveMultiplier.h
+++ b/src/Bot/Engine/PassiveMultiplier.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PASSIVEMULTIPLIER_H
-#define _PLAYERBOT_PASSIVEMULTIPLIER_H
+#ifndef PLAYERBOTS_PASSIVEMULTIPLIER_H
+#define PLAYERBOTS_PASSIVEMULTIPLIER_H
 
 #include <vector>
 
diff --git a/src/Bot/Engine/PlayerbotAIAware.h b/src/Bot/Engine/PlayerbotAIAware.h
index 8e1fda1b4..6f12daf0d 100644
--- a/src/Bot/Engine/PlayerbotAIAware.h
+++ b/src/Bot/Engine/PlayerbotAIAware.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PLAYERbotAIAWARE_H
-#define _PLAYERBOT_PLAYERbotAIAWARE_H
+#ifndef PLAYERBOTS_PLAYERBOTAIAWARE_H
+#define PLAYERBOTS_PLAYERBOTAIAWARE_H
 
 class PlayerbotAI;
 
diff --git a/src/Bot/Engine/PlayerbotAIBase.h b/src/Bot/Engine/PlayerbotAIBase.h
index 2d6ab31ce..387a6fc95 100644
--- a/src/Bot/Engine/PlayerbotAIBase.h
+++ b/src/Bot/Engine/PlayerbotAIBase.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PLAYERBOTAIBASE_H
-#define _PLAYERBOT_PLAYERBOTAIBASE_H
+#ifndef PLAYERBOTS_PLAYERBOTAIBASE_H
+#define PLAYERBOTS_PLAYERBOTAIBASE_H
 
 #include "Define.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Bot/Engine/Strategy/CustomStrategy.h b/src/Bot/Engine/Strategy/CustomStrategy.h
index 9a4007952..a878ffe1e 100644
--- a/src/Bot/Engine/Strategy/CustomStrategy.h
+++ b/src/Bot/Engine/Strategy/CustomStrategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_CUSTOMSTRATEGY_H
-#define _PLAYERBOT_CUSTOMSTRATEGY_H
+#ifndef PLAYERBOTS_CUSTOMSTRATEGY_H
+#define PLAYERBOTS_CUSTOMSTRATEGY_H
 
 #include <map>
 
diff --git a/src/Bot/Engine/Strategy/Strategy.h b/src/Bot/Engine/Strategy/Strategy.h
index 8f57bc078..91792d60b 100644
--- a/src/Bot/Engine/Strategy/Strategy.h
+++ b/src/Bot/Engine/Strategy/Strategy.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_STRATEGY_H
-#define _PLAYERBOT_STRATEGY_H
+#ifndef PLAYERBOTS_STRATEGY_H
+#define PLAYERBOTS_STRATEGY_H
 
 #include "Action.h"
 #include "Multiplier.h"
diff --git a/src/Bot/Engine/Trigger/Trigger.h b/src/Bot/Engine/Trigger/Trigger.h
index 8878530f8..2614dd175 100644
--- a/src/Bot/Engine/Trigger/Trigger.h
+++ b/src/Bot/Engine/Trigger/Trigger.h
@@ -3,7 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#pragma once
+#ifndef PLAYERBOTS_TRIGGER_H
+#define PLAYERBOTS_TRIGGER_H
 
 #include "Action.h"
 
@@ -81,3 +82,5 @@ private:
     std::vector<NextAction> handlers;
     const std::string name;
 };
+
+#endif
diff --git a/src/Bot/Engine/Value/Value.h b/src/Bot/Engine/Value/Value.h
index fe84bb4d7..8c7dd0b07 100644
--- a/src/Bot/Engine/Value/Value.h
+++ b/src/Bot/Engine/Value/Value.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_VALUE_H
-#define _PLAYERBOT_VALUE_H
+#ifndef PLAYERBOTS_VALUE_H
+#define PLAYERBOTS_VALUE_H
 
 #include <time.h>
 
diff --git a/src/Bot/Engine/WorldPacket/Event.h b/src/Bot/Engine/WorldPacket/Event.h
index 6caf4e92f..387976dc7 100644
--- a/src/Bot/Engine/WorldPacket/Event.h
+++ b/src/Bot/Engine/WorldPacket/Event.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_EVENT_H
-#define _PLAYERBOT_EVENT_H
+#ifndef PLAYERBOTS_EVENT_H
+#define PLAYERBOTS_EVENT_H
 
 #include "WorldPacket.h"
 
diff --git a/src/Bot/Factory/AiFactory.h b/src/Bot/Factory/AiFactory.h
index b853bf670..e7ecd2aae 100644
--- a/src/Bot/Factory/AiFactory.h
+++ b/src/Bot/Factory/AiFactory.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_AIFACTORY_H
-#define _PLAYERBOT_AIFACTORY_H
+#ifndef PLAYERBOTS_AIFACTORY_H
+#define PLAYERBOTS_AIFACTORY_H
 
 #include <map>
 #include "Common.h"
diff --git a/src/Bot/Factory/PlayerbotFactory.h b/src/Bot/Factory/PlayerbotFactory.h
index ba32e6a11..36cf52987 100644
--- a/src/Bot/Factory/PlayerbotFactory.h
+++ b/src/Bot/Factory/PlayerbotFactory.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PLAYERBOTFACTORY_H
-#define _PLAYERBOT_PLAYERBOTFACTORY_H
+#ifndef PLAYERBOTS_PLAYERBOTFACTORY_H
+#define PLAYERBOTS_PLAYERBOTFACTORY_H
 
 #include <string>
 #include <utility>
diff --git a/src/Bot/Factory/RandomPlayerbotFactory.h b/src/Bot/Factory/RandomPlayerbotFactory.h
index 92f2c9f33..3ccae83db 100644
--- a/src/Bot/Factory/RandomPlayerbotFactory.h
+++ b/src/Bot/Factory/RandomPlayerbotFactory.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RANDOMPLAYERBOTFACTORY_H
-#define _PLAYERBOT_RANDOMPLAYERBOTFACTORY_H
+#ifndef PLAYERBOTS_RANDOMPLAYERBOTFACTORY_H
+#define PLAYERBOTS_RANDOMPLAYERBOTFACTORY_H
 
 #include <map>
 #include <unordered_map>
diff --git a/src/Bot/PlayerbotAI.h b/src/Bot/PlayerbotAI.h
index 033b6aaeb..c9771fb54 100644
--- a/src/Bot/PlayerbotAI.h
+++ b/src/Bot/PlayerbotAI.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PLAYERBOTAI_H
-#define _PLAYERBOT_PLAYERBOTAI_H
+#ifndef PLAYERBOTS_PLAYERBOTAI_H
+#define PLAYERBOTS_PLAYERBOTAI_H
 
 #include <stack>
 
diff --git a/src/Bot/PlayerbotMgr.h b/src/Bot/PlayerbotMgr.h
index 316e34d47..c7a62c769 100644
--- a/src/Bot/PlayerbotMgr.h
+++ b/src/Bot/PlayerbotMgr.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PLAYERBOTMGR_H
-#define _PLAYERBOT_PLAYERBOTMGR_H
+#ifndef PLAYERBOTS_PLAYERBOTMGR_H
+#define PLAYERBOTS_PLAYERBOTMGR_H
 
 #include "ObjectGuid.h"
 #include "Player.h"
diff --git a/src/Bot/RandomPlayerbotMgr.h b/src/Bot/RandomPlayerbotMgr.h
index b68c77e41..91fcebb10 100644
--- a/src/Bot/RandomPlayerbotMgr.h
+++ b/src/Bot/RandomPlayerbotMgr.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RANDOMPLAYERBOTMGR_H
-#define _PLAYERBOT_RANDOMPLAYERBOTMGR_H
+#ifndef PLAYERBOTS_RANDOMPLAYERBOTMGR_H
+#define PLAYERBOTS_RANDOMPLAYERBOTMGR_H
 
 #include "NewRpgInfo.h"
 #include "ObjectGuid.h"
diff --git a/src/Db/PlayerbotDungeonRepository.h b/src/Db/PlayerbotDungeonRepository.h
index 160a7622c..97d67868a 100644
--- a/src/Db/PlayerbotDungeonRepository.h
+++ b/src/Db/PlayerbotDungeonRepository.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PLAYERBOTDUNGEONREPOSITORY_H
-#define _PLAYERBOT_PLAYERBOTDUNGEONREPOSITORY_H
+#ifndef PLAYERBOTS_PLAYERBOTDUNGEONREPOSITORY_H
+#define PLAYERBOTS_PLAYERBOTDUNGEONREPOSITORY_H
 
 #include <vector>
 #include <string>
diff --git a/src/Db/PlayerbotRepository.h b/src/Db/PlayerbotRepository.h
index b7b9b4b3c..68c01f99d 100644
--- a/src/Db/PlayerbotRepository.h
+++ b/src/Db/PlayerbotRepository.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PLAYERBOTREPOSITORY_H
-#define _PLAYERBOT_PLAYERBOTREPOSITORY_H
+#ifndef PLAYERBOTS_PLAYERBOTREPOSITORY_H
+#define PLAYERBOTS_PLAYERBOTREPOSITORY_H
 
 #include <cstdint>
 #include <string>
diff --git a/src/Db/PlayerbotSpellRepository.h b/src/Db/PlayerbotSpellRepository.h
index 7b026dd29..00fc3c649 100644
--- a/src/Db/PlayerbotSpellRepository.h
+++ b/src/Db/PlayerbotSpellRepository.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PLAYERBOTSPELLREPOSITORY_H
-#define _PLAYERBOT_PLAYERBOTSPELLREPOSITORY_H
+#ifndef PLAYERBOTS_PLAYERBOTSPELLREPOSITORY_H
+#define PLAYERBOTS_PLAYERBOTSPELLREPOSITORY_H
 
 #include <cstdint>
 
diff --git a/src/Mgr/Guild/GuildTaskMgr.h b/src/Mgr/Guild/GuildTaskMgr.h
index 6251f2c1e..283e802fd 100644
--- a/src/Mgr/Guild/GuildTaskMgr.h
+++ b/src/Mgr/Guild/GuildTaskMgr.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GUILDTASKMGR_H
-#define _PLAYERBOT_GUILDTASKMGR_H
+#ifndef PLAYERBOTS_GUILDTASKMGR_H
+#define PLAYERBOTS_GUILDTASKMGR_H
 
 #include <map>
 #include <vector>
diff --git a/src/Mgr/Guild/PlayerbotGuildMgr.h b/src/Mgr/Guild/PlayerbotGuildMgr.h
index 5d85ce9e7..ce85991f4 100644
--- a/src/Mgr/Guild/PlayerbotGuildMgr.h
+++ b/src/Mgr/Guild/PlayerbotGuildMgr.h
@@ -1,5 +1,5 @@
-#ifndef _PLAYERBOT_PLAYERBOTGUILDMGR_H
-#define _PLAYERBOT_PLAYERBOTGUILDMGR_H
+#ifndef PLAYERBOTS_PLAYERBOTGUILDMGR_H
+#define PLAYERBOTS_PLAYERBOTGUILDMGR_H
 
 #include "Guild.h"
 #include "Player.h"
diff --git a/src/Mgr/Item/BisListMgr.h b/src/Mgr/Item/BisListMgr.h
index 04401ec34..1132d2b2f 100644
--- a/src/Mgr/Item/BisListMgr.h
+++ b/src/Mgr/Item/BisListMgr.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_BISLISTMGR_H
-#define _PLAYERBOT_BISLISTMGR_H
+#ifndef PLAYERBOTS_BISLISTMGR_H
+#define PLAYERBOTS_BISLISTMGR_H
 
 #include "Define.h"
 
diff --git a/src/Mgr/Item/ItemVisitors.h b/src/Mgr/Item/ItemVisitors.h
index dd581ddba..55691dc4e 100644
--- a/src/Mgr/Item/ItemVisitors.h
+++ b/src/Mgr/Item/ItemVisitors.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_ITEMVISITORS_H
-#define _PLAYERBOT_ITEMVISITORS_H
+#ifndef PLAYERBOTS_ITEMVISITORS_H
+#define PLAYERBOTS_ITEMVISITORS_H
 
 #include "ChatHelper.h"
 #include "Common.h"
diff --git a/src/Mgr/Item/LootObjectStack.h b/src/Mgr/Item/LootObjectStack.h
index 0f87aed70..d2b34699a 100644
--- a/src/Mgr/Item/LootObjectStack.h
+++ b/src/Mgr/Item/LootObjectStack.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LOOTOBJECTSTACK_H
-#define _PLAYERBOT_LOOTOBJECTSTACK_H
+#ifndef PLAYERBOTS_LOOTOBJECTSTACK_H
+#define PLAYERBOTS_LOOTOBJECTSTACK_H
 
 #include "ObjectGuid.h"
 
diff --git a/src/Mgr/Item/RandomItemMgr.h b/src/Mgr/Item/RandomItemMgr.h
index bc19d75da..e2048b5f5 100644
--- a/src/Mgr/Item/RandomItemMgr.h
+++ b/src/Mgr/Item/RandomItemMgr.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_RANDOMITEMMGR_H
-#define _PLAYERBOT_RANDOMITEMMGR_H
+#ifndef PLAYERBOTS_RANDOMITEMMGR_H
+#define PLAYERBOTS_RANDOMITEMMGR_H
 
 #include <map>
 #include <set>
diff --git a/src/Mgr/Item/StatsCollector.h b/src/Mgr/Item/StatsCollector.h
index a6ffa9031..1bd3c588a 100644
--- a/src/Mgr/Item/StatsCollector.h
+++ b/src/Mgr/Item/StatsCollector.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_STATSCOLLECTOR_H
-#define _PLAYERBOT_STATSCOLLECTOR_H
+#ifndef PLAYERBOTS_STATSCOLLECTOR_H
+#define PLAYERBOTS_STATSCOLLECTOR_H
 
 #include "ItemTemplate.h"
 #include "SpellInfo.h"
diff --git a/src/Mgr/Item/StatsWeightCalculator.h b/src/Mgr/Item/StatsWeightCalculator.h
index 1049adcb4..a49616d57 100644
--- a/src/Mgr/Item/StatsWeightCalculator.h
+++ b/src/Mgr/Item/StatsWeightCalculator.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_GEARSCORECALCULATOR_H
-#define _PLAYERBOT_GEARSCORECALCULATOR_H
+#ifndef PLAYERBOTS_STATSWEIGHTCALCULATOR_H
+#define PLAYERBOTS_STATSWEIGHTCALCULATOR_H
 
 #include "Player.h"
 #include "StatsCollector.h"
diff --git a/src/Mgr/Move/FleeManager.h b/src/Mgr/Move/FleeManager.h
index 79629769f..2916b28aa 100644
--- a/src/Mgr/Move/FleeManager.h
+++ b/src/Mgr/Move/FleeManager.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_FLEEMANAGER_H
-#define _PLAYERBOT_FLEEMANAGER_H
+#ifndef PLAYERBOTS_FLEEMANAGER_H
+#define PLAYERBOTS_FLEEMANAGER_H
 
 #include <vector>
 
diff --git a/src/Mgr/Security/PlayerbotSecurity.h b/src/Mgr/Security/PlayerbotSecurity.h
index e73108dc1..5debd819e 100644
--- a/src/Mgr/Security/PlayerbotSecurity.h
+++ b/src/Mgr/Security/PlayerbotSecurity.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PLAYERBOTSECURITY_H
-#define _PLAYERBOT_PLAYERBOTSECURITY_H
+#ifndef PLAYERBOTS_PLAYERBOTSECURITY_H
+#define PLAYERBOTS_PLAYERBOTSECURITY_H
 
 #include <map>
 
diff --git a/src/Mgr/Talent/Talentspec.h b/src/Mgr/Talent/Talentspec.h
index 83243be03..7b61a5045 100644
--- a/src/Mgr/Talent/Talentspec.h
+++ b/src/Mgr/Talent/Talentspec.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TALENTSPEC_H
-#define _PLAYERBOT_TALENTSPEC_H
+#ifndef PLAYERBOTS_TALENTSPEC_H
+#define PLAYERBOTS_TALENTSPEC_H
 
 #include <cstdint>
 #include <string>
diff --git a/src/Mgr/Text/PlayerbotTextMgr.h b/src/Mgr/Text/PlayerbotTextMgr.h
index 1613630f9..8b59ffd24 100644
--- a/src/Mgr/Text/PlayerbotTextMgr.h
+++ b/src/Mgr/Text/PlayerbotTextMgr.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PLAYERBOTTEXTMGR_H
-#define _PLAYERBOT_PLAYERBOTTEXTMGR_H
+#ifndef PLAYERBOTS_PLAYERBOTTEXTMGR_H
+#define PLAYERBOTS_PLAYERBOTTEXTMGR_H
 
 #include <map>
 #include <vector>
diff --git a/src/Mgr/Travel/TravelMgr.h b/src/Mgr/Travel/TravelMgr.h
index 99c8c8e4c..6b39b861f 100644
--- a/src/Mgr/Travel/TravelMgr.h
+++ b/src/Mgr/Travel/TravelMgr.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TRAVELMGR_H
-#define _PLAYERBOT_TRAVELMGR_H
+#ifndef PLAYERBOTS_TRAVELMGR_H
+#define PLAYERBOTS_TRAVELMGR_H
 
 #include <boost/functional/hash.hpp>
 #include <map>
diff --git a/src/Mgr/Travel/TravelNode.h b/src/Mgr/Travel/TravelNode.h
index 9e05e2490..c2b2aed5f 100644
--- a/src/Mgr/Travel/TravelNode.h
+++ b/src/Mgr/Travel/TravelNode.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_TRAVELNODE_H
-#define _PLAYERBOT_TRAVELNODE_H
+#ifndef PLAYERBOTS_TRAVELNODE_H
+#define PLAYERBOTS_TRAVELNODE_H
 
 #include <shared_mutex>
 
diff --git a/src/PlayerbotAIConfig.h b/src/PlayerbotAIConfig.h
index 2d9071ead..fa8a10dee 100644
--- a/src/PlayerbotAIConfig.h
+++ b/src/PlayerbotAIConfig.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PLAYERBOTAICONFIG_H
-#define _PLAYERBOT_PLAYERBOTAICONFIG_H
+#ifndef PLAYERBOTS_PLAYERBOTAICONFIG_H
+#define PLAYERBOTS_PLAYERBOTAICONFIG_H
 
 #include <mutex>
 #include <unordered_map>
diff --git a/src/Script/PlayerbotCommandScript.h b/src/Script/PlayerbotCommandScript.h
index f17ae7ecf..50a6861d3 100644
--- a/src/Script/PlayerbotCommandScript.h
+++ b/src/Script/PlayerbotCommandScript.h
@@ -1 +1,11 @@
+/*
+ * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license, you may redistribute it
+ * and/or modify it under version 3 of the License, or (at your option), any later version.
+ */
+
+#ifndef PLAYERBOTS_PLAYERBOTCOMMANDSCRIPT_H
+#define PLAYERBOTS_PLAYERBOTCOMMANDSCRIPT_H
+
 void AddPlayerbotsCommandscripts();
+
+#endif
diff --git a/src/Script/Playerbots.h b/src/Script/Playerbots.h
index 006f058f9..68f8c369d 100644
--- a/src/Script/Playerbots.h
+++ b/src/Script/Playerbots.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_H
-#define _PLAYERBOT_H
+#ifndef PLAYERBOTS_PLAYERBOTS_H
+#define PLAYERBOTS_PLAYERBOTS_H
 
 #include "AiObjectContext.h"
 #include "Group.h"
diff --git a/src/Script/WorldThr/PlayerbotOperation.h b/src/Script/WorldThr/PlayerbotOperation.h
index 6ac303d32..0ec7afb55 100644
--- a/src/Script/WorldThr/PlayerbotOperation.h
+++ b/src/Script/WorldThr/PlayerbotOperation.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_OPERATION_H
-#define _PLAYERBOT_OPERATION_H
+#ifndef PLAYERBOTS_PLAYERBOTOPERATION_H
+#define PLAYERBOTS_PLAYERBOTOPERATION_H
 
 #include "Common.h"
 #include "ObjectGuid.h"
diff --git a/src/Script/WorldThr/PlayerbotOperations.h b/src/Script/WorldThr/PlayerbotOperations.h
index cc62e7127..66f7dca7e 100644
--- a/src/Script/WorldThr/PlayerbotOperations.h
+++ b/src/Script/WorldThr/PlayerbotOperations.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_OPERATIONS_H
-#define _PLAYERBOT_OPERATIONS_H
+#ifndef PLAYERBOTS_PLAYERBOTOPERATIONS_H
+#define PLAYERBOTS_PLAYERBOTOPERATIONS_H
 
 #include "Group.h"
 #include "GroupMgr.h"
diff --git a/src/Script/WorldThr/PlayerbotWorldThreadProcessor.h b/src/Script/WorldThr/PlayerbotWorldThreadProcessor.h
index bd489829e..e6158927d 100644
--- a/src/Script/WorldThr/PlayerbotWorldThreadProcessor.h
+++ b/src/Script/WorldThr/PlayerbotWorldThreadProcessor.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_WORLD_THREAD_PROCESSOR_H
-#define _PLAYERBOT_WORLD_THREAD_PROCESSOR_H
+#ifndef PLAYERBOTS_PLAYERBOTWORLDTHREADPROCESSOR_H
+#define PLAYERBOTS_PLAYERBOTWORLDTHREADPROCESSOR_H
 
 #include <memory>
 #include <mutex>
diff --git a/src/Script/WorldThr/Queue.h b/src/Script/WorldThr/Queue.h
index 439b61aa0..2b5bb9d54 100644
--- a/src/Script/WorldThr/Queue.h
+++ b/src/Script/WorldThr/Queue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef PLAYERBOT_QUEUE_H
-#define PLAYERBOT_QUEUE_H
+#ifndef PLAYERBOTS_QUEUE_H
+#define PLAYERBOTS_QUEUE_H
 
 #include "Action.h"
 #include "Common.h"
diff --git a/src/Util/BroadcastHelper.h b/src/Util/BroadcastHelper.h
index c79d837aa..6fa71377a 100644
--- a/src/Util/BroadcastHelper.h
+++ b/src/Util/BroadcastHelper.h
@@ -1,4 +1,10 @@
-#pragma once
+/*
+ * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license, you may redistribute it
+ * and/or modify it under version 3 of the License, or (at your option), any later version.
+ */
+
+#ifndef PLAYERBOTS_BROADCASTHELPER_H
+#define PLAYERBOTS_BROADCASTHELPER_H
 
 class PlayerbotAI;
 class Player;
@@ -146,3 +152,5 @@ public:
         Player* bot
     );
 };
+
+#endif
diff --git a/src/Util/Helpers.h b/src/Util/Helpers.h
index 90d5b6427..f1740d60b 100644
--- a/src/Util/Helpers.h
+++ b/src/Util/Helpers.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_HELPERS_H
-#define _PLAYERBOT_HELPERS_H
+#ifndef PLAYERBOTS_HELPERS_H
+#define PLAYERBOTS_HELPERS_H
 
 #include <string>
 #include <vector>
diff --git a/src/Util/LazyCalculatedValue.h b/src/Util/LazyCalculatedValue.h
index bef54e2dd..6098b81c4 100644
--- a/src/Util/LazyCalculatedValue.h
+++ b/src/Util/LazyCalculatedValue.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_LAZYCALCULATEDVALUE_H
-#define _PLAYERBOT_LAZYCALCULATEDVALUE_H
+#ifndef PLAYERBOTS_LAZYCALCULATEDVALUE_H
+#define PLAYERBOTS_LAZYCALCULATEDVALUE_H
 
 /**
  * @brief Lazy calculation helper.
diff --git a/src/Util/PlaceholderHelper.h b/src/Util/PlaceholderHelper.h
index 5ce57d720..bd69951ed 100644
--- a/src/Util/PlaceholderHelper.h
+++ b/src/Util/PlaceholderHelper.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PLACEHOLDERHELPER_H
-#define _PLAYERBOT_PLACEHOLDERHELPER_H
+#ifndef PLAYERBOTS_PLACEHOLDERHELPER_H
+#define PLAYERBOTS_PLACEHOLDERHELPER_H
 
 #include <map>
 
diff --git a/src/Util/ServerFacade.h b/src/Util/ServerFacade.h
index 978b8e768..a6f2090ac 100644
--- a/src/Util/ServerFacade.h
+++ b/src/Util/ServerFacade.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_SERVERFACADE_H
-#define _PLAYERBOT_SERVERFACADE_H
+#ifndef PLAYERBOTS_SERVERFACADE_H
+#define PLAYERBOTS_SERVERFACADE_H
 
 class Player;
 class Unit;