finished defining naming conventions for views and refactoring