=== modified file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/facility.vm'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/facility.vm	2012-12-12 07:57:09 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/facility.vm	2013-02-03 10:13:17 +0000
@@ -160,7 +160,7 @@
                     <label for="facilityDhis2DataSets">Data Sets</label>
                     <select #if(!$canUpdate)disabled#end id="facilityDhis2DataSets" class="$inputSize" multiple="multiple">
                     #foreach( $dataSet in $dataSets )
-                        <option value="$dataSet.uid" #if( $dhis2DataSets.contains( $dataSet.uid ))selected="selected"#end>$!esc.escapeHtml4($dataSet.name)</option>
+                        <option value="$dataSet.uid" #if( $dhis2DataSets.contains( $dataSet.uid ))selected="selected"#end>$!esc.escapeHtml4($dataSet.displayName)</option>
                     #end
                     </select>
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm	2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm	2013-02-03 10:13:17 +0000
@@ -18,7 +18,7 @@
 					<select id="dataSetId" name="dataSetId" style="width: 30em">
 						<option value=''>[$i18n.getString('please_select')]</option>
 						#foreach ( $dataSet in $datasets )
-							<option value='$dataSet.id' title='$dataSet.name'>$dataSet.name</option>
+							<option value='$dataSet.id' title='$dataSet.displayName'>$dataSet.displayName</option>
 						#end
 					</select>
 				</td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm	2013-01-29 14:59:14 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm	2013-02-03 10:13:17 +0000
@@ -2,7 +2,7 @@
 	<table class="formSection" width='80%'>
 		<tr>
 		  <td class='entryScreen'>
-			<div class="cent"><h3>$encoder.htmlEncode( $section.name )</h3></div>
+			<div class="cent"><h3>$encoder.htmlEncode( $section.displayName )</h3></div>
 		  </td>
 		</tr>
 		<tr>

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/multiOrgSectionForm.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/multiOrgSectionForm.vm	2013-01-04 18:10:25 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/multiOrgSectionForm.vm	2013-02-03 10:13:17 +0000
@@ -13,7 +13,7 @@
 <table class="formSection" data-multiorg="true">
 <tr>
   <td>
-    <div class="cent"><h3>$encoder.htmlEncode( $section.name )</h3></div>
+    <div class="cent"><h3>$encoder.htmlEncode( $section.displayName )</h3></div>
   </td>
 </tr>
 <tr>

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm	2013-01-04 18:10:25 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm	2013-02-03 10:13:17 +0000
@@ -13,7 +13,7 @@
 <table class="formSection">
 <tr>
   <td>
-    <div class="cent"><h3>$encoder.htmlEncode( $section.name )</h3></div>
+    <div class="cent"><h3>$encoder.htmlEncode( $section.displayName )</h3></div>
   </td>
 </tr>
 <tr>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntryOverview.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntryOverview.vm	2012-10-29 03:48:40 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntryOverview.vm	2013-02-03 10:13:17 +0000
@@ -2,7 +2,7 @@
 #if( $dataSet.alternativeName )
     #set( $dataSetName = $dataSet.alternativeName )
 #else
-    #set( $dataSetName = $dataSet.name )
+    #set( $dataSetName = $dataSet.displayName )
 #end
 
 <div class="header-box" align="center">
@@ -29,7 +29,7 @@
     #if( $dataSet.sections.size() > 0 )
         #foreach( $section in $dataSet.sections )
             <li>
-                <a href="dataEntrySection.action?organisationUnitId=$organisationUnitId&dataSetId=$dataSetId&periodId=$periodId&sectionId=$section.id">$i18n.getString( $section.name )</a>
+                <a href="dataEntrySection.action?organisationUnitId=$organisationUnitId&dataSetId=$dataSetId&periodId=$periodId&sectionId=$section.id">$i18n.getString( $section.displayName )</a>
             </li>
         #end
     #else

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntrySection.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntrySection.vm	2012-10-12 09:22:44 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntrySection.vm	2013-02-03 10:13:17 +0000
@@ -4,7 +4,7 @@
 #if( $dataSet.alternativeName )
 	#set( $dataSetName = $dataSet.alternativeName )
 #else
-	#set( $dataSetName = $dataSet.name )
+	#set( $dataSetName = $dataSet.displayName )
 #end
 
 <h2>$encoder.htmlEncode( $dataSetName )</h2>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm	2012-09-27 06:54:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm	2013-02-03 10:13:17 +0000
