Rename output variables to their correct names