Fixes some trigger naming issues.