diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp
index ae9643c9b..b7de837c2 100644
--- a/src/game/Opcodes.cpp
+++ b/src/game/Opcodes.cpp
@@ -125,8 +125,8 @@ void InitializeOpcodes()
     OPCODE(SMSG_LOGOUT_COMPLETE,                         STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(CMSG_LOGOUT_CANCEL,                           STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLogoutCancelOpcode        );
     //OPCODE(SMSG_LOGOUT_CANCEL_ACK,                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    //OPCODE(CMSG_NAME_QUERY,                              STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleNameQueryOpcode           );
-    //OPCODE(SMSG_NAME_QUERY_RESPONSE,                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+    OPCODE(CMSG_NAME_QUERY,                              STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleNameQueryOpcode           );
+    OPCODE(SMSG_NAME_QUERY_RESPONSE,                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(CMSG_PET_NAME_QUERY,                          STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandlePetNameQueryOpcode        );
     //OPCODE(SMSG_PET_NAME_QUERY_RESPONSE,                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(CMSG_GUILD_QUERY,                             STATUS_AUTHED,   PROCESS_THREADUNSAFE, &WorldSession::HandleGuildQueryOpcode          );
@@ -521,8 +521,8 @@ void InitializeOpcodes()
     //OPCODE(SMSG_START_MIRROR_TIMER,                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(SMSG_PAUSE_MIRROR_TIMER,                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(SMSG_STOP_MIRROR_TIMER,                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    //OPCODE(CMSG_PING,                                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_EarlyProccess            );
-    //OPCODE(SMSG_PONG,                                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+    OPCODE(CMSG_PING,                                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_EarlyProccess            );
+    OPCODE(SMSG_PONG,                                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(SMSG_CLEAR_COOLDOWN,                          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(SMSG_GAMEOBJECT_PAGETEXT,                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(CMSG_SETSHEATHED,                             STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleSetSheathedOpcode         );
@@ -748,7 +748,7 @@ void InitializeOpcodes()
     //OPCODE(CMSG_SET_ACTIONBAR_TOGGLES,                   STATUS_AUTHED,   PROCESS_THREADUNSAFE, &WorldSession::HandleSetActionBarTogglesOpcode );
     //OPCODE(UMSG_DELETE_GUILD_CHARTER,                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     //OPCODE(MSG_PETITION_RENAME,                          STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandlePetitionRenameOpcode      );
-    //OPCODE(SMSG_INIT_WORLD_STATES,                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+    OPCODE(SMSG_INIT_WORLD_STATES,                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(SMSG_UPDATE_WORLD_STATE,                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(CMSG_ITEM_NAME_QUERY,                         STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleItemNameQueryOpcode       );
     //OPCODE(SMSG_ITEM_NAME_QUERY_RESPONSE,                STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
@@ -955,7 +955,7 @@ void InitializeOpcodes()
     //OPCODE(MSG_PARTY_ASSIGNMENT,                         STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandlePartyAssignmentOpcode     );
     //OPCODE(SMSG_OFFER_PETITION_ERROR,                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     OPCODE(SMSG_TIME_SYNC_REQ,                           STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    //OPCODE(CMSG_TIME_SYNC_RESP,                          STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleTimeSyncResp              );
+    OPCODE(CMSG_TIME_SYNC_RESP,                          STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleTimeSyncResp              );
     //OPCODE(CMSG_SEND_LOCAL_EVENT,                        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     //OPCODE(CMSG_SEND_GENERAL_TRIGGER,                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     //OPCODE(CMSG_SEND_COMBAT_TRIGGER,                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h
index 4472b6fb7..f8ef5187d 100644
--- a/src/game/Opcodes.h
+++ b/src/game/Opcodes.h
@@ -119,8 +119,8 @@ enum Opcodes
     SMSG_LOGOUT_COMPLETE                                  = 0x2137,
     CMSG_LOGOUT_CANCEL                                    = 0x104F,
     SMSG_LOGOUT_CANCEL_ACK                                = 0x1050,
-    CMSG_NAME_QUERY                                       = 0x1051,
-    SMSG_NAME_QUERY_RESPONSE                              = 0x1052,
+    CMSG_NAME_QUERY                                       = 0x2224,
+    SMSG_NAME_QUERY_RESPONSE                              = 0x6E04,
     CMSG_PET_NAME_QUERY                                   = 0x1053,
     SMSG_PET_NAME_QUERY_RESPONSE                          = 0x1054,
     CMSG_GUILD_QUERY                                      = 0x1055,
@@ -515,8 +515,8 @@ enum Opcodes
     SMSG_START_MIRROR_TIMER                               = 0x11DA,
     SMSG_PAUSE_MIRROR_TIMER                               = 0x11DB,
     SMSG_STOP_MIRROR_TIMER                                = 0x11DC,
-    CMSG_PING                                             = 0x11DD,
-    SMSG_PONG                                             = 0x11DE,
+    CMSG_PING                                             = 0x444D,
+    SMSG_PONG                                             = 0x4D42,
     SMSG_CLEAR_COOLDOWN                                   = 0x11DF,
     SMSG_GAMEOBJECT_PAGETEXT                              = 0x11E0,
     CMSG_SETSHEATHED                                      = 0x11E1,
@@ -742,7 +742,7 @@ enum Opcodes
     CMSG_SET_ACTIONBAR_TOGGLES                            = 0x12C0,
     UMSG_DELETE_GUILD_CHARTER                             = 0x12C1,
     MSG_PETITION_RENAME                                   = 0x12C2,
-    SMSG_INIT_WORLD_STATES                                = 0x12C3,
+    SMSG_INIT_WORLD_STATES                                = 0x4C15,
     SMSG_UPDATE_WORLD_STATE                               = 0x12C4,
     CMSG_ITEM_NAME_QUERY                                  = 0x12C5,
     SMSG_ITEM_NAME_QUERY_RESPONSE                         = 0x12C6,
@@ -949,7 +949,7 @@ enum Opcodes
     MSG_PARTY_ASSIGNMENT                                  = 0x138F,
     SMSG_OFFER_PETITION_ERROR                             = 0x1390,
     SMSG_TIME_SYNC_REQ                                    = 0x3CA4,
-    CMSG_TIME_SYNC_RESP                                   = 0x1392,
+    CMSG_TIME_SYNC_RESP                                   = 0x3B0C,
     CMSG_SEND_LOCAL_EVENT                                 = 0x1393,
     CMSG_SEND_GENERAL_TRIGGER                             = 0x1394,
     CMSG_SEND_COMBAT_TRIGGER                              = 0x1395,
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index e6916e4f2..b4a27edee 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -5902,7 +5902,6 @@ void Player::SendInitialActionButtons() const
     DETAIL_LOG("Initializing Action Buttons for '%u' spec '%u'", GetGUIDLow(), m_activeSpec);
 
     WorldPacket data(SMSG_ACTION_BUTTONS, 1 + (MAX_ACTION_BUTTONS * 4));
-    data << uint8(1);                                       // talent spec amount (in packet)
     ActionButtonList const& currentActionButtonList = m_actionButtons[m_activeSpec];
     for (uint8 button = 0; button < MAX_ACTION_BUTTONS; ++button)
     {
@@ -5912,7 +5911,7 @@ void Player::SendInitialActionButtons() const
         else
             data << uint32(0);
     }
-
+    data << uint8(1);                                       // talent spec amount (in packet)
     GetSession()->SendPacket(&data);
     DETAIL_LOG("Action Buttons for '%u' spec '%u' Initialized", GetGUIDLow(), m_activeSpec);
 }