make trigger constant names more consistent