Rename push/pop to stash/restore