24 files changed, 68 insertions, 68 deletions
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index d3bb2ed0e..18185225f 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_ADMINHANDLER_H
-#define NET_TA_ADMINHANDLER_H
+#ifndef NET_TMWA_ADMINHANDLER_H
+#define NET_TMWA_ADMINHANDLER_H
 
 #include "net/adminhandler.h"
 #include "net/net.h"
@@ -53,4 +53,4 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_ADMINHANDLER_H
+#endif  // NET_TMWA_ADMINHANDLER_H
diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h
index 6cb6b447e..c008d12be 100644
--- a/src/net/tmwa/beinghandler.h
+++ b/src/net/tmwa/beinghandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_BEINGHANDLER_H
-#define NET_TA_BEINGHANDLER_H
+#ifndef NET_TMWA_BEINGHANDLER_H
+#define NET_TMWA_BEINGHANDLER_H
 
 #include "net/beinghandler.h"
 #include "net/net.h"
@@ -58,4 +58,4 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_BEINGHANDLER_H
+#endif  // NET_TMWA_BEINGHANDLER_H
diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h
index f3f36e5b3..8571e9d8a 100644
--- a/src/net/tmwa/buysellhandler.h
+++ b/src/net/tmwa/buysellhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_BUYSELLHANDLER_H
-#define NET_TA_BUYSELLHANDLER_H
+#ifndef NET_TMWA_BUYSELLHANDLER_H
+#define NET_TMWA_BUYSELLHANDLER_H
 
 #include "net/buysellhandler.h"
 
@@ -48,4 +48,4 @@ class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_BUYSELLHANDLER_H
+#endif  // NET_TMWA_BUYSELLHANDLER_H
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index ab2a9e587..156302c80 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_CHARSERVERHANDLER_H
-#define NET_TA_CHARSERVERHANDLER_H
+#ifndef NET_TMWA_CHARSERVERHANDLER_H
+#define NET_TMWA_CHARSERVERHANDLER_H
 
 #include "net/charserverhandler.h"
 
@@ -72,4 +72,4 @@ class CharServerHandler final : public MessageHandler,
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_CHARSERVERHANDLER_H
+#endif  // NET_TMWA_CHARSERVERHANDLER_H
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index 2e1c16d93..4a0429416 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_CHATHANDLER_H
-#define NET_TA_CHATHANDLER_H
+#ifndef NET_TMWA_CHATHANDLER_H
+#define NET_TMWA_CHATHANDLER_H
 
 #include "net/chathandler.h"
 #include "net/net.h"
@@ -63,4 +63,4 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_CHATHANDLER_H
+#endif  // NET_TMWA_CHATHANDLER_H
diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index 142c644ea..755bd69dc 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_MAPHANDLER_H
-#define NET_TA_MAPHANDLER_H
+#ifndef NET_TMWA_GAMEHANDLER_H
+#define NET_TMWA_GAMEHANDLER_H
 
 #include "net/gamehandler.h"
 #include "net/net.h"
@@ -62,4 +62,4 @@ class GameHandler final : public MessageHandler, public Ea::GameHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_MAPHANDLER_H
+#endif  // NET_TMWA_GAMEHANDLER_H
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 2290dbe38..0b471e93f 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -80,4 +80,4 @@ class GeneralHandler final : public MessageHandler,
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_GENERALHANDLER_H
+#endif  // NET_TMWA_GENERALHANDLER_H
diff --git a/src/net/tmwa/gui/guildtab.h b/src/net/tmwa/gui/guildtab.h
index b3729fc5a..3a685b8f7 100644
--- a/src/net/tmwa/gui/guildtab.h
+++ b/src/net/tmwa/gui/guildtab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TA_GUILDTAB_H
-#define TA_GUILDTAB_H
+#ifndef NET_TMWA_GUI_GUILDTAB_H
+#define NET_TMWA_GUI_GUILDTAB_H
 
 #include "net/ea/gui/guildtab.h"
 
@@ -43,4 +43,4 @@ class GuildTab : public Ea::GuildTab
 
 }  // namespace TmwAthena
 
-#endif  // TA_GUILDTAB_H
+#endif  // NET_TMWA_GUI_GUILDTAB_H
diff --git a/src/net/tmwa/gui/partytab.h b/src/net/tmwa/gui/partytab.h
index af6e63338..7fa1e55fc 100644
--- a/src/net/tmwa/gui/partytab.h
+++ b/src/net/tmwa/gui/partytab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TA_PARTYTAB_H
-#define TA_PARTYTAB_H
+#ifndef NET_TMWA_GUI_PARTYTAB_H
+#define NET_TMWA_GUI_PARTYTAB_H
 
 #include "net/ea/gui/partytab.h"
 
