Cleanup/refactoring: view naming
Mucho cleanup