Made names of tripwires slightly more consistent.
Authored by: tswift 2016-02-13
Parent: [r8635]
Child: [r8637]