diff --git a/group/groupui/addgroupstogrouping-form.html b/group/groupui/addgroupstogrouping-form.html
index c199ad6f266..cc998c8bbb1 100644
--- a/group/groupui/addgroupstogrouping-form.html
+++ b/group/groupui/addgroupstogrouping-form.html
@@ -1,9 +1,9 @@
 <div id="addgroupstogroupingform" class="popup">
-    <h3><?php print_string('addgroupstogrouping', 'groups'); ?> <span id="selectedgroupingforaddinggroups"></span>
+    <h3><?php print_string('addgroupstogrouping', 'group'); ?> <span id="selectedgroupingforaddinggroups"></span>
     </h3>
     <form action="">
         <p><select id="groupsnotingrouping" size="15" multiple="multiple" class="select"></select></p>
-        <p><input type="button" id="addgroupstogrouping" value="<?php print_string('addgroupstogrouping', 'groups'); ?>" /></p>
-        <p><input type="button" id="canceladdgroupstogrouping" value="<?php print_string('cancel', 'groups'); ?>" /></p>
+        <p><input type="button" id="addgroupstogrouping" value="<?php print_string('addgroupstogrouping', 'group'); ?>" /></p>
+        <p><input type="button" id="canceladdgroupstogrouping" value="<?php print_string('cancel', 'group'); ?>" /></p>
     </form>
 </div>
diff --git a/group/groupui/addmembers-form.html b/group/groupui/addmembers-form.html
index cfa98abbba3..08a3215525d 100644
--- a/group/groupui/addmembers-form.html
+++ b/group/groupui/addmembers-form.html
@@ -1,9 +1,9 @@
 <div id="addmembersform" class="popup">
-    <h3><?php print_string('adduserstogroup', 'groups'); ?> <span id="selectedgroup"></span></h3>
+    <h3><?php print_string('adduserstogroup', 'group'); ?> <span id="selectedgroup"></span></h3>
     <form action="">
-        <p><input type="checkbox" id="showall" /><?php print_string('showusersalreadyingroup', 'groups'); ?> </p>
+        <p><input type="checkbox" id="showall" /><?php print_string('showusersalreadyingroup', 'group'); ?> </p>
         <p><select id="nonmembers" size="15" multiple="multiple" class="select"></select></p>
-		<p><input type="button" id="addmembers" value="<?php print_string('adduserstogroup', 'groups'); ?>" /></p>
-	    <p><input type="button" id="canceladdmembers" value="<?php print_string('cancel', 'groups'); ?>" /></p>
+		<p><input type="button" id="addmembers" value="<?php print_string('adduserstogroup', 'group'); ?>" /></p>
+	    <p><input type="button" id="canceladdmembers" value="<?php print_string('cancel', 'group'); ?>" /></p>
     </form>
 </div>
diff --git a/group/groupui/createautomaticgrouping-form.html b/group/groupui/createautomaticgrouping-form.html
index 001bb5d4e30..2b0d071ead1 100644
--- a/group/groupui/createautomaticgrouping-form.html
+++ b/group/groupui/createautomaticgrouping-form.html
@@ -1,33 +1,33 @@
 <div id="createautomaticgroupingform" class="popupwide">
-<h3><?php print_string('createautomaticgrouping', 'groups'); ?></h3>
+<h3><?php print_string('createautomaticgrouping', 'group'); ?></h3>
 <form name="automaticgroupingform" action="">
     
 <table cellpadding="10">
     <tr>
     	<td valign="top">
-	        <p><?php print_string('groupingname', 'groups'); ?></p>
-	        <p><input id="automaticgroupingname" type="text" size="40" value="<?php print_string('defaultgroupingname', 'groups'); ?>" /></p>
-	        <p><?php print_string('groupingdescription', 'groups'); ?></p>
+	        <p><?php print_string('groupingname', 'group'); ?></p>
+	        <p><input id="automaticgroupingname" type="text" size="40" value="<?php print_string('defaultgroupingname', 'group'); ?>" /></p>
+	        <p><?php print_string('groupingdescription', 'group'); ?></p>
 	        <p><?php print_textarea($usehtmleditor,  4, 45, 150, 400, 'automaticgroupingdescription'); ?></p>
