[Develop_1] view names are refactored