Refactoring to view:: namespace and more pragmatic naming,