Index: org.lams.toolbuilder/src/org/lams/toolbuilder/renameTool/RenameTool.java
===================================================================
RCS file: /usr/local/cvsroot/org.lams.toolbuilder/src/org/lams/toolbuilder/renameTool/RenameTool.java,v
diff -u -r1.4 -r1.5
--- org.lams.toolbuilder/src/org/lams/toolbuilder/renameTool/RenameTool.java	10 Sep 2007 07:27:33 -0000	1.4
+++ org.lams.toolbuilder/src/org/lams/toolbuilder/renameTool/RenameTool.java	19 Sep 2007 06:49:44 -0000	1.5
@@ -23,6 +23,7 @@
 	//$$$$$$$$$$$$$$$$$$$$$$TO BE IMPLEMENTED DYNAMICALLY
 	private final String DEFAULT_LANGUAGE = "en_AU";
 	
+	private String sourceDirStr;
 	
 	private Set<String> txtType = new HashSet<String>();
 
@@ -56,11 +57,14 @@
 	public boolean renameTool(List<String[]> nameList, String source) throws Exception
 	{
 		this.nameList = nameList;
-		File sourceDir = new File(source);
+		
+		this.sourceDirStr = source;
+		
+		File sourceDir = new File(sourceDirStr);
 		if (!sourceDir.exists())
 		{		
-			LamsToolBuilderLog.logError(new FileNotFoundException("Source file: " + source + "not found."));
-			throw new FileNotFoundException("Source file: " + source + "not found.");
+			LamsToolBuilderLog.logError(new FileNotFoundException("Source file: " + sourceDirStr + "not found."));
+			throw new FileNotFoundException("Source file: " + sourceDirStr + "not found.");
 		}
 
 		visitFile(sourceDir, "rename");
@@ -104,8 +108,19 @@
 			String line;
 			while ((line = br.readLine()) != null) {
 
-				for (String[] pair : nameList) {
+				int replaceCount = 0;
+				String[] replaceStrings = new String[] {};
+				for (String[] pair : nameList) 
+				{
+					System.out.print("Line: " + line + " replaced with: ");
 					line = line.replaceAll(pair[0], pair[1]);
+					System.out.print(line + "\n");
+					
+					
+					replaceStrings[replaceCount] = pair[1];
+					
+					
+					replaceCount++;
 				}
 
 				bw.write(line);
@@ -127,13 +142,21 @@
 
 	}
 
-	public void visitFile(File file, String mode) {
-
+	public void visitFile(File file, String mode) 
+	{
+		boolean rename=true;
+		
 		if (file.isDirectory()
 				&& (file.getName().equals("CVS") || file.getName().equals(
 						"build"))) {
 			mode = "delete";
 		}
+		
+		// Do not rename the root directory of the tool
+		if (file.isDirectory() && file.getName().equals(sourceDirStr.substring(sourceDirStr.lastIndexOf("/")+1)))
+		{
+			rename = false;
+		}
 
 		if (file.getName().contains("ApplicationResources"))
 		{
@@ -157,7 +180,8 @@
 			}
 		}
 
-		if (mode.equals("rename")) {
+		if (mode.equals("rename") && rename==true) 
+		{
 
 			if (file.isFile()) {
 				
Index: org.lams.toolbuilder/src/org/lams/toolbuilder/renameTool/RenameToolTaskList.java
===================================================================
RCS file: /usr/local/cvsroot/org.lams.toolbuilder/src/org/lams/toolbuilder/renameTool/RenameToolTaskList.java,v
diff -u -r1.3 -r1.4
--- org.lams.toolbuilder/src/org/lams/toolbuilder/renameTool/RenameToolTaskList.java	12 Sep 2007 14:45:22 -0000	1.3
+++ org.lams.toolbuilder/src/org/lams/toolbuilder/renameTool/RenameToolTaskList.java	19 Sep 2007 06:49:44 -0000	1.4
@@ -97,10 +97,11 @@
 		System.out.println("Java Variable Prefix: " + variablePrefix);
 		
 		
-		tasklist.add(new String[] {"lafrum11", toolSig});
+		
 		tasklist.add(new String[] {"TestForum", "Test" + classPrefix});
 		tasklist.add(new String[] {"Forum", classPrefix});
-		tasklist.add(new String[] {"forum", variablePrefix});
+		tasklist.add(new String[] {"forum", variablePrefix.toLowerCase()});
+		tasklist.add(new String[] {"lafrum11", toolSig});
 	}
 	
 	public void initMC() {}
Index: org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizard.java
===================================================================
RCS file: /usr/local/cvsroot/org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizard.java,v
diff -u -r1.7 -r1.8
--- org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizard.java	18 Sep 2007 05:56:54 -0000	1.7
+++ org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizard.java	19 Sep 2007 06:49:44 -0000	1.8
@@ -193,7 +193,7 @@
 		toolDisplayName = page.getToolDisplayName();
 		isLAMS = page.getIsLams();
 		toolVisible = page.getVisible();
-		toolSignature = page.getToolDisplayName();
+		toolSignature = page.getToolSignature();
 		
 		// create a project descriptor
 		IPath projPath = null;
@@ -296,10 +296,12 @@
 		LamsToolBuilderLog.logInfo(projHandle.getLocation().toPortableString());
 		try{
 			rt.renameTool(taskList.getTasklist(), projHandle.getLocation().toPortableString());
+			System.out.print(taskList.getTasklist().toString());
 		}
 		catch (Exception e)
 		{
-			LamsToolBuilderLog.logError(e);
+			LamsToolBuilderLog.logError("LAMS Tool Renaming Error: ", e);
+
 		}
 		
 		root.refreshLocal(IWorkspaceRoot.DEPTH_INFINITE, monitor);
Index: org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizardPage.java
===================================================================
RCS file: /usr/local/cvsroot/org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizardPage.java,v
diff -u -r1.4 -r1.5
--- org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizardPage.java	13 Sep 2007 00:33:12 -0000	1.4
+++ org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizardPage.java	19 Sep 2007 06:49:44 -0000	1.5
@@ -176,6 +176,7 @@
 		*/
 		
 		initialise();
+		dialogChanged();
 		setControl(control);
 		
 		
Index: org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizardTemplatePage.java
===================================================================
RCS file: /usr/local/cvsroot/org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizardTemplatePage.java,v
diff -u -r1.1 -r1.2
--- org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizardTemplatePage.java	18 Sep 2007 05:56:54 -0000	1.1
+++ org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizardTemplatePage.java	19 Sep 2007 06:49:44 -0000	1.2
@@ -126,9 +126,9 @@
    		control.setLayout(layout);
 	   
    		createLabel(control, "Please choose a LAMS tool template from the list below to build a new tool." +
-				"\n\nThis list is derived from your current workspace. To add more tools to your workspace," +
-				"\nsimply use the 'import' option from the file menu, then enter the following details in" +
-				"\nthe 'Import Projects From CVS' menu:" +
+				"\n\nThis list is derived from your current workspace. To add more default LAMS tools to " +
+				"\nyour workspace, simply use the 'import' option from the file menu, then enter the " +
+				"\nfollowing details in the 'Import Projects From CVS' menu:" +
 				"\n\n\t* access method: pserver " +
 				"\n\t* user name: anonymous" +
 				"\n\t* server name: lamscvs.melcoe.mq.edu.au" +