@@ -2,7 +2,7 @@
 #if( $dataSet.alternativeName )
     #set( $dataSetName = $dataSet.alternativeName )
 #else
-    #set( $dataSetName = $dataSet.name )
+    #set( $dataSetName = $dataSet.displayName )
 #end
 
 #if( $complete == true )

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectPeriod.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectPeriod.vm	2012-11-06 03:41:55 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectPeriod.vm	2013-02-03 10:13:17 +0000
@@ -2,7 +2,7 @@
 #if( $dataSet.alternativeName )
     #set( $dataSetName = $dataSet.alternativeName )
 #else
-    #set( $dataSetName = $dataSet.name )
+    #set( $dataSetName = $dataSet.displayName )
 #end
 
 <div class="header-box" align="center">

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/trackingMenu.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/trackingMenu.vm	2012-11-02 09:21:38 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/trackingMenu.vm	2013-02-03 10:13:17 +0000
@@ -1,7 +1,7 @@
 #if( $dataSet.alternativeName )
     #set( $dataSetName = $dataSet.alternativeName )
 #else
-    #set( $dataSetName = $dataSet.name )
+    #set( $dataSetName = $dataSet.displayName )
 #end
 
 #if( $complete == true )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm	2012-07-25 13:18:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm	2013-02-03 10:13:17 +0000
@@ -18,7 +18,7 @@
     <td colspan="2" rowspan="2">
 		<select size="26px" multiple="multiple" style="width:30em" id="dataSetIds" name="dataSetIds">
 			#foreach( $dataSet in $dataSets )
-			  <option value="$dataSet.id">$encoder.htmlEncode( $dataSet.name )</option>
+			  <option value="$dataSet.id">$encoder.htmlEncode( $dataSet.displayName )</option>
 			#end
 		</select>
 	</td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseDataSet.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseDataSet.vm	2013-02-03 10:13:17 +0000
@@ -3,7 +3,7 @@
 		#foreach ( $dataSet in $dataSets )
 		<dataSet>
 			<id>$dataSet.id</id>
