=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/TrackedEntityInstanceController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/TrackedEntityInstanceController.java	2014-04-04 17:20:41 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/TrackedEntityInstanceController.java	2014-04-08 11:37:59 +0000
@@ -72,7 +72,7 @@
  */
 @Controller
 @RequestMapping( value = TrackedEntityInstanceController.RESOURCE_PATH )
-@PreAuthorize( "hasRole('ALL') or hasRole('F_PATIENT_LIST')" )
+@PreAuthorize( "hasRole('ALL') or hasRole('F_TRACKED_ENTITY_INSTANCE_SEARCH')" )
 public class TrackedEntityInstanceController
 {
     public static final String RESOURCE_PATH = "/trackedEntityInstances";

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2014-04-07 12:48:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2014-04-08 11:37:59 +0000
@@ -34,13 +34,13 @@
 		<action name="searchAllFacilities" class="org.hisp.dhis.caseentry.action.NoAction">
 			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
 			</result>
-			<param name="requiredAuthorities">F_SEARCH_TRACKED_ENTITY_INSTANCE_IN_ALL_FACILITIES</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_SEARCH_IN_ALL_ORGUNITS</param>
 		</action>
 
 		<action name="searchInOtherOrgunits" class="org.hisp.dhis.caseentry.action.NoAction">
 			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
 			</result>
-			<param name="requiredAuthorities">F_SEARCH_TRACKED_ENTITY_INSTANCE_IN_OTHER_ORGUNITS</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_SEARCH</param>
 		</action>
 
 		<action name="searchTrackedEntityInstance"
@@ -55,7 +55,7 @@
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="listAll">true</param>
 			<param name="page">/dhis-web-caseentry/listTrackedEntityInstance.vm</param>
-			<param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_LIST</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_SEARCH</param>
 		</action>
 
 		<action name="selectDataRecording"
@@ -521,7 +521,7 @@
 			<result name="success" type="velocity-json">
 				/dhis-web-commons/ajax/jsonResponseSuccess.vm
 			</result>
-			<param name="anyAuthorities">F_ALLOW_EDIT_TRACKED_ENTITY_PROPERTIES, F_ALLOW_EDIT_TRACKED_ENTITY_ATTRIBUTES, F_ALLOW_EDIT_TRACKED_ENTITY_IDENTIFIERS</param>
+			<param name="anyAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_EDIT</param>
 		</action>
 
 		<action name="validateTrackedEntityInstance"
@@ -873,7 +873,7 @@
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="page">/dhis-web-caseentry/trackedEntityInstanceDashboard.vm</param>
 			<param name="stylesheets">style/style.css</param>
-			<param name="requiredAuthorities">F_PATIENT_DASHBOARD</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_INSTANCE_DASHBOARD</param>
 		</action>
 
 		<action name="removeProgramInstance"
@@ -893,21 +893,21 @@
 			class="org.hisp.dhis.caseentry.action.reminder.SaveTrackedEntityCommentAction">
 			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
 			</result>
-			<param name="requiredAuthorities">F_PATIENT_COMMENT_ADD</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_COMMENT_ADD</param>
 		</action>
 
 		<action name="removeTrackedEntityInstanceComment"
 			class="org.hisp.dhis.caseentry.action.reminder.RemoveTrackedEntityInstanceCommentAction">
 			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
 			</result>
-			<param name="requiredAuthorities">F_PATIENT_COMMENT_DELETE</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_COMMENT_DELETE</param>
 		</action>
 
 		<action name="removeSms"
 			class="org.hisp.dhis.caseentry.action.reminder.RemoveSmsAction">
 			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
 			</result>
-			<param name="requiredAuthorities">F_PATIENT_COMMENT_DELETE</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_COMMENT_DELETE</param>
 		</action>
 
 		<!-- Activity plan -->
@@ -941,13 +941,13 @@
 		<action name="accessAttributes" class="org.hisp.dhis.caseentry.action.NoAction">
 			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
 			</result>
-			<param name="requiredAuthorities">F_ACCESS_PATIENT_ATTRIBUTES</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_VIEW</param>
 		</action>
 
 		<action name="allowEditAttributes" class="org.hisp.dhis.caseentry.action.NoAction">
 			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
 			</result>
-			<param name="requiredAuthorities">F_ALLOW_EDIT_PATIENT_ATTRIBUTES</param>
+			<param name="requiredAuthorities">F_TRACKED_ENTITY_ATTRIBUTE_EDIT</param>
 		</action>
 
 		<!-- Program-stage-completeness -->

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2014-04-06 21:15:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2014-04-08 11:37:59 +0000
@@ -150,8 +150,6 @@
 F_TRACKED_ENTITY_ATTRIBUTEVALUE_ADD=Add Tracked Entity Attribute Value
 F_ADD_PROGRAM_INDICATOR = Add/Update Program Indicator
 F_TRACKED_ENTITY_CHANGE_LOCATION = Change Tracked Entity Instance Location
-F_SEARCH_TRACKED_ENTITY_IN_ALL_FACILITIES = Search Tracked Entity Instance In All Orgunits
-F_SEARCH_TRACKED_ENTITY_IN_OTHER_ORGUNITS = Search Tracked Entity Instance In Other Orgunits
 F_ADD_TRACKED_ENTITY_FORM=Add Tracked Entity Form
 F_PROGRAM_INSTANCE_MANAGEMENT = Program Event Management
 F_PROGRAM_INSTANCE_DELETE = Delete Program Enrollment
@@ -167,20 +165,19 @@
 F_PROGRAMSTAGE_SECTION_DELETE=Delete Program Stage Section
 F_PROGRAM_ATTRIBUTE_ADD=Add/Update Program Attribute
 F_PROGRAM_ATTRIBUTE_DELETE=Delete Program Attribute
+F_TRACKED_ENTITY_ATTRIBUTE_EDIT = Update Tracked Entity Attribute
+F_TRACKED_ENTITY_ATTRIBUTE_VIEW = View Tracked Entity Attribute
 F_TRACKED_ENTITY_DATAVALUE_ADD = Add/Update Tracked Entity Data Value
 F_TRACKED_ENTITY_DATAVALUE_DELETE = Delete Tracked Entity Data Value
 F_TRACKED_ENTITY_INSTANCE_ADD=Add/Update Tracked Entity Instance
 F_TRACKED_ENTITY_INSTANCE_DELETE=Delete Tracked Entity Instance
 F_TRACKED_ENTITY_INSTANCE_SEARCH = Search Tracked Entity Instance
+F_TRACKED_ENTITY_INSTANCE_SEARCH_IN_ALL_ORGUNITS = Search Tracked Entity Instance in All Org Units
 F_TRACKED_ENTITY_INSTANCE_LIST = List Tracked Entity Instance
 F_TRACKED_ENTITY_INSTANCE_HISTORY = Load Tracked Entity Instance History
 F_TRACKED_ENTITY_INSTANCE_DASHBOARD = Tracked Entity Instance Dashboard
 F_TRACKED_ENTITY_COMMENT_ADD = Add Tracked Entity Instance Comment
 F_TRACKED_ENTITY_COMMENT_DELETE = Delete Tracked Entity Instance Comment
-F_TRACKED_ENTITY_AGGREGATE_REPORT_PUBLIC_ADD = Add Public Tracked Entity Aggregate Report
-F_TRACKED_ENTITY_AGGREGATE_REPORT_PRIVATE_ADD = Add Private Tracked Entity Aggregate Report
-F_TRACKED_ENTITY_TABULAR_REPORT_PUBLIC_ADD = Add Public Cased based Report
-F_TRACKED_ENTITY_TABULAR_REPORT_PRIVATE_ADD = Add Private Tracked Entity Aggregate Report
 F_PROGRAM_INDICATOR_MANAGEMENT=Manage Program Indicators
 F_PROGRAM_STAGE_COMPLETENESS=View Program Stage Completeness Report
 F_SCHEDULING_SEND_MESSAGE = Scheduling send messages