-	        <p> <?php print_string('prefixforgroupnames', 'groups'); ?> </p>
-	        <p><input id="groupprefix" type="text" size="40 " value="<?php print_string('defaultgroupname', 'groups'); ?> " /></p>
-	        <p><?php print_string('defaultgroupdescription', 'groups'); ?></p>
+	        <p> <?php print_string('prefixforgroupnames', 'group'); ?> </p>
+	        <p><input id="groupprefix" type="text" size="40 " value="<?php print_string('defaultgroupname', 'group'); ?> " /></p>
+	        <p><?php print_string('defaultgroupdescription', 'group'); ?></p>
 	        <p><?php print_textarea($usehtmleditor,  4, 45, 150, 400, 'defaultgroupdescription'); ?></p>
 	    </td>
 		<td valign="top">
-	        <p><input type="checkbox" id="alphabetical" /> <?php print_string('distributealphabetically', 'groups'); ?></p>
+	        <p><input type="checkbox" id="alphabetical" /> <?php print_string('distributealphabetically', 'group'); ?></p>
 	        <table>
 	            <tr>
 	                <td><input type="radio" name ="generationtype" id="nostudents" value="nostudents" checked />
 	                </td>
-	                <td> <?php print_string('selectnumberineachgroup', 'groups'); ?>
+	                <td> <?php print_string('selectnumberineachgroup', 'group'); ?>
 	                </td>
 	            </tr>
 	            <tr>
 	                <td>&nbsp;</td>
 	                <td>
-	                	<p><?php print_string('numberofstudents', 'groups'); ?> </p><p><input id="noofstudents" type="text" size="5" /></p>
-	                    <p><input type="checkbox" id="distribevenly" checked /> <?php print_string('distributeevenly', 'groups'); ?></p>
+	                	<p><?php print_string('numberofstudents', 'group'); ?> </p><p><input id="noofstudents" type="text" size="5" /></p>
+	                    <p><input type="checkbox" id="distribevenly" checked /> <?php print_string('distributeevenly', 'group'); ?></p>
 	                </td>
 	            </tr>
 	        </table>
@@ -35,18 +35,18 @@
 	        <table>
 	            <tr>
 	                <td><input type="radio" name ="generationtype" id="nogroups" value="nogroups" /></td>
-	                <td><?php print_string('selectnumberofgroups', 'groups'); ?></td>
+	                <td><?php print_string('selectnumberofgroups', 'group'); ?></td>
 	            </tr>
 	            <tr>
 	                <td>&nbsp;</td>
 	                <td>
-	                	<p><?php print_string('numberofgroups', 'groups'); ?></p><p> <input id="noofgroups" type="text" size="5" /></p>
+	                	<p><?php print_string('numberofgroups', 'group'); ?></p><p> <input id="noofgroups" type="text" size="5" /></p>
 	                </td>
 	            </tr>
 	        </table>
 	        
-	        <p><input type="button" id="createautomaticgrouping" value=" <?php print_string('creategrouping', 'groups'); ?>" />&nbsp;
-	        <input type="button" id="cancelcreateautomaticgrouping" value=" <?php print_string('cancel', 'groups'); ?>" /></p>
+	        <p><input type="button" id="createautomaticgrouping" value=" <?php print_string('creategrouping', 'group'); ?>" />&nbsp;
+	        <input type="button" id="cancelcreateautomaticgrouping" value=" <?php print_string('cancel', 'group'); ?>" /></p>
 	    </td>
     </tr>
 </table>
diff --git a/group/groupui/creategroup-form.html b/group/groupui/creategroup-form.html
index a76f18584de..6df767ec7e3 100644
--- a/group/groupui/creategroup-form.html
+++ b/group/groupui/creategroup-form.html
@@ -1,8 +1,8 @@
 <div id="creategroupform" class="popup">
-    <h3><?php print_string('creategroup', 'groups'); ?> <span id="selectedgroupingforcreatinggroup"></span></h3>
+    <h3><?php print_string('creategroup', 'group'); ?> <span id="selectedgroupingforcreatinggroup"></span></h3>
     <form action="">
         <p><?php print_string('groupname', 'groups');?></p>
-        <p><input id="newgroupname" type="text" size="40" value="<?php print_string('defaultgroupname', 'groups'); ?>" />
+        <p><input id="newgroupname" type="text" size="40" value="<?php print_string('defaultgroupname', 'group'); ?>" />
         <p><?php print_string("groupingdescription", 'groups') ?><br />
                     <?php helpbutton("text", get_string("helptext")) ?></p>
         <p><?php print_textarea($usehtmleditor, 5, 45, 200, 400, "newgroupdescription");?></p>
@@ -17,14 +17,14 @@
             <p><?php print_string("newpicture", 'groups') ?></p>
             <p><?php upload_print_form_fragment(1,array('newgroupicon'),null,false,null,0,0,false);
 				     helpbutton("picture", get_string("helppicture"));
