=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowDataElementGroupEditorAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowDataElementGroupEditorAction.java	2012-01-20 10:38:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowDataElementGroupEditorAction.java	2012-02-02 10:34:39 +0000
@@ -85,6 +85,7 @@
         dataElementGroups = new ArrayList<DataElementGroup>( dataElementService.getAllDataElementGroups() );
 
         dataElements = new ArrayList<DataElement>( dataElementService.getAllDataElements() );
+        
         Collections.sort( dataElements, new IdentifiableObjectNameComparator() );
 
         return SUCCESS;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView.vm	2011-12-01 04:30:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView.vm	2012-02-02 10:34:39 +0000
@@ -1,12 +1,12 @@
 <script type="text/javascript">
 	var dataElementGroups = new Array();
 	#foreach( $dataElementGroup in $dataElementGroups )
-        dataElementGroups['$dataElementGroup.id'] = '$encoder.jsEscape( $dataElementGroup.name, "'" )';
+        dataElementGroups['$dataElementGroup.id'] = '$encoder.jsEscape( $dataElementGroup.displayName, "'" )';
 	#end
 
 	var availableDataElements = new Array();
 	#foreach( $dataElement in $dataElements )
-		availableDataElements['$dataElement.id'] = '$encoder.jsEscape( $dataElement.name, "'" )';
+		availableDataElements['$dataElement.id'] = '$encoder.jsEscape( $dataElement.displayName, "'" )';
 	#end
 	var selectedDataElements = new Array();
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView.vm	2011-12-01 04:30:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView.vm	2012-02-02 10:34:39 +0000
@@ -1,12 +1,12 @@
 <script type="text/javascript">
 	var indicatorGroups = new Array();
 	#foreach( $indicatorGroup in $indicatorGroups )
-		indicatorGroups['$indicatorGroup.id'] = '$encoder.jsEscape( $indicatorGroup.name, "'" )';
+		indicatorGroups['$indicatorGroup.id'] = '$encoder.jsEscape( $indicatorGroup.displayName, "'" )';
 	#end
 
 	var availableIndicators = new Array();
 	#foreach( $indicator in $indicators )
-		availableIndicators['$indicator.id'] = '$encoder.jsEscape( $indicator.name, "'" )';
+		availableIndicators['$indicator.id'] = '$encoder.jsEscape( $indicator.displayName, "'" )';
 	#end
 	var selectedIndicators = new Array();