Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java,v
diff -u -r1.53.2.9 -r1.53.2.10
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java	29 Feb 2016 10:16:17 -0000	1.53.2.9
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java	29 Feb 2016 15:41:51 -0000	1.53.2.10
@@ -488,7 +488,7 @@
 		    Role.LEARNER, false, true);
 	    learnerList.addAll(learnerVector);
 	    getMonitoringService().createLessonClassForLesson(lesson.getLessonId(), organisation,
-		    organisation.getName() + "Learners", learnerList, organisation.getName() + "Staff", staffList,
+		    organisation.getName() + " learners", learnerList, organisation.getName() + " staff", staffList,
 		    userID);
 
 	    getMonitoringService().startLesson(lesson.getLessonId(), userID);
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java,v
diff -u -r1.12.2.1 -r1.12.2.2
--- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java	24 Feb 2016 12:35:44 -0000	1.12.2.1
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java	29 Feb 2016 15:41:51 -0000	1.12.2.2
@@ -301,8 +301,8 @@
 	    enableNotifications = false;
 	    learnerRestart = false;
 	    ownerUserId = ld.getUser().getUserId();
-	    learnerGroupName = org.getName() + " Learners";
-	    staffGroupName = org.getName() + " Staff";
+	    learnerGroupName = org.getName() + " learners";
+	    staffGroupName = org.getName() + " staff";
 	    Vector userDTOs = LessonJoinServlet.userService.getUsersFromOrganisationByRole(orgId, Role.MONITOR, false,
 		    false);
 	    staffList = getUsersFromDTOs(userDTOs);
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java,v
diff -u -r1.48.2.10 -r1.48.2.11
--- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java	24 Feb 2016 12:35:44 -0000	1.48.2.10
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java	29 Feb 2016 15:41:51 -0000	1.48.2.11
@@ -604,7 +604,7 @@
 		.getUsersFromOrganisationByRole(organisation.getOrganisationId(), Role.LEARNER, false, true);
 	learnerList.addAll(learnerVector);
 	LessonManagerServlet.monitoringService.createLessonClassForLesson(lesson.getLessonId(), organisation,
-		organisation.getName() + "Learners", learnerList, organisation.getName() + "Staff", staffList,
+		organisation.getName() + " learners", learnerList, organisation.getName() + " staff", staffList,
 		creator.getUserId());
 
     }
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v
diff -u -r1.195.2.22 -r1.195.2.23
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	24 Feb 2016 12:35:15 -0000	1.195.2.22
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	29 Feb 2016 15:41:53 -0000	1.195.2.23
@@ -2449,12 +2449,12 @@
 		    if (userDto != null) {
 			if ((!addAllStaff && (staffIds.length > 0)) || addAllStaff) {
 			    // create staff LessonClass
-			    String staffGroupName = group.getName() + " Staff";
+			    String staffGroupName = group.getName() + " staff";
 			    List<User> staffUsers = createStaffGroup(group.getOrganisationId(), addAllStaff, staffIds);
 
 			    if ((!addAllLearners && (learnerIds.length > 0)) || addAllLearners) {
 				// create learner LessonClass for lesson
-				String learnerGroupName = group.getName() + " Learners";
+				String learnerGroupName = group.getName() + " learners";
 				List<User> learnerUsers = createLearnerGroup(group.getOrganisationId(), addAllLearners,
 					learnerIds);