Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
===================================================================
diff -u -r1d59db1d7a45bea978c6dbbe4dcb74f15120190e -r8db332177e4d6a0f4600ac65fb230225f4e5199b
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(.../ChatService.java)	(revision 1d59db1d7a45bea978c6dbbe4dcb74f15120190e)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(.../ChatService.java)	(revision 8db332177e4d6a0f4600ac65fb230225f4e5199b)
@@ -333,13 +333,13 @@
 				throw new ImportToolContentException(
 						"Import Chat tool content failed. Deserialized object is "
 								+ toolPOJO);
-			Chat toolContentObj = (Chat) toolPOJO;
+			Chat chat = (Chat) toolPOJO;
 
 			// reset it to new toolContentId
-			toolContentObj.setToolContentId(toolContentId);
-			toolContentObj.setCreateBy(new Long(newUserUid.longValue()));
+			chat.setToolContentId(toolContentId);
+			chat.setCreateBy(new Long(newUserUid.longValue()));
 
-			chatDAO.saveOrUpdate(toolContentObj);
+			chatDAO.saveOrUpdate(chat);
 		} catch (ImportToolContentException e) {
 			throw new ToolException(e);
 		}
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
===================================================================
diff -u -r24ca84b9e61b98c068eaa369cb194a35e5511162 -r8db332177e4d6a0f4600ac65fb230225f4e5199b
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	(.../NotebookService.java)	(revision 24ca84b9e61b98c068eaa369cb194a35e5511162)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	(.../NotebookService.java)	(revision 8db332177e4d6a0f4600ac65fb230225f4e5199b)
@@ -269,13 +269,13 @@
 				throw new ImportToolContentException(
 						"Import Notebook tool content failed. Deserialized object is "
 								+ toolPOJO);
-			Notebook toolContentObj = (Notebook) toolPOJO;
+			Notebook notebook = (Notebook) toolPOJO;
 
 			// reset it to new toolContentId
-			toolContentObj.setToolContentId(toolContentId);
-			toolContentObj.setCreateBy(new Long(newUserUid.longValue()));
+			notebook.setToolContentId(toolContentId);
+			notebook.setCreateBy(new Long(newUserUid.longValue()));
 
-			notebookDAO.saveOrUpdate(toolContentObj);
+			notebookDAO.saveOrUpdate(notebook);
 		} catch (ImportToolContentException e) {
 			throw new ToolException(e);
 		}
@@ -503,39 +503,39 @@
     public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues)
     {
     	Date now = new Date();
-    	Notebook toolContentObj = new Notebook();
-    	toolContentObj.setContentInUse(Boolean.FALSE);
-    	toolContentObj.setCreateBy(new Long(user.getUserID().longValue()));
-    	toolContentObj.setCreateDate(now);
-    	toolContentObj.setDefineLater(Boolean.FALSE);
-    	toolContentObj.setInstructions((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY));
-    	toolContentObj.setLockOnFinished(Boolean.TRUE);
-    	toolContentObj.setOfflineInstructions(null);
-    	toolContentObj.setOnlineInstructions(null);
-    	toolContentObj.setRunOffline(Boolean.FALSE);
-    	toolContentObj.setTitle((String)importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
-    	toolContentObj.setToolContentId(toolContentId);
-    	toolContentObj.setUpdateDate(now);
-    	toolContentObj.setAllowRichEditor(Boolean.FALSE);
+    	Notebook notebook = new Notebook();
+    	notebook.setContentInUse(Boolean.FALSE);
+    	notebook.setCreateBy(new Long(user.getUserID().longValue()));
+    	notebook.setCreateDate(now);
+    	notebook.setDefineLater(Boolean.FALSE);
+    	notebook.setInstructions((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY));
+    	notebook.setLockOnFinished(Boolean.TRUE);
+    	notebook.setOfflineInstructions(null);
+    	notebook.setOnlineInstructions(null);
+    	notebook.setRunOffline(Boolean.FALSE);
+    	notebook.setTitle((String)importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
+    	notebook.setToolContentId(toolContentId);
+    	notebook.setUpdateDate(now);
+    	notebook.setAllowRichEditor(Boolean.FALSE);
     	// leave as empty, no need to set them to anything.
     	//setNotebookAttachments(Set notebookAttachments);
     	//setNotebookSessions(Set notebookSessions);
-    	notebookDAO.saveOrUpdate(toolContentObj);
+    	notebookDAO.saveOrUpdate(notebook);
     }
 
     /** Set the description, throws away the title value as this is not supported in 2.0 */
     public void setReflectiveData(Long toolContentId, String title, String description) 
     		throws ToolException, DataMissingException {
 
     	logger.warn("Setting the reflective field on a notebook. This doesn't make sense as the notebook is for reflection and we don't reflect on reflection!");
-    	Notebook toolContentObj = getNotebookByContentId(toolContentId);
-    	if ( toolContentObj == null ) {
+    	Notebook notebook = getNotebookByContentId(toolContentId);
+    	if ( notebook == null ) {
     		throw new DataMissingException("Unable to set reflective data titled "+title
 	       			+" on activity toolContentId "+toolContentId
 	       			+" as the tool content does not exist.");
     	}
     	
-    	toolContentObj.setInstructions(description);
+    	notebook.setInstructions(description);
     }
     
     //=========================================================================================