Updated naming, and made sure changes are in undostack