Index: lams_build/conf/j2ee/application.xml
===================================================================
diff -u -r700e36f47b0ecee682b6565d2f8116954dec464d -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d
--- lams_build/conf/j2ee/application.xml	(.../application.xml)	(revision 700e36f47b0ecee682b6565d2f8116954dec464d)
+++ lams_build/conf/j2ee/application.xml	(.../application.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
@@ -24,7 +24,7 @@
 
 	<security-role>
 		<description>Can running and monitoring a learning session</description>
-		<role-name>STAFF</role-name>
+		<role-name>MONITOR</role-name>
 	</security-role>
 
 	<security-role>
Index: lams_central/conf/xdoclet/web-security.xml
===================================================================
diff -u -re858e6202ce59bafb943ba2123243d3819d1ce9d -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d
--- lams_central/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision e858e6202ce59bafb943ba2123243d3819d1ce9d)
+++ lams_central/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
@@ -9,7 +9,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     	    <role-name>COURSE MANAGER</role-name>
     		<role-name>COURSE ADMIN</role-name>
@@ -33,7 +33,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     	</auth-constraint>
     </security-constraint>
 
@@ -45,7 +45,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     	    <role-name>COURSE MANAGER</role-name>
     		<role-name>COURSE ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -76,7 +76,7 @@
 
 	<security-role>
 		<description>Can running and monitoring a learning session</description>
-		<role-name>STAFF</role-name>
+		<role-name>MONITOR</role-name>
 	</security-role>
 
     <security-role>
Index: lams_learning/conf/xdoclet/web-security.xml
===================================================================
diff -u -r937a2bbf2f083f7f56308f58ef5a805114a3c760 -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d
--- lams_learning/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 937a2bbf2f083f7f56308f58ef5a805114a3c760)
+++ lams_learning/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
@@ -7,7 +7,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
Index: lams_learning/test/web/WEB-INF/web.xml
===================================================================
diff -u -rdff0b0618eea86d86bdf3d5d3f56d85c8569f6fe -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d
--- lams_learning/test/web/WEB-INF/web.xml	(.../web.xml)	(revision dff0b0618eea86d86bdf3d5d3f56d85c8569f6fe)
+++ lams_learning/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
@@ -221,7 +221,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
Index: lams_monitoring/conf/xdoclet/web-security.xml
===================================================================
diff -u -re68fa47bb59bec7d651852d0bc0458bd96fca379 -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d
--- lams_monitoring/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision e68fa47bb59bec7d651852d0bc0458bd96fca379)
+++ lams_monitoring/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
@@ -7,7 +7,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
Index: lams_tool_chat/conf/xdoclet/web-security.xml
===================================================================
diff -u -reb34584421f5dd5cb2a537c66826cd4da3e52cc8 -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d
--- lams_tool_chat/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision eb34584421f5dd5cb2a537c66826cd4da3e52cc8)
+++ lams_tool_chat/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
@@ -9,7 +9,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -32,7 +32,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -45,7 +45,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -80,7 +80,7 @@
 
 	<security-role>
 		<description>Can running and monitoring a learning session</description>
-		<role-name>STAFF</role-name>
+		<role-name>MONITOR</role-name>
 	</security-role>
 
 	<security-role>
Index: lams_tool_forum/conf/xdoclet/web-security.xml
===================================================================
diff -u -r5dba2691521c5588d623e6494ff5685b1e8ea41a -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d
--- lams_tool_forum/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 5dba2691521c5588d623e6494ff5685b1e8ea41a)
+++ lams_tool_forum/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
@@ -7,7 +7,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -29,7 +29,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -39,7 +39,7 @@
 		    <url-pattern>/definelater.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -70,7 +70,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -96,7 +96,7 @@
 
 	<security-role>
 		<description>Can running and monitoring a learning session</description>
-		<role-name>STAFF</role-name>
+		<role-name>MONITOR</role-name>
 	</security-role>
 
 	<security-role>
Index: lams_tool_lamc/test/web/WEB-INF/web.xml
===================================================================
diff -u -r477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1 -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d
--- lams_tool_lamc/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1)
+++ lams_tool_lamc/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
@@ -128,7 +128,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -144,7 +144,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -170,7 +170,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>		   
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     	</auth-constraint>
     </security-constraint>
 