@@ -43,4 +43,4 @@ class PartyTab : public Ea::PartyTab
 
 }  // namespace TmwAthena
 
-#endif  // TA_PARTYTAB_H
+#endif  // NET_TMWA_GUI_PARTYTAB_H
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index 98dcff784..2a0c8d7db 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_GUILDHANDLER_H
-#define NET_TA_GUILDHANDLER_H
+#ifndef NET_TMWA_GUILDHANDLER_H
+#define NET_TMWA_GUILDHANDLER_H
 
 #include "net/guildhandler.h"
 
@@ -74,4 +74,4 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler
     extern Guild *taGuild;
 }  // namespace TmwAthena
 
-#endif
+#endif  // NET_TMWA_GUILDHANDLER_H
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index 365951d08..a02be49ee 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_INVENTORYHANDLER_H
-#define NET_TA_INVENTORYHANDLER_H
+#ifndef NET_TMWA_INVENTORYHANDLER_H
+#define NET_TMWA_INVENTORYHANDLER_H
 
 #include "logger.h"
 
@@ -62,4 +62,4 @@ class InventoryHandler final : public MessageHandler,
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_INVENTORYHANDLER_H
+#endif  // NET_TMWA_INVENTORYHANDLER_H
diff --git a/src/net/tmwa/itemhandler.h b/src/net/tmwa/itemhandler.h
index 00c825588..5b712bc2a 100644
--- a/src/net/tmwa/itemhandler.h
+++ b/src/net/tmwa/itemhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_ITEMHANDLER_H
-#define NET_TA_ITEMHANDLER_H
+#ifndef NET_TMWA_ITEMHANDLER_H
+#define NET_TMWA_ITEMHANDLER_H
 
 #include "net/tmwa/messagehandler.h"
 
@@ -42,4 +42,4 @@ class ItemHandler final : public MessageHandler, public Ea::ItemHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_ITEMHANDLER_H
+#endif  // NET_TMWA_ITEMHANDLER_H
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index c1326f274..d05d0a747 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -78,4 +78,4 @@ class LoginHandler final : public MessageHandler, public Ea::LoginHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_LOGINHANDLER_H
+#endif  // NET_TMWA_LOGINHANDLER_H
diff --git a/src/net/tmwa/messagehandler.h b/src/net/tmwa/messagehandler.h
index 70d8dc3f7..5afe28bff 100644
--- a/src/net/tmwa/messagehandler.h
+++ b/src/net/tmwa/messagehandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_MESSAGEHANDLER_H
-#define NET_TA_MESSAGEHANDLER_H
+#ifndef NET_TMWA_MESSAGEHANDLER_H
+#define NET_TMWA_MESSAGEHANDLER_H
 
 #include "net/messagehandler.h"
 
@@ -58,4 +58,4 @@ typedef const std::auto_ptr<MessageHandler> MessageHandlerPtr;
 
 }  // namespace TmwAthena
 
-#endif
+#endif  // NET_TMWA_MESSAGEHANDLER_H
diff --git a/src/net/tmwa/messagein.h b/src/net/tmwa/messagein.h
index 8178e8aa0..75e85b044 100644
--- a/src/net/tmwa/messagein.h
+++ b/src/net/tmwa/messagein.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_MESSAGEIN_H
-#define NET_TA_MESSAGEIN_H
+#ifndef NET_TMWA_MESSAGEIN_H
+#define NET_TMWA_MESSAGEIN_H
 
 #include "net/messagein.h"
 
@@ -54,4 +54,4 @@ class MessageIn final : public Net::MessageIn
 
 }  // namespace TmwAthena
 
-#endif
+#endif  // NET_TMWA_MESSAGEIN_H
diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h
index 119425257..1d7b76800 100644
--- a/src/net/tmwa/messageout.h
+++ b/src/net/tmwa/messageout.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_MESSAGEOUT_H
-#define NET_TA_MESSAGEOUT_H
+#ifndef NET_TMWA_MESSAGEOUT_H
+#define NET_TMWA_MESSAGEOUT_H
 
 #include "net/messageout.h"
 
@@ -72,4 +72,4 @@ class MessageOut final : public Net::MessageOut
 
 }  // namespace TmwAthena
 
-#endif
+#endif  // NET_TMWA_MESSAGEOUT_H
diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h
index 521a532a2..0dfd067a8 100644
--- a/src/net/tmwa/network.h
+++ b/src/net/tmwa/network.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_NETWORK_H
-#define NET_TA_NETWORK_H
+#ifndef NET_TMWA_NETWORK_H
+#define NET_TMWA_NETWORK_H
 
 #include "net/ea/network.h"
 
