Fix naming issue to restore ability to switch between editors

Bug: T85480
Change-Id: I058d0dfa18f2220fc0e2d9ecc8dfd12206d3c481
Merge "Fix naming issue to restore ability to switch between editors"