@@ -183,7 +183,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
Index: lams_tool_laqa/test/web/WEB-INF/web.xml
===================================================================
diff -u -r477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1 -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d
--- lams_tool_laqa/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 477b19dd83e2be0e1b3b2493fb4cdbe68a5cddc1)
+++ lams_tool_laqa/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
@@ -207,7 +207,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -233,7 +233,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>		   
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     	</auth-constraint>
     </security-constraint>
 
@@ -246,7 +246,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
Index: lams_tool_larsrc/web/WEB-INF/web.xml
===================================================================
diff -u -r574fe22e4c26a90598f39e06edbc18dc308f82a4 -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d
--- lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision 574fe22e4c26a90598f39e06edbc18dc308f82a4)
+++ lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
@@ -213,7 +213,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -235,7 +235,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -245,7 +245,7 @@
 		    <url-pattern>/definelater.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -276,7 +276,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -302,7 +302,7 @@
 
 	<security-role>
 		<description>Can running and monitoring a learning session</description>
-		<role-name>STAFF</role-name>
+		<role-name>MONITOR</role-name>
 	</security-role>
 
 	<security-role>
Index: lams_tool_nb/conf/xdoclet/web-security.xml
===================================================================
diff -u -reb34584421f5dd5cb2a537c66826cd4da3e52cc8 -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d
--- lams_tool_nb/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision eb34584421f5dd5cb2a537c66826cd4da3e52cc8)
+++ lams_tool_nb/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
@@ -7,7 +7,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -34,7 +34,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>		   
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -48,7 +48,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
Index: lams_tool_notebook/conf/xdoclet/web-security.xml
===================================================================
diff -u -r5948e17402e1ad574aeddbe55f93dca2f58bbbec -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d
--- lams_tool_notebook/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 5948e17402e1ad574aeddbe55f93dca2f58bbbec)
+++ lams_tool_notebook/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
@@ -9,7 +9,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -32,7 +32,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -45,7 +45,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -80,7 +80,7 @@
 
 	<security-role>
 		<description>Can running and monitoring a learning session</description>
-		<role-name>STAFF</role-name>
+		<role-name>MONITOR</role-name>
 	</security-role>
 
 	<security-role>
Index: lams_tool_sbmt/conf/xdoclet/web-security.xml
===================================================================
diff -u -r5dba2691521c5588d623e6494ff5685b1e8ea41a -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d
--- lams_tool_sbmt/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 5dba2691521c5588d623e6494ff5685b1e8ea41a)
+++ lams_tool_sbmt/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
@@ -7,7 +7,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -30,7 +30,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -64,7 +64,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -90,7 +90,7 @@
 
 	<security-role>
 		<description>Can running and monitoring a learning session</description>
-		<role-name>STAFF</role-name>
+		<role-name>MONITOR</role-name>
 	</security-role>
 
 	<security-role>
Index: lams_tool_vote/test/web/WEB-INF/web.xml
===================================================================
diff -u -rad683fcaeabe83c702b599c5c866bb7d30cd7191 -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d
--- lams_tool_vote/test/web/WEB-INF/web.xml	(.../web.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
+++ lams_tool_vote/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
@@ -128,7 +128,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -144,7 +144,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -170,7 +170,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>		   
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     	</auth-constraint>
     </security-constraint>
 
@@ -183,7 +183,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
Index: lams_www/web/WEB-INF/web.xml
===================================================================
diff -u -r0b9b40de7fc41eaba04755e6e10ac34d6c52b1e2 -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d
--- lams_www/web/WEB-INF/web.xml	(.../web.xml)	(revision 0b9b40de7fc41eaba04755e6e10ac34d6c52b1e2)
+++ lams_www/web/WEB-INF/web.xml	(.../web.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
@@ -109,7 +109,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     	    <role-name>COURSE MANAGER</role-name>
     		<role-name>COURSE ADMIN</role-name>
@@ -141,7 +141,7 @@
 
 	<security-role>
 		<description>Can running and monitoring a learning session</description>
-		<role-name>STAFF</role-name>
+		<role-name>MONITOR</role-name>
 	</security-role>
 
     <security-role>