-				     print_string("maxsize", "", display_size($maxbytes), 'groups'); ?>
+				     print_string("maxsize", "", display_size($maxbytes), 'group'); ?>
                </p>
             <?php 
             	}  
             ?>
             </table>
             
-            <p><input type="button" id="creategroup" value="<?php print_string('creategroup', 'groups'); ?>" /></p>
-            <p><input type="button" id="cancelcreategroup" value="<?php print_string('cancel', 'groups'); ?>" /></p>      
+            <p><input type="button" id="creategroup" value="<?php print_string('creategroup', 'group'); ?>" /></p>
+            <p><input type="button" id="cancelcreategroup" value="<?php print_string('cancel', 'group'); ?>" /></p>      
     </form>
 </div>
diff --git a/group/groupui/creategrouping-form.html b/group/groupui/creategrouping-form.html
index 5c8b4c47bb3..0343b5a7f01 100644
--- a/group/groupui/creategrouping-form.html
+++ b/group/groupui/creategrouping-form.html
@@ -1,11 +1,11 @@
 <div id="creategroupingform" class="popup">
-<h3><?php print_string('creategrouping', 'groups'); ?></h3>
+<h3><?php print_string('creategrouping', 'group'); ?></h3>
 <form action="">
-<p><?php print_string('groupingname', 'groups'); ?></p>
-<p><input id="newgroupingname" type="text" size="40" value="<?php print_string('defaultgroupingname', 'groups'); ?>" /></p>
-<p><?php print_string('groupingdescription', 'groups'); ?></p>
+<p><?php print_string('groupingname', 'group'); ?></p>
+<p><input id="newgroupingname" type="text" size="40" value="<?php print_string('defaultgroupingname', 'group'); ?>" /></p>
+<p><?php print_string('groupingdescription', 'group'); ?></p>
 <p><?php print_textarea($usehtmleditor,5, 45, 200, 400, "newgroupingdescription");?></p>
-<p><input type="button" id="creategrouping" value="<?php print_string('creategrouping', 'groups'); ?>" /></p>
-<p><input type="button" id="cancelcreategrouping" value="<?php print_string('cancel', 'groups'); ?>" /></p>
+<p><input type="button" id="creategrouping" value="<?php print_string('creategrouping', 'group'); ?>" /></p>
+<p><input type="button" id="cancelcreategrouping" value="<?php print_string('cancel', 'group'); ?>" /></p>
 </form>
 </div>
diff --git a/group/groupui/editgroupingpermissions-form.html b/group/groupui/editgroupingpermissions-form.html
index e7764230f2e..cb5435c6205 100644
--- a/group/groupui/editgroupingpermissions-form.html
+++ b/group/groupui/editgroupingpermissions-form.html
@@ -1,13 +1,13 @@
 <div id="editgroupingpermissionsform" class="popup">
-<h3><?php print_string('editgroupingpermissions', 'groups'); ?> for <span id="editperm-groupingname"></span></h3>
+<h3><?php print_string('editgroupingpermissions', 'group'); ?> for <span id="editperm-groupingname"></span></h3>
 <form action="">
-<p><input type="checkbox" id="edit-viewowngroup" checked /><?php print_string('viewowngroup', 'groups'); ?></p>
-<p><input type="checkbox" id="edit-viewallgroupsmembers" checked /><?php print_string('viewallgroupsmembers', 'groups'); ?></p>
-<p><input type="checkbox" id="edit-viewallgroupsactivities" checked /><?php print_string('viewallgroupsactivities', 'groups'); ?></p>
-<p><input type="checkbox" id="edit-teachersgroupmark"  /><?php print_string('teachersgroupmark', 'groups'); ?></p>         
-<p><input type="checkbox" id="edit-teachersgroupview"  /><?php print_string('teachersgroupview', 'groups'); ?></p>  
-<p><input type="checkbox" id="edit-teachersoverride"  /><?php print_string('teachersoverride', 'groups'); ?></p>  
-<p><input type="button" id="editgroupingpermissions" value="<?php print_string('save', 'groups'); ?>" /></p>
-<p><input type="button" id="canceleditgroupingpermissions" value="<?php print_string('cancel', 'groups'); ?>" /></p>
+<p><input type="checkbox" id="edit-viewowngroup" checked /><?php print_string('viewowngroup', 'group'); ?></p>
+<p><input type="checkbox" id="edit-viewallgroupsmembers" checked /><?php print_string('viewallgroupsmembers', 'group'); ?></p>
+<p><input type="checkbox" id="edit-viewallgroupsactivities" checked /><?php print_string('viewallgroupsactivities', 'group'); ?></p>
+<p><input type="checkbox" id="edit-teachersgroupmark"  /><?php print_string('teachersgroupmark', 'group'); ?></p>         
+<p><input type="checkbox" id="edit-teachersgroupview"  /><?php print_string('teachersgroupview', 'group'); ?></p>  
+<p><input type="checkbox" id="edit-teachersoverride"  /><?php print_string('teachersoverride', 'group'); ?></p>  
+<p><input type="button" id="editgroupingpermissions" value="<?php print_string('save', 'group'); ?>" /></p>
+<p><input type="button" id="canceleditgroupingpermissions" value="<?php print_string('cancel', 'group'); ?>" /></p>
 </form>
 </div>
