More renaming, and rework of generic view creation