Merge "Trigger name changes"