=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2011-08-03 07:44:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2011-08-31 07:51:03 +0000
@@ -15,8 +15,6 @@
           <col>
           <col>
           <col>
-          <col>
-          <col>
           <col>  
 		  #if($mapPatientOrgunit.size()!=0)
 			<col/>
@@ -27,15 +25,11 @@
 		  	<td></td>
 		  	<td></td>
 		  	<td></td>
-		  	<td></td>
-		  	<td></td>
 		  	<td></td>  		  	
 		  	<td></td>
 			<td></td>
           <tr>
-            <th>$i18n.getString( "first_name" )</th>
-            <th>$i18n.getString( "middle_name" )</th>
-            <th>$i18n.getString( "last_name" )</th>            
+            <th>$i18n.getString( "full_name" )</th>        
             <th>$i18n.getString( "gender" )</th>
             <th>$i18n.getString( "date_of_birth" )</th>
             <th>$i18n.getString( "age" )</th>   
@@ -51,14 +45,8 @@
           #foreach( $patient in $patients )
           	<tr #alternate( $mark )>
 				<td>			
-					$encoder.htmlEncode( $patient.firstName )
-				</td>
-				<td>			
-					$encoder.htmlEncode( $patient.middleName )
-				</td>
-				<td>			
-					$encoder.htmlEncode( $patient.lastName )
-				</td>				
+					$encoder.htmlEncode( $patient.getFullName() )
+				</td>			
 				<td>			
 					$encoder.htmlEncode( $patient.gender )
 				</td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatient.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatient.vm	2011-08-03 04:48:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatient.vm	2011-08-31 07:51:03 +0000
@@ -34,8 +34,6 @@
           <col/>
           <col/>
           <col/>
-          <col/>
-          <col/>
 		  #if($mapPatientOrgunit.size()!=0)
           <col/>
 		  #end
@@ -47,9 +45,7 @@
 				#foreach( $attribute in $patientAttributes )
 					<th id="patientAttributeName">$attribute.name</th>
 				#end
-				<th>$i18n.getString( "first_name" )</th>
-				<th>$i18n.getString( "middle_name" )</th>
-				<th>$i18n.getString( "last_name" )</th>            
+				<th>$i18n.getString( "full_name" )</th>          
 				<th>$i18n.getString( "gender" )</th>
 				<th>$i18n.getString( "date_of_birth" )</th> 
 				<th class="{sorter: false}">$i18n.getString( "age" )</th>
@@ -75,11 +71,7 @@
 					<td>$mapPatientPatientAttr.get($key)</td>
 				#end
 					
-				<td>$!patient.firstName</td>
-				
-				<td>$!patient.middleName</td>
-				
-				<td>$!patient.lastName</td>	
+				<td>$!patient.getFullName()</td>
 				
 				<td>$!patient.gender</td>
 				

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientForm.vm	2011-08-31 05:58:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientForm.vm	2011-08-31 07:51:03 +0000
@@ -192,4 +192,4 @@
 			</tr>
 		#end
 	#end
-</table>
\ No newline at end of file
+</table>