Fix the mismatch between the property values and the output names.