Rename variables to view/editor