Inconsistent handling of cancel button in various forms

[jjg-123]

All forms should use the same nomenclature so we don't have to check on a form by form basis if a user cancels. This boils down to consistent naming on the forms.