Added apostrophe and hyphen support in npc names