[#50154295] Undo some more of the output variable name changes