diff --git a/zone/command.cpp b/zone/command.cpp
index 15e2ecdfb..8fe816fe0 100644
--- a/zone/command.cpp
+++ b/zone/command.cpp
@@ -2044,6 +2044,16 @@ void command_grid(Client *c, const Seperator *sep)
 			return;
 		}
 
+		/**
+		 * Depop any node npc's already spawned
+		 */
+		auto &mob_list = entity_list.GetMobList();
+		for (auto itr = mob_list.begin(); itr != mob_list.end(); ++itr) {
+			Mob *mob = itr->second;
+			if (mob->IsNPC() && mob->GetRace() == 2254)
+				mob->Depop();
+		}
+
 		/**
 		 * Spawn grid nodes
 		 */
diff --git a/zone/npc.cpp b/zone/npc.cpp
index 156cb67fd..917dafe9b 100644
--- a/zone/npc.cpp
+++ b/zone/npc.cpp
@@ -989,7 +989,7 @@ NPC * NPC::SpawnGridNodeNPC(std::string name, const glm::vec4 &position, uint32
 	auto npc_type = new NPCType;
 	memset(npc_type, 0, sizeof(NPCType));
 
-	sprintf(npc_type->name, "(%s)_%u", name.c_str(), grid_number);
+	sprintf(npc_type->name, "%u_%u", grid_id, grid_number);
 	sprintf(npc_type->lastname, "Number: %u Grid: %u Pause: %u", grid_number, grid_id, pause);
 
 	npc_type->cur_hp           = 4000000;