Remove -> Delete, Update -> Edit: Bug #731486