Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
diff -u -rc6b6b6b37a75598d144929e5757c4270d704141f -rc97960ddf053d2035d4285dc77dde54ffc2df31d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision c6b6b6b37a75598d144929e5757c4270d704141f)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision c97960ddf053d2035d4285dc77dde54ffc2df31d)
@@ -44,6 +44,7 @@
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
 import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
  * @author Manpreet Minhas
@@ -178,7 +179,7 @@
 	protected ActionForward unspecified(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
 
-		Long contentID = new Long(WebUtil.readLongParam(request,SbmtConstants.TOOL_CONTENT_ID));
+		Long contentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
 		
 		//get back the upload file list and display them on page
 		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this
@@ -199,7 +200,7 @@
 		
 		//set back STRUTS component value
 		DynaActionForm authForm = (DynaActionForm) form;
-		authForm.set(SbmtConstants.TOOL_CONTENT_ID,contentID);
+		authForm.set(AttributeNames.PARAM_TOOL_CONTENT_ID,contentID);
 		authForm.set("title",persistContent.getTitle());
 		authForm.set("lockOnFinished",persistContent.isLockOnFinished()?"1":null);
 		return mapping.getInputForward();
@@ -224,7 +225,7 @@
 	 */
 	private SubmitFilesContent getContent(ActionForm form) {
 		DynaActionForm authForm = (DynaActionForm) form;
-		Long contentID = (Long) authForm.get(SbmtConstants.TOOL_CONTENT_ID);
+		Long contentID = (Long) authForm.get(AttributeNames.PARAM_TOOL_CONTENT_ID);
 		String title = (String) authForm.get("title");
 		String instructions = (String) authForm.get("instructions");
 		String online_instruction = (String) authForm.get("onlineInstruction");
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/DeleteFileAction.java
===================================================================
diff -u -rc5fbded3f66fb2f840cbe3702fe3b70a9c3d21f6 -rc97960ddf053d2035d4285dc77dde54ffc2df31d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/DeleteFileAction.java	(.../DeleteFileAction.java)	(revision c5fbded3f66fb2f840cbe3702fe3b70a9c3d21f6)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/DeleteFileAction.java	(.../DeleteFileAction.java)	(revision c97960ddf053d2035d4285dc77dde54ffc2df31d)
@@ -42,6 +42,7 @@
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
 import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 /**
  * 
  * @author Steve.Ni
@@ -72,7 +73,7 @@
 	 * @return
 	 */
 	private ActionForward deleteFile(HttpServletRequest request, HttpServletResponse response, String type) {
-		Long contentID = new Long(WebUtil.readLongParam(request,SbmtConstants.TOOL_CONTENT_ID));
+		Long contentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
 		Long versionID = new Long(WebUtil.readLongParam(request,"versionID"));
 		Long uuID = new Long(WebUtil.readLongParam(request,"uuID"));
 		
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -raf1117db54726b89be6df9476ebda967aa9f37c4 -rc97960ddf053d2035d4285dc77dde54ffc2df31d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision af1117db54726b89be6df9476ebda967aa9f37c4)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision c97960ddf053d2035d4285dc77dde54ffc2df31d)
@@ -97,7 +97,7 @@
 									HttpServletResponse response){
 		
 		DynaActionForm authForm= (DynaActionForm)form;
-		Long sessionID =(Long) authForm.get(SbmtConstants.TOOL_SESSION_ID);
+		Long sessionID =(Long) authForm.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 		//get session from shared session.
 		HttpSession ss = SessionManager.getSession();
 		//get back login user DTO
@@ -136,7 +136,7 @@
 		
 		DynaActionForm authForm= (DynaActionForm)form;
 		if(!isTokenValid(request,true)){
-			Long sessionID =(Long) authForm.get(SbmtConstants.TOOL_SESSION_ID);
+			Long sessionID =(Long) authForm.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 			//get session from shared session.
 			HttpSession ss = SessionManager.getSession();
 			//get back login user DTO
@@ -154,7 +154,7 @@
 			return returnErrors(mapping,request,"submit.upload.twice","upload");
 		}
 		
-		Long sessionID =(Long) authForm.get(SbmtConstants.TOOL_SESSION_ID);
+		Long sessionID =(Long) authForm.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 		//get session from shared session.
 		HttpSession ss = SessionManager.getSession();
 		//get back login user DTO
@@ -195,7 +195,7 @@
 			HttpServletRequest request,
 			HttpServletResponse response){
 		DynaActionForm authForm= (DynaActionForm)form;
-		Long sessionID =(Long) authForm.get(SbmtConstants.TOOL_SESSION_ID);
+		Long sessionID =(Long) authForm.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 		Long userID = (Long)authForm.get(SbmtConstants.USER_ID);
 		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
 		submitFilesService.finishSubmission(sessionID,userID);