Removed References to Npc names