Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r3bc65f0652b50074ff432112d8e47a6df3728810 -r194da62c33b3687379f2d5810af8ddb0ce6e7971
--- lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 3bc65f0652b50074ff432112d8e47a6df3728810)
+++ lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 194da62c33b3687379f2d5810af8ddb0ce6e7971)
@@ -11,6 +11,8 @@
 	<form-property name="courseAdminCanAddNewUsers" type="java.lang.Boolean" initial="false"/>
 	<form-property name="courseAdminCanBrowseAllUsers" type="java.lang.Boolean" initial="false"/>
 	<form-property name="courseAdminCanChangeStatusOfCourse" type="java.lang.Boolean" initial="false"/>
+	<form-property name="enableGradebookForLearners" type="java.lang.Boolean" initial="false"/>
+	<form-property name="enableGradebookForMonitors" type="java.lang.Boolean" initial="false"/>
 </form-bean>
 
 <form-bean name="UserRolesForm" type="org.apache.struts.action.DynaActionForm">
Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r85d81241e2ed717af5d7a966970e010667a07d37 -r194da62c33b3687379f2d5810af8ddb0ce6e7971
--- lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 85d81241e2ed717af5d7a966970e010667a07d37)
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 194da62c33b3687379f2d5810af8ddb0ce6e7971)
@@ -55,8 +55,8 @@
 	<form-property name="courseAdminCanAddNewUsers" type="java.lang.Boolean" initial="false"/>
 	<form-property name="courseAdminCanBrowseAllUsers" type="java.lang.Boolean" initial="false"/>
 	<form-property name="courseAdminCanChangeStatusOfCourse" type="java.lang.Boolean" initial="false"/>
-	<form-property name="enableGradeBookForLearners" type="java.lang.Boolean" initial="false"/>
-	<form-property name="enableGradeBookForMonitors" type="java.lang.Boolean" initial="false"/>
+	<form-property name="enableGradebookForLearners" type="java.lang.Boolean" initial="false"/>
+	<form-property name="enableGradebookForMonitors" type="java.lang.Boolean" initial="false"/>
 </form-bean>
 
 <form-bean name="UserRolesForm" type="org.apache.struts.action.DynaActionForm">
Index: lams_admin/web/organisation/createOrEdit.jsp
===================================================================
diff -u -r85d81241e2ed717af5d7a966970e010667a07d37 -r194da62c33b3687379f2d5810af8ddb0ce6e7971
--- lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision 85d81241e2ed717af5d7a966970e010667a07d37)
+++ lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision 194da62c33b3687379f2d5810af8ddb0ce6e7971)
@@ -2,12 +2,12 @@
 
 <script type="text/javascript">
 	function selectMonitorGradebook() {
-		document.getElementById("enableGradeBookForMonitors").checked = true;
+		document.getElementById("enableGradebookForMonitors").checked = true;
 	}
 	
 	function unSelectLearnerGradebook() {
-		var mon = document.getElementById("enableGradeBookForMonitors");
-		var lrn = document.getElementById("enableGradeBookForLearners");
+		var mon = document.getElementById("enableGradebookForMonitors");
+		var lrn = document.getElementById("enableGradebookForLearners");
 		
 		if (lrn.checked) {
 			lrn.checked = mon.checked;
@@ -103,13 +103,13 @@
 	</tr>
 	<tr>
 		<td colspan=2>
-			<html-el:checkbox onclick="unSelectLearnerGradebook();" styleId="enableGradeBookForMonitors" property="enableGradeBookForMonitors" />
+			<html-el:checkbox onclick="unSelectLearnerGradebook();" styleId="enableGradebookForMonitors" property="enableGradebookForMonitors" />
 			<fmt:message key="admin.gradebook.monitor.enable"/>
 		</td>
 	</tr>
 	<tr>
 		<td colspan=2>
-			<html-el:checkbox onclick="selectMonitorGradebook();" styleId="enableGradeBookForLearners" property="enableGradeBookForLearners" />
+			<html-el:checkbox onclick="selectMonitorGradebook();" styleId="enableGradebookForLearners" property="enableGradebookForLearners" />
 			<fmt:message key="admin.gradebook.learner.enable"/>
 		</td>
 	</tr>
Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
===================================================================
diff -u -rcf80644c2689292645517b3f367d58b9efb5a231 -r194da62c33b3687379f2d5810af8ddb0ce6e7971
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision cf80644c2689292645517b3f367d58b9efb5a231)
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision 194da62c33b3687379f2d5810af8ddb0ce6e7971)
@@ -140,9 +140,9 @@
 	    }
 	}
 
