=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html	2016-02-15 09:46:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html	2016-02-15 10:16:24 +0000
@@ -49,7 +49,7 @@
 
                 <select ng-model="selectedProgram"
                         class="form-control-program"
-                        ng-options="program as program.displayName for program in programs | orderBy: 'name'" 
+                        ng-options="program as program.displayName for program in programs | orderBy: 'displayName'" 
                         ng-disabled="programs.length < 1"
                         ng-change="applySelectedProgram(selectedProgram)">
                     <option value="">{{programs.length > 0 ? 'please_select_a_program' : 'no_program_exists' | translate}}</option>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html	2016-02-15 09:46:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html	2016-02-15 10:16:24 +0000
@@ -13,7 +13,7 @@
                     <td>
                         <select class="form-control" 
                                 ng-model="trackedEntities.selected"                                     
-                                ng-options="trackedEntity.displayName for trackedEntity in trackedEntities.available | orderBy: 'name'">                                
+                                ng-options="trackedEntity.displayName for trackedEntity in trackedEntities.available | orderBy: 'displayName'">                                
                         </select>                            
                     </td>
                 </tr>                   

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html	2016-02-15 09:46:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html	2016-02-15 10:16:24 +0000
@@ -57,7 +57,7 @@
                         <td>
                             <select ng-model="selectedProgram"
                                     class="form-control"
-                                    ng-options="program as program.displayName for program in programs | orderBy: 'name'" 
+                                    ng-options="program as program.displayName for program in programs | orderBy: 'displayName'" 
                                     ng-disabled="programs.length < 1">
                                 <option value="">{{programs.length > 0 ? 'please_select_a_program' : 'no_program_exists'| translate}}</option>
                             </select>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/reportForm.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/reportForm.html	2016-02-15 09:46:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/reportForm.html	2016-02-15 10:16:24 +0000
@@ -22,7 +22,7 @@
                 <td class='col-sm-4 col-md-3'>
                     <select ng-model="selectedProgram"
                             class="form-control"
-                            ng-options="program as program.displayName for program in programs | orderBy: 'name'"
+                            ng-options="program as program.displayName for program in programs | orderBy: 'displayName'"
                             ng-disabled="programs.length < 1">
                         <option value="">{{programs.length > 0 ? 'please_select' : 'no_program_exists'| translate}}</option>
                     </select>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html	2016-02-15 09:46:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html	2016-02-15 10:16:24 +0000
@@ -57,7 +57,7 @@
                         <td>
                             <select ng-model="selectedProgram"
                                     class="form-control"
-                                    ng-options="program as program.displayName for program in programs | orderBy: 'name'"
+                                    ng-options="program as program.displayName for program in programs | orderBy: 'displayName'"
                                     ng-disabled="programs.length < 1" ng-selected="programs.length === 1">
                                 <option ng-if="programs.length !== 1" value="">{{programs.length > 1 ? 'please_select_a_program' : 'no_program_exists'| translate}}</option>
                             </select>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/registration.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/registration.html	2016-02-15 09:46:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/registration.html	2016-02-15 10:16:24 +0000
@@ -14,7 +14,7 @@
                         <select class="form-control" 
                                 ng-model="trackedEntities.selected" 
                                 ng-disabled="selectedAttribute && selectedAttribute.trackedEntity"
-                                ng-options="trackedEntity.displayName for trackedEntity in trackedEntities.available | orderBy: 'name'">                                
+                                ng-options="trackedEntity.displayName for trackedEntity in trackedEntities.available | orderBy: 'displayName'">                                
                         </select>                            
                     </td>
                 </tr>                   

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add.html	2016-02-15 09:46:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add.html	2016-02-15 10:16:24 +0000
@@ -6,7 +6,7 @@
         <div class='col-md-12'>
             <select ng-model="relationship.selected"
                     class="form-control"
-                    ng-options="rel as rel.displayName for rel in relationshipTypes | orderBy: 'name'"
+                    ng-options="rel as rel.displayName for rel in relationshipTypes | orderBy: 'displayName'"
                     ng-disabled="relatedProgramRelationship">
                 <option value="">{{'please_select_a_relationship'| translate}}</option>
             </select>
@@ -77,7 +77,7 @@
                         <select ng-model="selectedProgramForRelative"
                                 class="form-control"
                                 ng-disabled="programs.length < 1 || (selectedProgramForRelative && selectedProgram.relatedProgram && relatedProgramRelationship) || selectedAttribute && selectedAttribute.trackedEntity"
-                                ng-options="program as program.displayName for program in programs | orderBy: 'name'" 
+                                ng-options="program as program.displayName for program in programs | orderBy: 'displayName'" 
                                 ng-change="setAttributesForSearch(selectedProgramForRelative)">
                             <option value="">{{'please_select_a_program'| translate}}</option>
                         </select>                

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.html	2016-02-15 09:46:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.html	2016-02-15 10:16:24 +0000
@@ -5,7 +5,7 @@
             <button class="btn btn-default select-dropdown-caret" type="button" data-toggle="dropdown" title="Test"><i class="fa fa-caret-down"></i></button>
             <ul id="selectDropDown" class="dropdown-menu dropdown-menu-right">
                 <li ng-repeat="filter in eventsTodayFilters | orderBy: 'name'">
-                    <a href ng-click="fetchTeisEventsToday(filter)">{{filter.displayName}}</a>
+                    <a href ng-click="fetchTeisEventsToday(filter)">{{filter.name}}</a>
                 </li>
             </ul>
         </div>