Index: lams_admin/conf/xdoclet/web-security.xml
===================================================================
diff -u -rf99ff311704718aa46697fed27c8e2bd50606241 -r34d347c43480cf5158c4c5b586bcf3debc2077d5
--- lams_admin/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision f99ff311704718aa46697fed27c8e2bd50606241)
+++ lams_admin/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 34d347c43480cf5158c4c5b586bcf3debc2077d5)
@@ -6,8 +6,8 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR ADMIN</role-name>
-    	    <role-name>COURSE MANAGER</role-name>
-    		<role-name>COURSE ADMIN</role-name>
+    	    <role-name>GROUP MANAGER</role-name>
+    		<role-name>GROUP ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -27,10 +27,10 @@
 		<role-name>AUTHOR ADMIN</role-name>
 	</security-role>
     <security-role>
-		<role-name>COURSE MANAGER</role-name>
+		<role-name>GROUP MANAGER</role-name>
 	</security-role>
    	<security-role>
-		<role-name>COURSE ADMIN</role-name>
+		<role-name>GROUP ADMIN</role-name>
 	</security-role>
 	<security-role>
 		<role-name>SYSADMIN</role-name>
Index: lams_central/conf/xdoclet/web-security.xml
===================================================================
diff -u -rc8c23529590f3d5a06ac39ebb0c31808bb8eac11 -r34d347c43480cf5158c4c5b586bcf3debc2077d5
--- lams_central/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision c8c23529590f3d5a06ac39ebb0c31808bb8eac11)
+++ lams_central/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 34d347c43480cf5158c4c5b586bcf3debc2077d5)
@@ -12,8 +12,8 @@
     		<role-name>LEARNER</role-name>
     		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
-    	    <role-name>COURSE MANAGER</role-name>
-    		<role-name>COURSE ADMIN</role-name>
+    	    <role-name>GROUP MANAGER</role-name>
+    		<role-name>GROUP ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
@@ -49,8 +49,8 @@
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
     		<role-name>MONITOR</role-name>
-    	    <role-name>COURSE MANAGER</role-name>
-    		<role-name>COURSE ADMIN</role-name>
+    	    <role-name>GROUP MANAGER</role-name>
+    		<role-name>GROUP ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
@@ -84,10 +84,10 @@
 	</security-role>
 
     <security-role>
-		<role-name>COURSE MANAGER</role-name>
+		<role-name>GROUP MANAGER</role-name>
 	</security-role>
    	<security-role>
-		<role-name>COURSE ADMIN</role-name>
+		<role-name>GROUP ADMIN</role-name>
 	</security-role>
 
 	<security-role>
Index: lams_www/web/WEB-INF/web.xml
===================================================================
diff -u -rd933f0efad1cd32ea633be75601818f98156093f -r34d347c43480cf5158c4c5b586bcf3debc2077d5
--- lams_www/web/WEB-INF/web.xml	(.../web.xml)	(revision d933f0efad1cd32ea633be75601818f98156093f)
+++ lams_www/web/WEB-INF/web.xml	(.../web.xml)	(revision 34d347c43480cf5158c4c5b586bcf3debc2077d5)
@@ -127,8 +127,8 @@
     		<role-name>LEARNER</role-name>
     		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
-    	    <role-name>COURSE MANAGER</role-name>
-    		<role-name>COURSE ADMIN</role-name>
+    	    <role-name>GROUP MANAGER</role-name>
+    		<role-name>GROUP ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -161,10 +161,10 @@
 	</security-role>
 
     <security-role>
-		<role-name>COURSE MANAGER</role-name>
+		<role-name>GROUP MANAGER</role-name>
 	</security-role>
    	<security-role>
-		<role-name>COURSE ADMIN</role-name>
+		<role-name>GROUP ADMIN</role-name>
 	</security-role>
 
 	<security-role>