Fix incorrect labelling and variable names.