Changed some button names to be more descriptive