Adapt to upstream renaming (editor-view => editor)