Also update member variable names to describe their contents better. Fixes #8709
Fixes #7437 (entry edit view only) Fixes #5220