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