Refactored namespaces of views