-			<name>$encoder.xmlEncode( $dataSet.name )</name>
+			<name>$encoder.xmlEncode( $dataSet.displayName )</name>
 			<locked>$dataSet.locked</locked>
 		</dataSet>
 		#end

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm	2012-10-17 11:58:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm	2013-02-03 10:13:17 +0000
@@ -39,11 +39,11 @@
       </tr>	  
 	  <tr>
         <td><label>$i18n.getString( "dataset" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-        <td><input type="text" value="$dataSet.name" disabled="disabled"/><input type="hidden" id="dataSetId" name="dataSetId" value="$dataSet.id"/></td>
+        <td><input type="text" value="$dataSet.displayName" disabled="disabled"/><input type="hidden" id="dataSetId" name="dataSetId" value="$dataSet.id"/></td>
       </tr>
       <tr>
         <td><label>$i18n.getString( "category_combo" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-        <td><input type="text" value="$!categoryCombo.name" disabled="disabled"/><input type="hidden" id="categoryComboId" name="categoryComboId" value="$!categoryCombo.id"/></td>
+        <td><input type="text" value="$!categoryCombo.displayName" disabled="disabled"/><input type="hidden" id="categoryComboId" name="categoryComboId" value="$!categoryCombo.id"/></td>
       </tr>
      
       <tr><td>&nbsp;</td><td>&nbsp;</td></tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm	2011-03-18 14:20:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm	2013-02-03 10:13:17 +0000
@@ -1,6 +1,6 @@
 <h3>$i18n.getString( "define_dataset_associations" )</h3>
 
-<h4>$encoder.htmlEncode( $dataSet.name )</h4>
+<h4>$encoder.htmlEncode( $dataSet.displayName )</h4>
 
 <form id="defineDataSetAssociationsForm" action="defineDataSetAssociations.action" method="post">
   <div style="display:inline">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm	2012-10-17 11:58:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm	2013-02-03 10:13:17 +0000
@@ -39,15 +39,15 @@
     <tbody>
       <tr>
         <td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-        <td><input type="text" id="sectionName" name="sectionName" value= "$section.name"></td>        
+        <td><input type="text" id="sectionName" name="sectionName" value= "$section.name"></td>
       </tr>     
       <tr>
       	<td><label>$i18n.getString( "dataset" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-        <td><input type="text" value="$dataSet.name" disabled="disabled"/></td>
+        <td><input type="text" value="$dataSet.displayName" disabled="disabled"/></td>
       </tr>
       <tr>
         <td><label>$i18n.getString( "category_combo" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-        <td><input type="text" value="$!categoryCombo.name" disabled="disabled"/></td>
+        <td><input type="text" value="$!categoryCombo.displayName" disabled="disabled"/></td>
       </tr>
     </tbody>
   </table>
@@ -84,7 +84,7 @@
 		<td>
 			<select id="selectedList" name="selectedList" multiple="multiple" style="height: 200px; width: 100%; margin-top: 22px;">
             #foreach ( $dataElement in $section.dataElements )
-              <option value="$dataElement.id">$dataElement.name</option>
+              <option value="$dataElement.id">$dataElement.displayName</option>
             #end
 			</select>
         </td> 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm	2012-02-21 19:20:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm	2013-02-03 10:13:17 +0000
@@ -17,15 +17,15 @@
 	<tbody>
 		<tr>
 			<td><label>$i18n.getString( "name" ):</label></td>
-			<td>$section.name</td>        
+			<td>$section.displayName</td>
 		</tr>
 		<tr>
 			<td><label>$i18n.getString( "dataset" ):</label></td>
-			<td>$section.dataSet.name</td>
+			<td>$section.dataSet.displayName</td>
 		</tr>
 		<tr>
 	    <td><label>$i18n.getString( "category_combo" ):</label></td>
-	        <td>$categoryCombo.name</td>
+	        <td>$categoryCombo.displayName</td>
 		</tr>
     </tbody>    
 </table>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionDataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionDataElement.vm	2011-03-18 14:20:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionDataElement.vm	2013-02-03 10:13:17 +0000
@@ -28,9 +28,9 @@
            ##data element name
            <td>
             #if( $useShortName )
-            	$encoder.htmlEncode( $dataElement.shortName )
+            	$encoder.htmlEncode( $dataElement.displayShortName )
             #else
-                $encoder.htmlEncode( $dataElement.name )
+                $encoder.htmlEncode( $dataElement.displayName )
             #end 	          	
            </td>
            

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2013-01-23 09:08:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2013-02-03 10:13:17 +0000
@@ -61,7 +61,7 @@
       </tr>
       <tr>
         <td><label>$i18n.getString( "dataset" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-        <td><input type="text" value="$dataSet.name" style="width:30em" disabled /></td>
+        <td><input type="text" value="$dataSet.displayName" style="width:30em" disabled /></td>
       </tr>
       <tr>
         <td><label>$i18n.getString( "style" )</label></td>
@@ -136,7 +136,7 @@
 						<div style="color:#666; margin-top:5px; margin-bottom:5px;">$i18n.getString( "select_category_combo_for_which_to_insert" )</div>
 						<select id="categoryComboSelect" style="width: 100%; margin-bottom: 10px;">
 							#foreach( $categoryCombo in $categoryCombos )
-							<option value="$categoryCombo.uid">$encoder.htmlEncode( $categoryCombo.name )</option>
+							<option value="$categoryCombo.uid">$encoder.htmlEncode( $categoryCombo.displayName )</option>
 							#end
 						</select><br>
 						<button type="button" id="startButton">$i18n.getString( "start" )</button>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/new-sms-command.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/new-sms-command.vm	2012-08-30 12:47:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/new-sms-command.vm	2013-02-03 10:13:17 +0000
@@ -39,7 +39,7 @@
 			<td>
 				<select name="selectedDataSetID" >
 				#foreach( $dataSet in $dataSets )
-			        <option value="$dataSet.id" #if ($SMSCommand.dataset.id == $dataSet.id) selected #end >$dataSet.name</option>
+			        <option value="$dataSet.id" #if ($SMSCommand.dataset.id == $dataSet.id) selected #end >$dataSet.displayName</option>
 				#end
 				</select> 
 			</td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm	2012-10-31 08:31:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm	2013-02-03 10:13:17 +0000
@@ -118,7 +118,7 @@
     	<td style="width:120px"><label for="availableDataSets">$i18n.getString( "available_data_sets" )</label></td>
     	<td><select multiple id="availableDataSets" size="5" ondblclick="moveSelectedById( 'availableDataSets', 'dataSets' )">
     	#foreach( $dataSet in $dataSets )
-    	<option value="${dataSet.id}">$encoder.htmlEncode( $dataSet.name )</option>
+    	<option value="${dataSet.id}">$encoder.htmlEncode( $dataSet.displayName )</option>
 	    #end
     	</select></td>
     </tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm	2012-10-31 08:31:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm	2013-02-03 10:13:17 +0000
@@ -135,7 +135,7 @@
     	<td>
 			<select multiple id="availableDataSets" size="5" ondblclick="moveSelectedById( 'availableDataSets', 'dataSets' )">
 			#foreach( $dataSet in $availableDataSets )
-				<option value="${dataSet.id}">$encoder.htmlEncode( $dataSet.name )</option>
+				<option value="${dataSet.id}">$encoder.htmlEncode( $dataSet.displayName )</option>
 			#end
 			</select>
 		</td>
@@ -152,7 +152,7 @@
     	<td>
 			<select multiple id="dataSets" name="dataSets" size="5" ondblclick="moveSelectedById( 'dataSets', 'availableDataSets' )">
 			#foreach( $dataSet in $dataSets )
-				<option value="${dataSet.id}">$encoder.htmlEncode( $dataSet.name )</option>
+				<option value="${dataSet.id}">$encoder.htmlEncode( $dataSet.displayName )</option>
 			#end
 			</select>
 		</td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm	2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm	2013-02-03 10:13:17 +0000
@@ -33,7 +33,7 @@
 			<select id="dataSets" name="dataSets" onChange="getDataElementsByDataset();">
 				<option value="">[$i18n.getString('please_select')]</option>
 				#foreach( $dataSet in $dataSets)
-					<option value="$dataSet.id" #if( $dataSetId=="$dataSet.id") selected #end>$dataSet.name</option>
+					<option value="$dataSet.id" #if( $dataSetId=="$dataSet.id") selected #end>$dataSet.displayNamew</option>
 				#end
 			</select>
 		</td>				

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm	2012-07-04 05:06:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm	2013-02-03 10:13:17 +0000
@@ -11,7 +11,7 @@
 				<select id='dataSetId' name='dataSetId' onchange='getCaseAggConditionByDataset();'>
 					<option value=''>[ $i18n.getString( "all" ) ]</option>
 					#foreach( $dataSet in $dataSets )
-					<option value='$dataSet.id' #if( $dataSetId=="$dataSet.id") selected #end >$dataSet.name</option>
+					<option value='$dataSet.id' #if( $dataSetId=="$dataSet.id") selected #end >$dataSet.displayName</option>
 					#end
 				</select>
 			</td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSection.vm	2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSection.vm	2013-02-03 10:13:17 +0000
@@ -28,10 +28,10 @@
 					#set( $mark = false )
 					#foreach( $section in $programStage.programStageSections )
 						<tr id="tr${section.id}" #alternate( $mark )>			  
-							<td onclick="showSectionDetails( $section.id )">$encoder.htmlEncode( $section.name )</td>							
+							<td onclick="showSectionDetails( $section.id )">$encoder.htmlEncode( $section.displayName )</td>
 							<td style="text-align:center"#alternate( $mark )>
 							  <a href="showUpdateProgramStageSectionForm.action?programStageId=$programStage.id&id=$section.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
-							  <a href="javascript:removeSection( '$section.id', '$section.name' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
+							  <a href="javascript:removeSection( '$section.id', '$section.displayName' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
 							  <a href="javascript:showSectionDetails( $section.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"></a>
 							</td>
 						</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSectionSortOder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSectionSortOder.vm	2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSectionSortOder.vm	2013-02-03 10:13:17 +0000
@@ -11,7 +11,7 @@
 		<td>
 			<select id='sectionIds' name='sectionIds'multiple style='width:400px;height:200px'>
 				#foreach( $section in $programStage.programStageSections )
-					<option value='$section.id'>$section.name</option>
+					<option value='$section.id'>$section.displayName</option>
 				#end
 			</select>
 		</td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm	2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm	2013-02-03 10:13:17 +0000
@@ -32,7 +32,7 @@
 			<select id="dataSets" name="dataSets" onchange="getDataElementsByDataset();">
 				<option value="">[$i18n.getString('please_select')]</option>
 				#foreach( $dataSet in $dataSets)
-					<option value="$dataSet.id" #if( $dataSetId=="$dataSet.id") selected #end >$dataSet.name</option>
+					<option value="$dataSet.id" #if( $dataSetId=="$dataSet.id") selected #end >$dataSet.displayName</option>
 				#end
 			</select>
 		</td>				

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageSectionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageSectionForm.vm	2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageSectionForm.vm	2013-02-03 10:13:17 +0000
@@ -30,7 +30,7 @@
 	<tbody>
 		<tr>
 			<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td><input type="text" id="name" name="name" class="{validate:{required:true,rangelength:[2,160]}}" value='$section.name'/></td>
+			<td><input type="text" id="name" name="name" class="{validate:{required:true,rangelength:[2,160]}}" value='$section.displayName'/></td>
 		</tr>
 	</tbody>
 </table>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2013-01-24 11:11:31 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2013-02-03 10:13:17 +0000
@@ -71,7 +71,7 @@
 <select id="dataSetId" name="dataSetId" style="width:330px">
   <option value="">[ $i18n.getString( "select" ) ]</option>
   #foreach( $dataSet in $dataSets )
-  <option value="$dataSet.uid">$encoder.htmlEncode( $dataSet.name )</option>
+  <option value="$dataSet.uid">$encoder.htmlEncode( $dataSet.displayName )</option>
   #end
 </select>
 </div>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/selectTallySheetForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/selectTallySheetForm.vm	2011-03-28 20:09:32 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/selectTallySheetForm.vm	2013-02-03 10:13:17 +0000
@@ -24,7 +24,7 @@
 	      <select id="selectedDataSetId" name="selectedDataSetId" style="min-width:350px" #if( $dataSets.size() == 0 ) disabled="disabled" #end>
 			  <option value="null">[ $i18n.getString( "select" ) ]</option>
 		      #foreach( $dataSet in $dataSets )
-			  <option value="$dataSet.id">$encoder.htmlEncode( $dataSet.name )</option>
+			  <option value="$dataSet.id">$encoder.htmlEncode( $dataSet.displayName )</option>
 		      #end	      
 		  </select>
 	</td>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm	2012-11-21 13:04:45 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm	2013-02-03 10:13:17 +0000
@@ -27,7 +27,7 @@
 	<select id="dataSetId" name="dataSetId" style="width:330px">
 	<option value="0">[ $i18n.getString( "select_dataset_all" ) ]</option>
 	#foreach( $dataSet in $dataSets )
-		<option value="$dataSet.id">$dataSet.name</option>
+		<option value="$dataSet.id">$dataSet.displayName</option>
 	#end
 	</select><br><br>
     

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/dataEntryOverview.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/dataEntryOverview.vm	2012-06-18 06:14:19 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/dataEntryOverview.vm	2013-02-03 10:13:17 +0000
@@ -2,7 +2,7 @@
 #if( $dataSet.alternativeName )
     #set( $dataSetName = $dataSet.alternativeName )
 #else
-    #set( $dataSetName = $dataSet.name )
+    #set( $dataSetName = $dataSet.displayName )
 #end
 
 <div class="header-box" align="center">
@@ -29,7 +29,7 @@
     #if( $dataSet.sections.size() > 0 )
         #foreach( $section in $dataSet.sections )
             <li>
-                <a href="dataEntrySection.action?organisationUnitId=$organisationUnitId&dataSetId=$dataSetId&periodId=$periodId&sectionId=$section.id">$i18n.getString( $section.name )</a>
+                <a href="dataEntrySection.action?organisationUnitId=$organisationUnitId&dataSetId=$dataSetId&periodId=$periodId&sectionId=$section.id">$i18n.getString( $section.displayName )</a>
             </li>
         #end
     #else

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/dataEntrySection.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/dataEntrySection.vm	2012-06-18 06:14:19 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/dataEntrySection.vm	2013-02-03 10:13:17 +0000
@@ -4,7 +4,7 @@
 #if( $dataSet.alternativeName )
 	#set( $dataSetName = $dataSet.alternativeName )
 #else
-	#set( $dataSetName = $dataSet.name )
+	#set( $dataSetName = $dataSet.displayName )
 #end
 
 <h2>$encoder.htmlEncode( $dataSetName )</h2>

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/menu.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/menu.vm	2012-08-23 08:09:35 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/menu.vm	2013-02-03 10:13:17 +0000
@@ -2,7 +2,7 @@
 #if( $dataSet.alternativeName )
     #set( $dataSetName = $dataSet.alternativeName )
 #else
-    #set( $dataSetName = $dataSet.name )
+    #set( $dataSetName = $dataSet.displayName )
 #end
 
 #if( $complete == true )

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/selectPeriod.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/selectPeriod.vm	2012-06-18 06:14:19 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/selectPeriod.vm	2013-02-03 10:13:17 +0000
@@ -2,7 +2,7 @@
 #if( $dataSet.alternativeName )
     #set( $dataSetName = $dataSet.alternativeName )
 #else
-    #set( $dataSetName = $dataSet.name )
+    #set( $dataSetName = $dataSet.displayName )
 #end
 
 <div class="header-box" align="center">