diff --git a/group/groupui/editgroupingsettings-form.html b/group/groupui/editgroupingsettings-form.html
index b4b16df04c3..3500d8ca73c 100644
--- a/group/groupui/editgroupingsettings-form.html
+++ b/group/groupui/editgroupingsettings-form.html
@@ -1,11 +1,11 @@
 <div id="editgroupingsettingsform" class="popup">
-<h3><?php print_string('editgroupingsettings', 'groups'); ?></h3>
+<h3><?php print_string('editgroupingsettings', 'group'); ?></h3>
 <form action="">
-<p><?php print_string('groupingname', 'groups'); ?></p>
+<p><?php print_string('groupingname', 'group'); ?></p>
 <p><input id="edit-groupingname" type="text" size="40" /></p>
-<p><?php print_string('groupingdescription', 'groups'); ?></p>
+<p><?php print_string('groupingdescription', 'group'); ?></p>
 <p><?php print_textarea($usehtmleditor,  5, 45, 200, 400, "edit-groupingdescription");?></p>
-<p><input type="button" id="editgroupingsettings" value="<?php print_string('save', 'groups'); ?>" /></p>
-<p><input type="button" id="canceleditgroupingsettings" value="<?php print_string('cancel', 'groups'); ?>" /></p>
+<p><input type="button" id="editgroupingsettings" value="<?php print_string('save', 'group'); ?>" /></p>
+<p><input type="button" id="canceleditgroupingsettings" value="<?php print_string('cancel', 'group'); ?>" /></p>
 </form>
 </div>
diff --git a/group/groupui/editgroupsettings-form.html b/group/groupui/editgroupsettings-form.html
index 35bbdae7b11..9b8ab26b80f 100644
--- a/group/groupui/editgroupsettings-form.html
+++ b/group/groupui/editgroupsettings-form.html
@@ -1,7 +1,7 @@
 <div id="editgroupsettingsform" class="popup">
-    <h3><?php print_string('editgroupsettings', 'groups'); ?></h3>
+    <h3><?php print_string('editgroupsettings', 'group'); ?></h3>
     <form action="">
-        <p><?php print_string('groupname', 'groups'); ?></p>
+        <p><?php print_string('groupname', 'group'); ?></p>
         <p><input id="groupname" type="text" size="40" /></p>
         <p><?php print_string("description") ?><br />
                     <?php helpbutton("text", get_string("helptext")) ?></p>
@@ -15,8 +15,8 @@
             <p><?php print_string("newpicture") ?></p>
             <p><?php upload_print_form_fragment(1,array('groupicon'),null,false,null,0,0,false);
 				     helpbutton("picture", get_string("helppicture"));
-				     print_string("maxsize", "", display_size($maxbytes), 'groups'); ?></p>
+				     print_string("maxsize", "", display_size($maxbytes), 'group'); ?></p>
             <?php } ?>
-            <p><input type="button" id="editgroupsettings" value="<?php print_string('save', 'groups'); ?>" />&nbsp;<input type="button" id="canceleditgroupsettings" value="<?php print_string('cancel', 'groups'); ?>" /></p>
+            <p><input type="button" id="editgroupsettings" value="<?php print_string('save', 'group'); ?>" />&nbsp;<input type="button" id="canceleditgroupsettings" value="<?php print_string('cancel', 'group'); ?>" /></p>
     </form>
 </div>
diff --git a/group/groupui/main-form.html b/group/groupui/main-form.html
index af48f448a4d..32a32da534b 100644
--- a/group/groupui/main-form.html
+++ b/group/groupui/main-form.html
@@ -1,9 +1,9 @@
 <form name="groupeditform" id="groupeditform" action="">
     <table cellpadding="10" class="generaltable generalbox groupmanagementtable">
         <tr>