@@ -69,4 +69,4 @@ class Network final : public Ea::Network
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_NETWORK_H
+#endif  // NET_TMWA_NETWORK_H
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index 53008f615..8b5adfcac 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_NPCHANDLER_H
-#define NET_TA_NPCHANDLER_H
+#ifndef NET_TMWA_NPCHANDLER_H
+#define NET_TMWA_NPCHANDLER_H
 
 #include "net/net.h"
 #include "net/npchandler.h"
@@ -84,4 +84,4 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_NPCHANDLER_H
+#endif  // NET_TMWA_NPCHANDLER_H
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index bdc945e7e..892dfd70d 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_PARTYHANDLER_H
-#define NET_TA_PARTYHANDLER_H
+#ifndef NET_TMWA_PARTYHANDLER_H
+#define NET_TMWA_PARTYHANDLER_H
 
 #include "net/net.h"
 #include "net/partyhandler.h"
@@ -67,4 +67,4 @@ class PartyHandler final : public MessageHandler, public Ea::PartyHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_PARTYHANDLER_H
+#endif  // NET_TMWA_PARTYHANDLER_H
diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h
index ebfc66874..94f993377 100644
--- a/src/net/tmwa/playerhandler.h
+++ b/src/net/tmwa/playerhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_PLAYERHANDLER_H
-#define NET_TA_PLAYERHANDLER_H
+#ifndef NET_TMWA_PLAYERHANDLER_H
+#define NET_TMWA_PLAYERHANDLER_H
 
 #include "net/net.h"
 #include "net/playerhandler.h"
@@ -63,4 +63,4 @@ class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_PLAYERHANDLER_H
+#endif  // NET_TMWA_PLAYERHANDLER_H
diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h
index 86f78c45d..a2d68da7d 100644
--- a/src/net/tmwa/protocol.h
+++ b/src/net/tmwa/protocol.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TA_PROTOCOL_H
-#define TA_PROTOCOL_H
+#ifndef NET_TMWA_PROTOCOL_H
+#define NET_TMWA_PROTOCOL_H
 
 namespace TmwAthena
 {
@@ -353,4 +353,4 @@ enum
 #define CMSG_SEND_CLIENT_INFO        0x7533
 #define SMSG_UPDATE_HOST2            0x7534
 
-#endif
+#endif  // NET_TMWA_PROTOCOL_H
diff --git a/src/net/tmwa/questhandler.h b/src/net/tmwa/questhandler.h
index e24a48f53..ef6e79c13 100644
--- a/src/net/tmwa/questhandler.h
+++ b/src/net/tmwa/questhandler.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_QUESTHANDLER_H
-#define NET_TA_QUESTHANDLER_H
+#ifndef NET_TMWA_QUESTHANDLER_H
+#define NET_TMWA_QUESTHANDLER_H
 
 #include "net/net.h"
 #include "net/npchandler.h"
@@ -49,4 +49,4 @@ class QuestHandler final : public MessageHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_QUESTHANDLER_H
+#endif  // NET_TMWA_QUESTHANDLER_H
diff --git a/src/net/tmwa/skillhandler.h b/src/net/tmwa/skillhandler.h
index b410aff04..d472faaff 100644
--- a/src/net/tmwa/skillhandler.h
+++ b/src/net/tmwa/skillhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_SKILLHANDLER_H
-#define NET_TA_SKILLHANDLER_H
+#ifndef NET_TMWA_SKILLHANDLER_H
+#define NET_TMWA_SKILLHANDLER_H
 
 #include "net/net.h"
 #include "net/skillhandler.h"
@@ -53,4 +53,4 @@ class SkillHandler final : public MessageHandler, public Ea::SkillHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_SKILLHANDLER_H
+#endif  // NET_TMWA_SKILLHANDLER_H
diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h
index 491139369..707384d85 100644
--- a/src/net/tmwa/tradehandler.h
+++ b/src/net/tmwa/tradehandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TA_TRADEHANDLER_H
-#define NET_TA_TRADEHANDLER_H
+#ifndef NET_TMWA_TRADEHANDLER_H
+#define NET_TMWA_TRADEHANDLER_H
 
 #include "net/net.h"
 #include "net/tradehandler.h"
@@ -59,4 +59,4 @@ class TradeHandler final : public MessageHandler, public Ea::TradeHandler
 
 }  // namespace TmwAthena
 
-#endif  // NET_TA_TRADEHANDLER_H
+#endif  // NET_TMWA_TRADEHANDLER_H