Qual: keep trigger naming consistent
Merge pull request #1522 from GPCsolutions/triggernames

Qual: keep trigger naming consistent