refactor view names to make their role more clear