diff --git a/src/main/java/client/Client.java b/src/main/java/client/Client.java
index 76a4476c9b..873e98756c 100644
--- a/src/main/java/client/Client.java
+++ b/src/main/java/client/Client.java
@@ -600,7 +600,7 @@ public class Client extends ChannelInboundHandlerAdapter {
             e.printStackTrace();
         }
 
-        if (newState == LoginState.NOT_LOGGED_IN) {
+        if (newState == LoginState.LOGGED_OUT) {
             loggedIn = false;
             inServerTransition = false;
             setAccID(0);
@@ -614,7 +614,7 @@ public class Client extends ChannelInboundHandlerAdapter {
     }
 
     public void setLoginState(int newState) {
-        if (newState == LoginState.NOT_LOGGED_IN) {
+        if (newState == LoginState.LOGGED_OUT) {
             loggedIn = false;
             inServerTransition = false;
             setAccID(0);
@@ -632,8 +632,8 @@ public class Client extends ChannelInboundHandlerAdapter {
     public byte getLoginState(Account account) {
         byte loginState = account.loginState();
         if (loginState == LoginState.SERVER_TRANSITION && lastLoginOverThirtySecondsAgo(account)) {
-            loginState = LoginState.NOT_LOGGED_IN;
-            updateLoginState(LoginState.NOT_LOGGED_IN);
+            loginState = LoginState.LOGGED_OUT;
+            updateLoginState(LoginState.LOGGED_OUT);
         }
 
         if (loginState == LoginState.LOGGED_IN) {
@@ -680,8 +680,8 @@ public class Client extends ChannelInboundHandlerAdapter {
                     if (state == LoginState.SERVER_TRANSITION) {
                         if (rs.getTimestamp("lastlogin").getTime() + 30000 < Server.getInstance().getCurrentTime()) {
                             int accountId = accId;
-                            state = LoginState.NOT_LOGGED_IN;
-                            updateLoginState(LoginState.NOT_LOGGED_IN);   // ACCID = 0, issue found thanks to Tochi & K u ssss o & Thora & Omo Oppa
+                            state = LoginState.LOGGED_OUT;
+                            updateLoginState(LoginState.LOGGED_OUT);   // ACCID = 0, issue found thanks to Tochi & K u ssss o & Thora & Omo Oppa
                             this.setAccID(accountId);
                         }
                     }
diff --git a/src/main/java/client/LoginState.java b/src/main/java/client/LoginState.java
index 74e9aefdaa..512c6f2dc5 100644
--- a/src/main/java/client/LoginState.java
+++ b/src/main/java/client/LoginState.java
@@ -4,7 +4,7 @@ package client;
  * @author Ponk
  */
 public class LoginState {
-    public static final byte NOT_LOGGED_IN = 0; // TODO: rename to LOGGED_OUT
+    public static final byte LOGGED_OUT = 0;
     public static final byte SERVER_TRANSITION = 1;
     public static final byte LOGGED_IN = 2;
 }
diff --git a/src/main/java/net/server/handlers/login/LoginPasswordHandler.java b/src/main/java/net/server/handlers/login/LoginPasswordHandler.java
index 6951a09df3..c2308bf7cb 100644
--- a/src/main/java/net/server/handlers/login/LoginPasswordHandler.java
+++ b/src/main/java/net/server/handlers/login/LoginPasswordHandler.java
@@ -111,7 +111,7 @@ public final class LoginPasswordHandler implements PacketHandler {
 
         c.setAccount(account);
 
-        if (c.getLoginState(account) > LoginState.NOT_LOGGED_IN) {
+        if (c.getLoginState(account) > LoginState.LOGGED_OUT) {
             c.sendPacket(PacketCreator.getLoginFailed(7));
             return;
         }
diff --git a/src/main/java/service/AccountService.java b/src/main/java/service/AccountService.java
index 59750e987f..78274979f9 100644
--- a/src/main/java/service/AccountService.java
+++ b/src/main/java/service/AccountService.java
@@ -38,7 +38,7 @@ public class AccountService {
                 .password(hashPassword(password))
                 .birthdate(GMS_RELEASE)
                 .chrSlots(INITIAL_CHR_SLOTS)
-                .loginState(LoginState.NOT_LOGGED_IN)
+                .loginState(LoginState.LOGGED_OUT)
                 .gender(null)
                 .build();
 
@@ -216,7 +216,7 @@ public class AccountService {
     public boolean setLoggedIn(Client c) {
         byte newState = LoginState.LOGGED_IN;
         int currentState = c.getLoginState();
-        if (currentState != LoginState.NOT_LOGGED_IN && currentState != LoginState.SERVER_TRANSITION) {
+        if (currentState != LoginState.LOGGED_OUT && currentState != LoginState.SERVER_TRANSITION) {
             return false;
         }
 
@@ -230,7 +230,7 @@ public class AccountService {
     }
 
     public void setLoggedOut(Client c) {
-        setLoginState(c, LoginState.NOT_LOGGED_IN);
+        setLoginState(c, LoginState.LOGGED_OUT);
     }
 
     public void setInTransition(Client c) {
diff --git a/src/main/java/service/TransitionService.java b/src/main/java/service/TransitionService.java
index 5c857715ae..d41a4d91cf 100644
--- a/src/main/java/service/TransitionService.java
+++ b/src/main/java/service/TransitionService.java
@@ -179,11 +179,11 @@ public class TransitionService {
 
 
         if (!c.isInTransition() && c.isLoggedIn()) {
-            c.updateLoginState(LoginState.NOT_LOGGED_IN);
+            c.updateLoginState(LoginState.LOGGED_OUT);
             c.clear();
         } else {
             if (!Server.getInstance().hasCharacteridInTransition(c)) {
-                c.updateLoginState(LoginState.NOT_LOGGED_IN);
+                c.updateLoginState(LoginState.LOGGED_OUT);
             }
 
             c.clearEngines();