Index: lams_tool_forum/src/java/forumApplicationContext.xml
===================================================================
diff -u -r37bc758b9d7d1ba5a285a640e6d58113126f9620 -r7b1c6b460337d9cd62f8350d620d7915eae800b8
--- lams_tool_forum/src/java/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 37bc758b9d7d1ba5a285a640e6d58113126f9620)
+++ lams_tool_forum/src/java/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 7b1c6b460337d9cd62f8350d620d7915eae800b8)
@@ -56,7 +56,7 @@
     </bean>
 
     <!-- Managers -->
-	<bean id="toolContentHandler" class="org.lamsfoundation.lams.tool.forum.util.ForumToolContentHandler">
+	<bean id="forumToolContentHandler" class="org.lamsfoundation.lams.tool.forum.util.ForumToolContentHandler">
 	 		<property name="repositoryService"><ref bean="repositoryService"/></property>
 	</bean> 
 	
@@ -79,8 +79,8 @@
         <property name="forumToolSessionDao">
             <ref local="forumToolSessionDao"/>
         </property>
-        <property name="toolContentHandler">
-            <ref local="toolContentHandler"/>
+        <property name="forumToolContentHandler">
+            <ref local="forumToolContentHandler"/>
         </property>
         <property name="repositoryService">
             <ref bean="repositoryService"/>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r9310fe30da9974d1f174319efc054e3bde9eed84 -r7b1c6b460337d9cd62f8350d620d7915eae800b8
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 9310fe30da9974d1f174319efc054e3bde9eed84)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 7b1c6b460337d9cd62f8350d620d7915eae800b8)
@@ -51,6 +51,7 @@
 import org.lamsfoundation.lams.tool.forum.util.ForumToolContentHandler;
 import org.lamsfoundation.lams.tool.forum.util.TopicComparator;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
