diff --git a/src/CFBG_SC.cpp b/src/CFBG_SC.cpp
index bee6bc5..64767a5 100644
--- a/src/CFBG_SC.cpp
+++ b/src/CFBG_SC.cpp
@@ -26,51 +26,37 @@ class CFBG_BG : public BGScript
         sCFBG->FitPlayerInTeam(player, true, bg);
 
         if (sCFBG->IsEnableResetCooldowns())
-        {
             player->RemoveArenaSpellCooldowns(true);
-        }
     }
 
     void OnBattlegroundEndReward(Battleground* bg, Player* player, TeamId /*winnerTeamId*/) override
     {
         if (!sCFBG->IsEnableSystem() || !bg || !player || bg->isArena())
-        {
             return;
-        }
 
         if (sCFBG->IsPlayerFake(player))
-        {
             sCFBG->ClearFakePlayer(player);
-        }
     }
 
     void OnBattlegroundRemovePlayerAtLeave(Battleground* bg, Player* player) override
     {
         if (!sCFBG->IsEnableSystem() || bg->isArena())
-        {
             return;
-        }
 
         sCFBG->FitPlayerInTeam(player, false, bg);
 
         if (sCFBG->IsPlayerFake(player))
-        {
             sCFBG->ClearFakePlayer(player);
-        }
     }
 
     void OnAddGroup(BattlegroundQueue* queue, GroupQueueInfo* ginfo, uint32& index, Player* /*leader*/, Group* /*group*/, BattlegroundTypeId /* bgTypeId */, PvPDifficultyEntry const* /* bracketEntry */,
         uint8 /* arenaType */, bool /* isRated */, bool /* isPremade */, uint32 /* arenaRating */, uint32 /* matchmakerRating */, uint32 /* arenaTeamId */, uint32 /* opponentsArenaTeamId */) override
     {
         if (!queue)
-        {
             return;
-        }
 
         if (sCFBG->IsEnableSystem() && !ginfo->ArenaType && !ginfo->IsRated)
-        {
             index = BG_QUEUE_CFBG;
-        }
 
         // After rework hook
         // sCFBG->OnAddGroupToBGQueue(ginfo, group);
@@ -84,9 +70,7 @@ class CFBG_BG : public BGScript
     bool IsCheckNormalMatch(BattlegroundQueue* queue, Battleground* bg, BattlegroundBracketId bracket_id, uint32 minPlayers, uint32 maxPlayers) override
     {
         if (!sCFBG->IsEnableSystem() || bg->isArena())
-        {
             return false;
-        }
 
         return sCFBG->CheckCrossFactionMatch(queue, bracket_id, minPlayers, maxPlayers);
     }
@@ -110,20 +94,16 @@ class CFBG_Player : public PlayerScript
 public:
     CFBG_Player() : PlayerScript("CFBG_Player") { }
 
-    void OnLogin(Player* player) override
+    void OnPlayerLogin(Player* player) override
     {
         if (!sCFBG->IsEnableSystem())
-        {
             return;
-        }
 
         if (player->GetTeamId(true) != player->GetBgTeamId())
-        {
             sCFBG->FitPlayerInTeam(player, player->GetBattleground() && !player->GetBattleground()->isArena(), player->GetBattleground());
-        }
     }
 
-    bool CanJoinInBattlegroundQueue(Player* player, ObjectGuid /*BattlemasterGuid*/ , BattlegroundTypeId /*BGTypeID*/, uint8 joinAsGroup, GroupJoinBattlegroundResult& err) override
+    bool OnPlayerCanJoinInBattlegroundQueue(Player* player, ObjectGuid /*BattlemasterGuid*/ , BattlegroundTypeId /*BGTypeID*/, uint8 joinAsGroup, GroupJoinBattlegroundResult& err) override
     {
         if (!sCFBG->IsEnableSystem())
             return true;
@@ -143,7 +123,7 @@ class CFBG_Player : public PlayerScript
         return true;
     }
 
-    void OnBeforeUpdate(Player* player, uint32 diff) override
+    void OnPlayerBeforeUpdate(Player* player, uint32 diff) override
     {
         if (timeCheck <= diff)
         {
@@ -154,7 +134,7 @@ class CFBG_Player : public PlayerScript
             timeCheck -= diff;
     }
 
-    void OnBeforeSendChatMessage(Player* player, uint32& type, uint32& lang, std::string& /*msg*/) override
+    void OnPlayerBeforeSendChatMessage(Player* player, uint32& type, uint32& lang, std::string& /*msg*/) override
     {
         if (!player || !sCFBG->IsEnableSystem())
             return;
@@ -176,7 +156,7 @@ class CFBG_Player : public PlayerScript
         lang = LANG_UNIVERSAL;
     }
 
-    bool OnReputationChange(Player* player, uint32 factionID, int32& standing, bool /*incremental*/) override
+    bool OnPlayerReputationChange(Player* player, uint32 factionID, int32& standing, bool /*incremental*/) override
     {
         uint32 repGain = player->GetReputation(factionID);
         TeamId teamId = player->GetTeamId(true);