Renaming of stuff for sanity

NPCInfo rolled into NPC