Migrate to short name data defined triggers, instead of two-character (this matches symbology setup)