Changes Choice block labels to Label and Value instead of Name and State