Clean up the hooks and add consistent naming scheme to them