Fixed button naming and labelling