Standardize hook handler names

(Replaces Change: I592a2514bb51157f2ba5b3d0c601f3ec58d8d884)

Change-Id: Ie4fa8d244dd420f8d791cfe08a2b84304924afc3