renamed controllers to be consistent with the button names