-	if (org.getEnableGradeBookForLearners() && contains(roles, Role.ROLE_LEARNER)) {
+	if (org.getEnableGradebookForLearners() && contains(roles, Role.ROLE_LEARNER)) {
 
-	    String link = "javascript:openGradeBookLearnerPopup(" + "'" + org.getName() + "','"
+	    String link = "javascript:openGradebookLearnerPopup(" + "'" + org.getName() + "','"
 		    + Configuration.get(ConfigurationKeys.SERVER_URL)
 		    + "/gradebook/gradebookLearning.do?dispatch=courseLearner&organisationID="
 		    + org.getOrganisationId() + "'," + "750,400,0,0);";
@@ -170,8 +170,8 @@
 			+ org.getOrganisationId(), "index.searchlesson.tooltip"));
 
 		// Adding gradebook course monitor links if enabled
-		if (org.getEnableGradeBookForMonitors() && contains(roles, Role.ROLE_GROUP_MANAGER)) {
-		    String link = "javascript:openGradeBookCourseMonitorPopup(" + "'" + org.getName() + "','"
+		if (org.getEnableGradebookForMonitors() && contains(roles, Role.ROLE_GROUP_MANAGER)) {
+		    String link = "javascript:openGradebookCourseMonitorPopup(" + "'" + org.getName() + "','"
 			    + Configuration.get(ConfigurationKeys.SERVER_URL)
 			    + "/gradebook/gradebookMonitoring.do?dispatch=courseMonitor&organisationID="
 			    + org.getOrganisationId() + "'," + "850,400,0,0);";
@@ -314,9 +314,9 @@
 
 	    // Adding gradebook course monitor links if enabled
 	    if ((contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles, Role.ROLE_MONITOR))
-		    && org.getEnableGradeBookForMonitors()
-		    || (parent != null && parent.getEnableGradeBookForMonitors())) {
-		String link = "javascript:openGradeBookLessonMonitorPopup(" + "'" + org.getName() + "','"
+		    && org.getEnableGradebookForMonitors()
+		    || (parent != null && parent.getEnableGradebookForMonitors())) {
+		String link = "javascript:openGradebookLessonMonitorPopup(" + "'" + org.getName() + "','"
 			+ Configuration.get(ConfigurationKeys.SERVER_URL)
 			+ "/gradebook/gradebookMonitoring.do?lessonID=" + bean.getId() + "'," + "850,700,0,0);";
 
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
===================================================================
diff -u -r85d81241e2ed717af5d7a966970e010667a07d37 -r194da62c33b3687379f2d5810af8ddb0ce6e7971
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision 85d81241e2ed717af5d7a966970e010667a07d37)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision 194da62c33b3687379f2d5810af8ddb0ce6e7971)
@@ -96,7 +96,7 @@
 			</meta>
 		</property>
 		
-		<property name="enableGradeBookForMonitors"
+		<property name="enableGradebookForMonitors"
 			type="java.lang.Boolean" column="enable_monitor_gradebook"
 			not-null="false" length="1">
 			<meta attribute="field-description">
@@ -105,7 +105,7 @@
 			</meta>
 		</property>
 		
-		<property name="enableGradeBookForLearners"
+		<property name="enableGradebookForLearners"
 			type="java.lang.Boolean" column="enable_learner_gradebook"
 			not-null="false" length="1">
 			<meta attribute="field-description">
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
===================================================================
diff -u -r85d81241e2ed717af5d7a966970e010667a07d37 -r194da62c33b3687379f2d5810af8ddb0ce6e7971
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	(.../Organisation.java)	(revision 85d81241e2ed717af5d7a966970e010667a07d37)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	(.../Organisation.java)	(revision 194da62c33b3687379f2d5810af8ddb0ce6e7971)
@@ -94,10 +94,10 @@
     private Boolean courseAdminCanCreateGuestAccounts;
     
     /** persistent field */
