tweaking the key names for the hooks. #25