Update and rename Trigger + NPC to Trigger