rename `viewType` to `templateType`
make templateType terminology consistent
first pass
Merge remote-tracking branch 'origin/partial-layouts'