Changed few button variable names