Also changed the labels on the buttons to better match the action they are completing.

Closes #8057