Rename buttons to fit what we learned about usability