some changes in NPC naming