Refactored names of buttons