BC Break: Change naming, fix some minor issues.

Main change: objects get back to its previous values when canceling an edit.