more refactoring on ng-model names