Rename hook per Tim's CR on r58192