More naming of buttons