=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicator.java	2015-08-07 15:04:21 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicator.java	2015-08-07 15:23:36 +0000
@@ -93,7 +93,7 @@
      */
     private Integer decimals;
 
-    private Boolean displayInForms;
+    private Boolean displayInForm;
     
     private String rootDate;
 
@@ -193,14 +193,14 @@
     @JsonProperty
     @JsonView( { DetailedView.class, ExportView.class } )
     @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
-    public Boolean getDisplayInForms()
+    public Boolean getDisplayInForm()
     {
-        return displayInForms;
+        return displayInForm;
     }
 
-    public void setDisplayInForms( Boolean displayInForms )
+    public void setDisplayInForm( Boolean displayInForm )
     {
-        this.displayInForms = displayInForms;
+        this.displayInForm = displayInForm;
     }
 
     @JsonProperty
@@ -231,7 +231,7 @@
                 valueType = programIndicator.getValueType();
                 expression = programIndicator.getExpression();
                 decimals = programIndicator.getDecimals();
-                displayInForms = programIndicator.getDisplayInForms();
+                displayInForm = programIndicator.getDisplayInForm();
                 rootDate = programIndicator.getRootDate();
             }
             else if ( strategy.isMerge() )
@@ -240,7 +240,7 @@
                 valueType = programIndicator.getValueType() == null ? valueType : programIndicator.getValueType();
                 expression = programIndicator.getExpression() == null ? expression : programIndicator.getExpression();
                 decimals = programIndicator.getDecimals() == null ? decimals : programIndicator.getDecimals();
-                displayInForms = programIndicator.getDisplayInForms() == null ? displayInForms : programIndicator.getDisplayInForms();
+                displayInForm = programIndicator.getDisplayInForm() == null ? displayInForm : programIndicator.getDisplayInForm();
                 rootDate = programIndicator.getRootDate() == null ? rootDate : programIndicator.getRootDate();
             }
         }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java	2015-08-07 15:04:21 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java	2015-08-07 15:23:36 +0000
@@ -308,7 +308,7 @@
         executeSql( "ALTER TABLE programindicator ALTER expression TYPE text" );
         executeSql( "ALTER TABLE programstage ALTER description TYPE text" );
         
-        executeSql( "update programindicator set displayinforms = false where displayinforms is null" );
+        executeSql( "update programindicator set displayinform = false where displayinform is null" );
         
         executeSql( "drop index index_patientdatavalue" );
         

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramIndicator.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramIndicator.hbm.xml	2015-08-07 15:04:21 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramIndicator.hbm.xml	2015-08-07 15:23:36 +0000
@@ -30,7 +30,7 @@
 
     <property name="decimals" />
 
-    <property name="displayInForms" />
+    <property name="displayInForm" />
     
     <property name="rootDate" />
     

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/AddProgramIndicatorAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/AddProgramIndicatorAction.java	2015-08-07 15:04:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/AddProgramIndicatorAction.java	2015-08-07 15:23:36 +0000
@@ -136,11 +136,11 @@
         this.decimals = decimals;
     }
     
-    private Boolean displayInForms;
+    private Boolean displayInForm;
 
-    public void setDisplayInForms( Boolean displayInForms )
+    public void setDisplayInForm( Boolean displayInForm )
     {
-        this.displayInForms = displayInForms;
+        this.displayInForm = displayInForm;
     }
 
     private String rootDate;
@@ -184,7 +184,7 @@
         indicator.setExpression( StringUtils.trimToNull( expression ) );
         indicator.setFilter( StringUtils.trimToNull( filter ) );
         indicator.setDecimals( decimals );
-        indicator.setDisplayInForms( displayInForms );
+        indicator.setDisplayInForm( displayInForm );
         indicator.setRootDate( StringUtils.trimToNull( rootDate ) );
 
         programIndicatorService.addProgramIndicator( indicator );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/UpdateProgramIndicatorAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/UpdateProgramIndicatorAction.java	2015-08-07 15:04:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/UpdateProgramIndicatorAction.java	2015-08-07 15:23:36 +0000
@@ -122,11 +122,11 @@
         this.decimals = decimals;
     }
 
-    private Boolean displayInForms;
+    private Boolean displayInForm;
 
-    public void setDisplayInForms( Boolean displayInForms )
+    public void setDisplayInForm( Boolean displayInForm )
     {
-        this.displayInForms = displayInForms;
+        this.displayInForm = displayInForm;
     }
 
     private String rootDate;
@@ -175,7 +175,7 @@
         indicator.setExpression( StringUtils.trimToNull( expression ) );
         indicator.setFilter( StringUtils.trimToNull( filter ) );
         indicator.setDecimals( decimals );
-        indicator.setDisplayInForms( displayInForms );
+        indicator.setDisplayInForm( displayInForm );
         indicator.setRootDate( StringUtils.trimToNull( rootDate ) );
 
         programIndicatorService.updateProgramIndicator( indicator );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties	2015-08-07 15:04:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties	2015-08-07 15:23:36 +0000
@@ -552,4 +552,4 @@
 design_custom_registration_form=Design custom registration form
 program_registration_form=Program registration form
 aggregation_type=Aggregation type
-display_in_forms=Display in forms
\ No newline at end of file
+display_in_form=Display in form
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm	2015-08-07 15:04:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm	2015-08-07 15:23:36 +0000
@@ -78,8 +78,8 @@
 			<td></td>
 		</tr>
 		<tr>
-			<td><label for="displayInForms">$i18n.getString( "display_in_forms" )</label></td>
-			<td><input type="checkbox" id="displayInForms" name="displayInForms" value="true"></td>
+			<td><label for="displayInForm">$i18n.getString( "display_in_form" )</label></td>
+			<td><input type="checkbox" id="displayInForm" name="displayInForm" value="true"></td>
 			<td></td>
 		</tr>
 		<tr id='rootDateTR' style='display:none'>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm	2015-08-07 15:04:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm	2015-08-07 15:23:36 +0000
@@ -78,8 +78,8 @@
 		<td></td>
 	</tr>
 	<tr>
-		<td><label for="displayInForms">$i18n.getString( "display_in_forms" )</label></td>
-		<td><input type="checkbox" id="displayInForms" name="displayInForms" value="true"#if( $programIndicator.displayInForms ) checked="checked"#end></td>
+		<td><label for="displayInForm">$i18n.getString( "display_in_form" )</label></td>
+		<td><input type="checkbox" id="displayInForm" name="displayInForm" value="true"#if( $programIndicator.displayInForm ) checked="checked"#end></td>
 		<td></td>
 	</tr>
 	<tr id='rootDateTR' #if($programIndicator.valueType!='date') style='display:none' #end >