diff --git a/Server/src/main/core/game/node/entity/player/Player.java b/Server/src/main/core/game/node/entity/player/Player.java
index cb94a83bd..301ad724f 100644
--- a/Server/src/main/core/game/node/entity/player/Player.java
+++ b/Server/src/main/core/game/node/entity/player/Player.java
@@ -857,7 +857,7 @@ public class Player extends Entity {
 		playerFlags.setLastSceneGraph(null);
 		playerFlags.setUpdateSceneGraph(false);
 		playerFlags.setLastViewport(new RegionChunk[13][13]);
-		renderInfo.getLocalNpcs().clear();
+		renderInfo.getLocalNPCs().clear();
 		renderInfo.getLocalPlayers().clear();
 		renderInfo.setLastLocation(null);
 		renderInfo.setOnFirstCycle(true);
@@ -891,7 +891,7 @@ public class Player extends Entity {
 	 */
 	public void updateSceneGraph(boolean login) {
 		Region region = getLocation().getRegion();
-		if (region instanceof DynamicRegion || region == null && (region = RegionManager.forId(location.getRegionId())) instanceof DynamicRegion) {
+		if (region instanceof DynamicRegion) {
 			PacketRepository.send(BuildDynamicScene.class, new DynamicSceneContext(this, login));
 		} else {
 			PacketRepository.send(UpdateSceneGraph.class, new SceneGraphContext(this, login));
diff --git a/Server/src/main/core/game/node/entity/player/info/RenderInfo.java b/Server/src/main/core/game/node/entity/player/info/RenderInfo.java
index 3aa6a7a07..b72c2fcc7 100644
--- a/Server/src/main/core/game/node/entity/player/info/RenderInfo.java
+++ b/Server/src/main/core/game/node/entity/player/info/RenderInfo.java
@@ -28,7 +28,7 @@ public final class RenderInfo {
 	/**
 	 * The list of local NPCs.
 	 */
-	private List<NPC> localNpcs = new LinkedList<NPC>();
+	private List<NPC> localNPCs = new LinkedList<NPC>();
 
 	/**
 	 * The appearance time stamps (in millisecond).
@@ -89,16 +89,16 @@ public final class RenderInfo {
 	 * Gets the localNpcs.
 	 * @return The localNpcs.
 	 */
-	public List<NPC> getLocalNpcs() {
-		return localNpcs;
+	public List<NPC> getLocalNPCs() {
+		return localNPCs;
 	}
 
 	/**
 	 * Sets the localNpcs.
-	 * @param localNpcs The localNpcs to set.
+	 * @param localNPCs The localNpcs to set.
 	 */
-	public void setLocalNpcs(List<NPC> localNpcs) {
-		this.localNpcs = localNpcs;
+	public void setLocalNPCs(List<NPC> localNPCs) {
+		this.localNPCs = localNPCs;
 	}
 
 	/**
diff --git a/Server/src/main/core/game/world/update/NPCRenderer.kt b/Server/src/main/core/game/world/update/NPCRenderer.kt
index 815066844..026c8860f 100644
--- a/Server/src/main/core/game/world/update/NPCRenderer.kt
+++ b/Server/src/main/core/game/world/update/NPCRenderer.kt
@@ -22,7 +22,7 @@ object NPCRenderer {
     fun render(player: Player) {
         val buffer = IoBuffer(32, PacketHeader.SHORT)
         val info = player.renderInfo
-        val localNPCs = info.localNpcs
+        val localNPCs = info.localNPCs
         val maskBuffer = IoBuffer(-1, PacketHeader.NORMAL, ByteBuffer.allocate(1 shl 16))
         buffer.setBitAccess()
         buffer.putBits(8, localNPCs.size)