Improve hook naming