Rename views and urls accordingly

Merge:	releng/9.1.0