2 files changed, 15 insertions, 15 deletions

diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index 70b32c92c..23f9f91c0 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -64,17 +64,17 @@ void LoginHandler::getRegistrationDetails() const
     client->setState(STATE_REGISTER);
 }
 
-void LoginHandler::loginAccount(LoginData *const loginData) const
+void LoginHandler::loginAccount(LoginData *const loginData1) const
 {
-    if (loginData)
+    if (loginData1)
     {
         // Since we're attempting to use the tAthena protocol,
         // let's reset the character slots to the good value,
         // in case we just logged out a Manaserv server
         // with a different config.
-        loginData->resetCharacterSlots();
+        loginData1->resetCharacterSlots();
 
-        sendLoginRegister(loginData->username, loginData->password, "");
+        sendLoginRegister(loginData1->username, loginData1->password, "");
     }
 }
 
@@ -96,13 +96,13 @@ void LoginHandler::chooseServer(const unsigned int server) const
     client->setState(STATE_UPDATE);
 }
 
-void LoginHandler::registerAccount(LoginData *const loginData) const
+void LoginHandler::registerAccount(LoginData *const loginData1) const
 {
-    if (!loginData)
+    if (!loginData1)
         return;
 
-    std::string username = loginData->username;
-    switch (loginData->gender)
+    std::string username = loginData1->username;
+    switch (loginData1->gender)
     {
         case GENDER_FEMALE:
             username.append("_F");
@@ -118,7 +118,7 @@ void LoginHandler::registerAccount(LoginData *const loginData) const
             break;
     }
 
-    sendLoginRegister(username, loginData->password, loginData->email);
+    sendLoginRegister(username, loginData1->password, loginData1->email);
 }
 
 Worlds LoginHandler::getWorlds() const
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index c9a2d4f91..2a2659569 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -126,21 +126,21 @@ public:
                 port != other.port);
     }
 
-    static Type parseType(const std::string &type) A_WARN_UNUSED
+    static Type parseType(const std::string &serverType) A_WARN_UNUSED
     {
-        if (compareStrI(type, "tmwathena") == 0)
+        if (compareStrI(serverType, "tmwathena") == 0)
             return TMWATHENA;
-        if (compareStrI(type, "evol") == 0)
+        if (compareStrI(serverType, "evol") == 0)
             return EVOL;
 #ifdef EATHENA_SUPPORT
-        else if (compareStrI(type, "eathena") == 0)
+        else if (compareStrI(serverType, "eathena") == 0)
             return EATHENA;
 #else
-        else if (compareStrI(type, "eathena") == 0)
+        else if (compareStrI(serverType, "eathena") == 0)
             return TMWATHENA;
 #endif
 #ifdef MANASERV_SUPPORT
-        else if (compareStrI(type, "manaserv") == 0)
+        else if (compareStrI(serverType, "manaserv") == 0)
             return MANASERV;
 #endif
         return UNKNOWN;