RUBY-596 Better naming for views - less confusion