Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java
===================================================================
diff -u -r784eb14f408a02e96c9efba04beb2e8ec05c03b8 -rd8ed9240ef56c2247f10e5581bf5d4bab8423a72
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java	(.../Group.java)	(revision 784eb14f408a02e96c9efba04beb2e8ec05c03b8)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java	(.../Group.java)	(revision d8ed9240ef56c2247f10e5581bf5d4bab8423a72)
@@ -94,6 +94,7 @@
      * The order is generated using synchornize method on grouping.
      * 
      * @param grouping the grouping this group belongs to.
+     * @param name of this group
      * @param users the users in this group.
      * @param toolSessions all tool sessions included in this group
      * @return the new learner group
@@ -107,12 +108,14 @@
      * Creation constructor for initializing staff group. The order is created
      * using default constant.
      * @param grouping the grouping this group belongs to.
+     * @param name of this group
      * @param staffs the users in this group.
+     * 
      * @return the new staff group. 
      */
-    public static Group createStaffGroup(Grouping grouping,  Set staffs)
+    public static Group createStaffGroup(Grouping grouping,  String groupName, Set staffs)
     {
-        return new Group(null,NAME_OF_STAFF_GROUP,STAFF_GROUP_ORDER_ID,grouping,staffs,new HashSet());
+        return new Group(null,groupName, STAFF_GROUP_ORDER_ID,grouping,staffs,new HashSet());
     }
     
     /** default constructor */
Index: lams_common/src/java/org/lamsfoundation/lams/tool/GroupedToolSession.java
===================================================================
diff -u -raa06aeaad8ea943460f0f92e661078d51a957bd3 -rd8ed9240ef56c2247f10e5581bf5d4bab8423a72
--- lams_common/src/java/org/lamsfoundation/lams/tool/GroupedToolSession.java	(.../GroupedToolSession.java)	(revision aa06aeaad8ea943460f0f92e661078d51a957bd3)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/GroupedToolSession.java	(.../GroupedToolSession.java)	(revision d8ed9240ef56c2247f10e5581bf5d4bab8423a72)
@@ -43,6 +43,8 @@
         				   +"_"
                            +sessionGroup.getGroupId().toString());
         this.sessionGroup=sessionGroup;
+        //set toolSession name as same as name of relatived group.
+        this.setToolSessionName(sessionGroup.getGroupName());
     }
     
 	public Group getSessionGroup() {
Index: lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java
===================================================================
diff -u -r49ce087cd59d685761cbb7f9e4534b562a4f1e0b -rd8ed9240ef56c2247f10e5581bf5d4bab8423a72
--- lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java	(.../NonGroupedToolSession.java)	(revision 49ce087cd59d685761cbb7f9e4534b562a4f1e0b)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java	(.../NonGroupedToolSession.java)	(revision d8ed9240ef56c2247f10e5581bf5d4bab8423a72)
@@ -53,6 +53,9 @@
         				   +"_"
                            +user.getUserId().toString());
         this.user=user;
+        //set toolSession name as same as login name of relatived user.
+        this.setToolSessionName(user.getLogin());
+
     }
     /**default constructor*/
     public NonGroupedToolSession(){}
Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java
===================================================================
diff -u -r49ce087cd59d685761cbb7f9e4534b562a4f1e0b -rd8ed9240ef56c2247f10e5581bf5d4bab8423a72
--- lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java	(.../ToolSession.java)	(revision 49ce087cd59d685761cbb7f9e4534b562a4f1e0b)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java	(.../ToolSession.java)	(revision d8ed9240ef56c2247f10e5581bf5d4bab8423a72)
@@ -30,7 +30,10 @@
     public static final String UNIQUE_KEY_PREFIX = "uq";
     /** identifier field */
     private Long toolSessionId;
-
+    
+    /** NON-Persistent field **/
+    private String toolSessionName;
+    
     /** persistent field */
     private ToolActivity toolActivity;
 
@@ -163,4 +166,12 @@
     public void setLesson(Lesson lesson) {
         this.lesson = lesson;
     }
+
+	public String getToolSessionName() {
+		return toolSessionName;
+	}
+
+	public void setToolSessionName(String toolSessionName) {
+		this.toolSessionName = toolSessionName;
+	}
 }