2 files changed, 9 insertions, 9 deletions
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index fb64617a0..c37fc86a0 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -36,7 +36,7 @@
 #include "net/ea/guildhandler.h"
 
 #include "gui/widgets/tabs/chat/guildtab.h"
-#include "net/ea/gui/partytab.h"
+#include "gui/widgets/tabs/chat/partytab.h"
 
 #include "net/tmwa/adminhandler.h"
 #include "net/tmwa/auctionhandler.h"
@@ -352,7 +352,7 @@ void GeneralHandler::gameEnded() const
     }
 
     delete2(guildTab);
-    delete2(Ea::partyTab);
+    delete2(partyTab);
 }
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 6d59cd0ce..e2b0c1893 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -30,7 +30,7 @@
 #include "gui/windows/chatwindow.h"
 #include "gui/windows/socialwindow.h"
 
-#include "net/ea/gui/partytab.h"
+#include "gui/widgets/tabs/chat/partytab.h"
 
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
@@ -204,7 +204,7 @@ void PartyHandler::setShareItems(const Net::PartyShare::Type share) const
 
 void PartyHandler::processPartySettings(Net::MessageIn &msg)
 {
-    if (!Ea::partyTab)
+    if (!partyTab)
     {
         if (!chatWindow)
             return;
@@ -286,14 +286,14 @@ void PartyHandler::processPartyInfo(Net::MessageIn &msg) const
             PartyMember *const member = Ea::taParty->addMember(id, nick);
             if (member)
             {
-                if (!joined && Ea::partyTab)
+                if (!joined && partyTab)
                 {
                     if (!names.empty() && ((onlineNames.find(nick)
                         == onlineNames.end() && online)
                         || (onlineNames.find(nick) != onlineNames.end()
                         && !online)))
                     {
-                        Ea::partyTab->showOnline(nick, online);
+                        partyTab->showOnline(nick, online);
                     }
 
                     member->setLeader(leader);
@@ -331,12 +331,12 @@ void PartyHandler::processPartyMessage(Net::MessageIn &msg) const
     const int id = msg.readInt32();
     const std::string chatMsg = msg.readString(msgLength);
 
-    if (Ea::taParty && Ea::partyTab)
+    if (Ea::taParty && partyTab)
     {
         const PartyMember *const member = Ea::taParty->getMember(id);
         if (member)
         {
-            Ea::partyTab->chatLog(member->getName(), chatMsg);
+            partyTab->chatLog(member->getName(), chatMsg);
         }
         else
         {
@@ -348,7 +348,7 @@ void PartyHandler::processPartyMessage(Net::MessageIn &msg) const
 
 void PartyHandler::processPartyInviteResponse(Net::MessageIn &msg) const
 {
-    if (!Ea::partyTab)
+    if (!partyTab)
         return;
 
     const std::string nick = msg.readString(24);