-    private Boolean enableGradeBookForMonitors;
+    private Boolean enableGradebookForMonitors;
     
     /** persistent field */
-    private Boolean enableGradeBookForLearners;
+    private Boolean enableGradebookForLearners;
     
     /** persistent field */
     private Date archivedDate;
@@ -109,7 +109,7 @@
     			Date createDate, User createdBy, Workspace workspace, 
     			OrganisationType organisationType, Set userOrganisations, Set childOrganisations, Set lessons,
     			Boolean courseAdminCanAddNewUsers, Boolean courseAdminCanBrowseAllUsers, Boolean courseAdminCanChangeStatusOfCourse, 
-    			Boolean courseAdminCanCreateGuestAccounts, String orderedLessonIds, Boolean enableGradeBookForLearners, Boolean enableGradeBookForMonitors) {
+    			Boolean courseAdminCanCreateGuestAccounts, String orderedLessonIds, Boolean enableGradebookForLearners, Boolean enableGradebookForMonitors) {
         this.name = name;
         this.description = description;
         this.parentOrganisation = parentOrganisation;
@@ -125,8 +125,8 @@
         this.courseAdminCanChangeStatusOfCourse = courseAdminCanChangeStatusOfCourse;
         this.courseAdminCanCreateGuestAccounts = courseAdminCanCreateGuestAccounts;
         this.orderedLessonIds = orderedLessonIds;
-        this.enableGradeBookForLearners = enableGradeBookForLearners;
-        this.enableGradeBookForMonitors = enableGradeBookForMonitors;
+        this.enableGradebookForLearners = enableGradebookForLearners;
+        this.enableGradebookForMonitors = enableGradebookForMonitors;
     }
 
     /** default constructor */
@@ -135,8 +135,8 @@
         this.courseAdminCanBrowseAllUsers = Boolean.FALSE;
         this.courseAdminCanChangeStatusOfCourse = Boolean.FALSE;
         this.courseAdminCanCreateGuestAccounts = Boolean.FALSE;
-        this.enableGradeBookForLearners = Boolean.FALSE;
-        this.enableGradeBookForMonitors = Boolean.FALSE;
+        this.enableGradebookForLearners = Boolean.FALSE;
+        this.enableGradebookForMonitors = Boolean.FALSE;
 
     }
 
@@ -154,8 +154,8 @@
         this.courseAdminCanBrowseAllUsers = Boolean.FALSE;
         this.courseAdminCanChangeStatusOfCourse = Boolean.FALSE;
         this.courseAdminCanCreateGuestAccounts = Boolean.FALSE;
-        this.enableGradeBookForLearners = Boolean.FALSE;
-        this.enableGradeBookForMonitors = Boolean.FALSE;
+        this.enableGradebookForLearners = Boolean.FALSE;
+        this.enableGradebookForMonitors = Boolean.FALSE;
     }
     public Organisation(String name, 
     					String description,						
@@ -506,12 +506,12 @@
      *              not-null="true"
      *         
      */
-    public Boolean getEnableGradeBookForMonitors() {
-        return enableGradeBookForMonitors;
+    public Boolean getEnableGradebookForMonitors() {
+        return enableGradebookForMonitors;
     }
 
-    public void setEnableGradeBookForMonitors(Boolean enableGradeBookForMonitors) {
-        this.enableGradeBookForMonitors = enableGradeBookForMonitors;
+    public void setEnableGradebookForMonitors(Boolean enableGradebookForMonitors) {
+        this.enableGradebookForMonitors = enableGradebookForMonitors;
     }
 
     /** 
@@ -521,12 +521,12 @@
      *              not-null="true"
      *         
      */
-    public Boolean getEnableGradeBookForLearners() {
-        return enableGradeBookForLearners;
+    public Boolean getEnableGradebookForLearners() {
+        return enableGradebookForLearners;
     }
 
-    public void setEnableGradeBookForLearners(Boolean enableGradeBookForLearners) {
-        this.enableGradeBookForLearners = enableGradeBookForLearners;
+    public void setEnableGradebookForLearners(Boolean enableGradebookForLearners) {
+        this.enableGradebookForLearners = enableGradebookForLearners;
     }
 
 }