Changed some labelling to make more sense