Refactored view names

Refactored view names