Changed the name of 2 tripwire handlers.
Authored by: tswift 2016-02-16
Parent: [r8646]
Child: [r8648]