Rename trigger types to better match the ui and add 2 types not in the docs
Merge branch 'trigger_dependencies' into integration