refactoring ng-model names