Rename variable hooks to handlers