+import org.lamsfoundation.lams.usermanagement.User;
 
 
 /**
@@ -70,7 +71,7 @@
 	private ForumToolSessionDao forumToolSessionDao;
 	//system level handler and service 
 	private ILamsToolService toolService;
-	private ForumToolContentHandler toolContentHandler;
+	private ForumToolContentHandler forumToolContentHandler;
 	private IRepositoryService repositoryService;
 	
 
@@ -362,7 +363,7 @@
 	public void createToolSession(Long toolSessionId, Long toolContentId) throws ToolException {
 	}
 
-	public String leaveToolSession(Long toolSessionId, Long learnerID) throws DataMissingException, ToolException {
+	public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
 		return null;
 	}
 
@@ -412,7 +413,7 @@
         if (file!= null && !StringUtils.isEmpty(file.getFileName())) {
             String fileName = file.getFileName();
             try {
-				node = getToolContentHandler().uploadFile(file.getInputStream(), fileName, 
+				node = getForumToolContentHandler().uploadFile(file.getInputStream(), fileName, 
 				        file.getContentType(), fileType);
 			} catch (InvalidParameterException e) {
 				throw new ForumException("FileNotFoundException occured while trying to upload File" + e.getMessage());
@@ -439,11 +440,11 @@
 	 */
 	private ITicket getRepositoryLoginTicket() throws ForumException {
 		ICredentials credentials = new SimpleCredentials(
-				toolContentHandler.getRepositoryUser(),
-				toolContentHandler.getRepositoryId());
+				forumToolContentHandler.getRepositoryUser(),
+				forumToolContentHandler.getRepositoryId());
 		try {
 			ITicket ticket = repositoryService.login(credentials,
-					toolContentHandler.getRepositoryWorkspaceName());
+					forumToolContentHandler.getRepositoryWorkspaceName());
 			return ticket;
 		} catch (AccessDeniedException ae) {
 			throw new ForumException("Access Denied to repository."
@@ -523,12 +524,13 @@
 	public void setRepositoryService(IRepositoryService repositoryService) {
 		this.repositoryService = repositoryService;
 	}
-	public ForumToolContentHandler getToolContentHandler() {
-		return toolContentHandler;
+	public ForumToolContentHandler getForumToolContentHandler() {
+		return forumToolContentHandler;
 	}
 
-	public void setToolContentHandler(ForumToolContentHandler toolContentHandler) {
-		this.toolContentHandler = toolContentHandler;
+	public void setForumToolContentHandler(ForumToolContentHandler toolContentHandler) {
+		this.forumToolContentHandler = toolContentHandler;
 	}
 
+
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r2437f5fc533ea6acaf8a86a9a703a5909b456516 -r7b1c6b460337d9cd62f8350d620d7915eae800b8
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 2437f5fc533ea6acaf8a86a9a703a5909b456516)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 7b1c6b460337d9cd62f8350d620d7915eae800b8)
@@ -94,7 +94,7 @@
 	private ILearnerDAO learnerDAO;
 	private IUserDAO userDAO;
 	
-	private SbmtToolContentHandler toolContentHandler;
+	private SbmtToolContentHandler sbmtToolContentHandler;
 	
 	private ILamsToolService toolService;
 	private ILearnerService learnerService;
@@ -505,7 +505,7 @@
         if (file!= null && !StringUtils.isEmpty(file.getFileName())) {
             String fileName = file.getFileName();
             try {
-				node = getToolContentHandler().uploadFile(file.getInputStream(), fileName, 
+				node = getSbmtToolContentHandler().uploadFile(file.getInputStream(), fileName, 
 				        file.getContentType(), fileType);
 			} catch (InvalidParameterException e) {
 				throw new SubmitFilesException("FileNotFoundException occured while trying to upload File" + e.getMessage());
@@ -748,17 +748,17 @@
 	
 
 	/**
-	 * @return Returns the toolContentHandler.
+	 * @return Returns the sbmtToolContentHandler.
 	 */
-	public SbmtToolContentHandler getToolContentHandler() {
-		return toolContentHandler;
+	public SbmtToolContentHandler getSbmtToolContentHandler() {
+		return sbmtToolContentHandler;
 	}
 
 	/**
-	 * @param toolContentHandler The toolContentHandler to set.
+	 * @param sbmtToolContentHandler The sbmtToolContentHandler to set.
 	 */
-	public void setToolContentHandler(SbmtToolContentHandler toolContentHandler) {
-		this.toolContentHandler = toolContentHandler;
+	public void setSbmtToolContentHandler(SbmtToolContentHandler toolContentHandler) {
+		this.sbmtToolContentHandler = toolContentHandler;
 	}
 	
 	/**
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
===================================================================
diff -u -r6e5832d17263bc6c6f7683733e91e22f97eab569 -r7b1c6b460337d9cd62f8350d620d7915eae800b8
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision 7b1c6b460337d9cd62f8350d620d7915eae800b8)
@@ -50,7 +50,7 @@
 		<property name="submitFilesReportDAO"><ref bean="submitFilesReportDAO"/></property>
 		<property name="submissionDetailsDAO"><ref bean="submissionDetailsDAO"/></property>
 		<property name="learnerDAO"><ref bean="learnerDAO"/></property>
-		<property name="toolContentHandler"><ref bean="toolContentHandler"/></property>
+		<property name="sbmtToolContentHandler"><ref bean="sbmtToolContentHandler"/></property>
 		<property name="userDAO"><ref bean="userDAO"/></property>
 		<property name="learnerService"><ref bean="learnerService"/></property>
 		<property name="toolService"><ref bean="lamsToolService"/></property>
@@ -74,7 +74,7 @@
 			</props>
 		</property>
 	</bean>	
-	<bean id="toolContentHandler" class="org.lamsfoundation.lams.tool.sbmt.util.SbmtToolContentHandler">
+	<bean id="sbmtToolContentHandler" class="org.lamsfoundation.lams.tool.sbmt.util.SbmtToolContentHandler">
  		<property name="repositoryService"><ref bean="repositoryService"/></property>
 	</bean>