refactor namings in views