Update variable references for response handling.
Fixed remaining issues with response handling.