Use new names for response handlers.