Fix merge conflict.
All views should use helperName as default instrumentation display

Views generated from `outlet` and `render` helpers need the helper name in
instrumentation display.

Also added name to the render helper. Example:
`{{render "person"}}`