=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2011-03-31 01:42:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2011-04-04 11:57:57 +0000
@@ -245,7 +245,8 @@
 patient = Beneficiary
 patient_attribute = Beneficiary Attribute
 program = Program
-case_aggregation_mapping = Beneficiary Aggregation QueryBuilder
+beneficiary_aggregation = Beneficiary Aggregation
+beneficiary_aggregation_query_builder = Beneficiary Aggregation Query Builder
 dataelement_group = Dataelement Group
 dataelement = Dataelement
 program_stage_de = ProgramStageDataElement
@@ -337,7 +338,7 @@
 intro_patient_identifier_type = Create, modify and view Beneficiary identifier types. Any type and multiple identifiers can be registered.
 intro_relationship_type = Create, modify and view relationship types. A relationship is typically wife and husband or mother and child.
 intro_program = Create, modify and view programs. A program has program stages and defines which actions should be taken at each stage.
-intro_case_aggregation_mapping = Set up aggregation rules for the process of aggregating Beneficiary data to statistical data.
+intro_beneficiary_aggregation_query_builder = Set up aggregation rules for the process of aggregating Beneficiary data to statistical data.
 intro_validation_criteria = Create, modify and view validation criteria. A critera is used for validation of Beneficiary data.
 intro_program_attribute = Create, modify and view Program attributes. A program can have any number of attributes.
 intro_import_data = Import information of patients automatically from an Excel template file.
@@ -457,3 +458,4 @@
 select_program = Select program
 list_patients_by_program = List Beneficiaries by Program
 manage_program_unenrollment = Manage Program Un-Enrollment
+patient_registration = Beneficiary Registration

=== 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	2011-01-20 15:25:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm	2011-04-04 11:57:57 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString( 'case_aggregation_mapping' )</h3>
+<h3>$i18n.getString( 'beneficiary_aggregation_query_builder' )</h3>
 
 <table class="mainPageTable">
   <tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm	2011-02-16 02:55:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm	2011-04-04 11:57:57 +0000
@@ -10,7 +10,7 @@
 	#introListImgItem( "defineOrgunitRegistrationForm.action" "patient_orgunit_registration" "patient" )
     #introListImgItem( "program.action" "program" "program" )
 	#introListImgItem( "programAttribute.action" "program_attribute" "program" )
-    #introListImgItem( "caseAggregation.action" "case_aggregation_mapping" "caseaggregationmapping" )
+    #introListImgItem( "caseAggregation.action" "beneficiary_aggregation_query_builder" "caseaggregationmapping" )
 	#introListImgItem( "validationCriteria.action" "validation_criteria" "validationcriteria" )
 	#introListImgItem( "patientMobileSetting.action" "patient_mobile_setting" "systemsettings" )
 	#introListImgItem( "configuration.action" "configuration" "systemsettings" )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm	2011-02-16 02:55:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm	2011-04-04 11:57:57 +0000
@@ -5,10 +5,10 @@
 	<li><a href="patientAttributeGroup.action">$i18n.getString( "patient_attribute_group" )</a></li>
 	<li><a href="patientIdentifierType.action">$i18n.getString( "patient_identifier_type" )</a></li>
 	<li><a href="relationshipType.action">$i18n.getString( "relationship_type" )</a></li>
-	<li><a href="defineOrgunitRegistrationForm.action">$i18n.getString( "patient_orgunit_registration" )</a></li>
+	<li><a href="defineOrgunitRegistrationForm.action">$i18n.getString( "patient_registration" )</a></li>
 	<li><a href="program.action">$i18n.getString( "program" )</a></li>
 	<li><a href="programAttribute.action">$i18n.getString( "program_attribute" )</a></li>
-	<li><a href="caseAggregation.action">$i18n.getString( "case_aggregation_mapping" )</a></li>
+	<li><a href="caseAggregation.action">$i18n.getString( "beneficiary_aggregation" )</a></li>
 	<li><a href="validationCriteria.action">$i18n.getString( "validation_criteria" )</a></li>
 	<li><a href="patientMobileSetting.action">$i18n.getString( "patientMobileSetting" )</a></li>
 </ul>