Renamed variables used on $scope to include the 'Model' suffix