Updated names for buttons/labels