-            <th class="header groupmanagementtableheader"><?php print_string('groupings', 'groups'); ?></th>
-            <th class="header groupmanagementtableheader"><?php print_string('groupsinselectedgrouping', 'groups'); ?></th>
-            <th class="header groupmanagementtableheader"><?php print_string('membersofselectedgroup', 'groups'); ?></th>
+            <th class="header groupmanagementtableheader"><?php print_string('groupings', 'group'); ?></th>
+            <th class="header groupmanagementtableheader"><?php print_string('groupsinselectedgrouping', 'group'); ?></th>
+            <th class="header groupmanagementtableheader"><?php print_string('membersofselectedgroup', 'group'); ?></th>
         </tr>
         <tr>
             <td class="generalboxcontent">
@@ -18,23 +18,23 @@
         </tr>
         <tr>
             <td>
-            	<p><input type="button" id="showeditgroupingsettingsform" value="<?php print_string('editgroupingsettings', 'groups'); ?>" /></p>
-                <p><input type="button" id="showeditgroupingpermissionsform" value="<?php print_string('editgroupingpermissions', 'groups'); ?>" /></p>
-                <p><input type="button" id="deletegrouping" value="<?php print_string('deletegrouping', 'groups'); ?>" /></p>
-                <p><input type="button" id="showcreategroupingform" value="<?php print_string('creategrouping', 'groups'); ?>" /></p>
-                <p><input type="button" id="showcreateautomaticgroupingform" value="<?php print_string('createautomaticgrouping', 'groups'); ?>" /></p>
-                <p><input type="button" id="printerfriendly" value="<?php print_string('printerfriendly', 'groups'); ?>" /></p>
+            	<p><input type="button" id="showeditgroupingsettingsform" value="<?php print_string('editgroupingsettings', 'group'); ?>" /></p>
+                <p><input type="button" id="showeditgroupingpermissionsform" value="<?php print_string('editgroupingpermissions', 'group'); ?>" /></p>
+                <p><input type="button" id="deletegrouping" value="<?php print_string('deletegrouping', 'group'); ?>" /></p>
+                <p><input type="button" id="showcreategroupingform" value="<?php print_string('creategrouping', 'group'); ?>" /></p>
+                <p><input type="button" id="showcreateautomaticgroupingform" value="<?php print_string('createautomaticgrouping', 'group'); ?>" /></p>
+                <p><input type="button" id="printerfriendly" value="<?php print_string('printerfriendly', 'group'); ?>" /></p>
             </td>
             <td>
-            	<p><input type="button" id="showeditgroupsettingsform" value="<?php print_string('editgroupsettings', 'groups'); ?>" /></p>
-                <p><input type="button" id="deletegroup" value="<?php print_string('deleteselectedgroup', 'groups'); ?>" /></p>
-                <p><input type="button" id="removegroup" value="<?php print_string('removegroupfromselectedgrouping', 'groups'); ?>" /></p>
-                <p><input type="button" id="showcreategroupform" value="<?php print_string('creategroupinselectedgrouping', 'groups'); ?>" /></p>
-                <p><input type="button" id="showaddgroupstogroupingform" value="<?php print_string('addexistinggroupstogrouping', 'groups'); ?>" /></p>
+            	<p><input type="button" id="showeditgroupsettingsform" value="<?php print_string('editgroupsettings', 'group'); ?>" /></p>
+                <p><input type="button" id="deletegroup" value="<?php print_string('deleteselectedgroup', 'group'); ?>" /></p>
+                <p><input type="button" id="removegroup" value="<?php print_string('removegroupfromselectedgrouping', 'group'); ?>" /></p>
+                <p><input type="button" id="showcreategroupform" value="<?php print_string('creategroupinselectedgrouping', 'group'); ?>" /></p>
+                <p><input type="button" id="showaddgroupstogroupingform" value="<?php print_string('addexistinggroupstogrouping', 'group'); ?>" /></p>
             </td>
             <td>
-            	<p><input type="button" id="removemembers" value="<?php print_string('removeselectedusers', 'groups'); ?>"/></p>
-                <p><input type="button" id="showaddmembersform" value="<?php print_string('adduserstogroup', 'groups'); ?>" /></p>
+            	<p><input type="button" id="removemembers" value="<?php print_string('removeselectedusers', 'group'); ?>"/></p>
+                <p><input type="button" id="showaddmembersform" value="<?php print_string('adduserstogroup', 'group'); ?>" /></p>
             </td>
         </tr>
     </table>