Refactored the button variable names