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.3 -r1.4
--- org.lams.toolbuilder/src/org/lams/toolbuilder/renameTool/RenameTool.java	6 Sep 2007 07:19:22 -0000	1.3
+++ org.lams.toolbuilder/src/org/lams/toolbuilder/renameTool/RenameTool.java	10 Sep 2007 07:27:33 -0000	1.4
@@ -30,7 +30,6 @@
 
 	public RenameTool()
 	{
-		
 		txtType.add("clay");
 		txtType.add("classpath");
 		txtType.add("txt");
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.1 -r1.2
--- org.lams.toolbuilder/src/org/lams/toolbuilder/renameTool/RenameToolTaskList.java	6 Sep 2007 07:19:22 -0000	1.1
+++ org.lams.toolbuilder/src/org/lams/toolbuilder/renameTool/RenameToolTaskList.java	10 Sep 2007 07:27:33 -0000	1.2
@@ -99,26 +99,21 @@
 	
 	public void initSubmit() 
 	{
-		/*
-		 * lasbmt11
-		 * SubmitFiles
-		 * Submit Files
-		 * sbmt
-		 * Sbmt
-		 * Submit
-		 * submit
-		 */
-		
 		String submitClassPrefix = toJavaClassString(toolDispName);
 		String submitVariablePrefix = toJavaVariableString(toolDispName);
+		System.out.println("Java Class Prefix: " + submitClassPrefix);
+		System.out.println("Java Variable Prefix: " + submitVariablePrefix);
 		
+		
 		tasklist.add(new String[] {"lasbmt11", toolSig});
+		tasklist.add(new String[] {"TestSubmitFiles", "Test" + submitClassPrefix});
 		tasklist.add(new String[] {"SubmitFiles", submitClassPrefix});
-		tasklist.add(new String[] {"Submit Files",toolDispName});
+		tasklist.add(new String[] {"submitFiles", submitVariablePrefix});
+		tasklist.add(new String[] {"Submit Files", toolDispName});
+		tasklist.add(new String[] {"Submit",submitClassPrefix});
+		tasklist.add(new String[] {"submit",submitVariablePrefix});		
 		tasklist.add(new String[] {"sbmt",submitVariablePrefix});
 		tasklist.add(new String[] {"Sbmt",submitClassPrefix});
-		tasklist.add(new String[] {"Submit",submitClassPrefix});
-		tasklist.add(new String[] {"submit",submitVariablePrefix});
 		tasklist.add(new String[] {"Submission",submitClassPrefix});
 		tasklist.add(new String[] {"submission",submitVariablePrefix});
 	}
@@ -136,14 +131,15 @@
 	 */
 	public String toJavaClassString(String str)
 	{
+		String retStr = "";
 		str = str.trim();
 		String[] strs = str.split(" ");
 		
 		for (int i =0; i<strs.length; i++)
 		{
-			str += strs[i].substring(0, 1).toUpperCase() + strs[i].substring(1);
+			retStr += strs[i].substring(0, 1).toUpperCase() + strs[i].substring(1);
 		}
-		return str;
+		return retStr;
 	}
 	
 	/**
@@ -154,8 +150,18 @@
 	public String toJavaVariableString(String str)
 	{
 		str = str.trim();
-		str = str.substring(0, 1).toLowerCase() + toJavaClassString(str.substring(1));
-		return str;
+		String firstWord;
+		
+		if (str.contains(" "))
+		{
+			firstWord = str.substring(0, str.indexOf(" "));
+			firstWord = firstWord.substring(0, 1).toLowerCase() + firstWord.substring(1);
+			return firstWord + toJavaClassString(str.substring(str.indexOf(" ")));
+		}
+		else
+		{
+			return str.substring(0, 1).toLowerCase() + str.substring(1);
+		}
 	}
 	
 	
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.4 -r1.5
--- org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizard.java	6 Sep 2007 07:19:22 -0000	1.4
+++ org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizard.java	10 Sep 2007 07:27:33 -0000	1.5
@@ -48,6 +48,8 @@
 	// The handle to the new LAMS Tool Project to be created
 	private IProject projectHandle;
 	
+	
+	private static String toolSignature;
 	private static String toolName;
 	private static String vendor;
 	private static String compatibility;
@@ -86,6 +88,7 @@
 		
 		//private static String toolName;
 		vendor = page.getVendor();
+		toolSignature = page.getToolSignature();
 		compatibility = page.getCompatibility();
 		toolDisplayName = page.getToolDisplayName();
 		isLAMS = page.getIsLams();
@@ -185,19 +188,11 @@
 			LamsToolBuilderLog.logError(e);
 		}
 		
-		RenameToolTaskList tasklist = new RenameToolTaskList(Constants.SUBMIT_TOOL_DIR, projHandle.getName(), toolDisplayName);
+		RenameToolTaskList tasklist = new RenameToolTaskList(Constants.SUBMIT_TOOL_DIR, toolSignature, toolDisplayName);
 		
 		List<String[]> commandList = tasklist.getTasklist();
-		/*commandList.add(new String[] {"lasbmt11",projHandle.getName()});
-		commandList.add(new String[] {"SubmitFiles",toolDisplayName.replaceAll(" ", "").trim()});
-		commandList.add(new String[] {"Submit Files",toolDisplayName.trim()});
-		commandList.add(new String[] {"sbmt",projHandle.getName().toLowerCase()});
-		commandList.add(new String[] {"Sbmt",projHandle.getName()});
-		commandList.add(new String[] {"Submit",toolDisplayName.replaceAll(" ", "").trim()});
-		commandList.add(new String[] {"submit",toolDisplayName.replaceAll(" ", "").trim()});
-		*/
+
 		
-		
 		RenameTool rt = new RenameTool();
 		LamsToolBuilderLog.logInfo(projHandle.getLocation().toPortableString());
 		try{
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.2 -r1.3
--- org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizardPage.java	4 Sep 2007 12:38:52 -0000	1.2
+++ org.lams.toolbuilder/src/org/lams/toolbuilder/wizards/LAMSNewToolWizardPage.java	10 Sep 2007 07:27:33 -0000	1.3
@@ -35,6 +35,7 @@
 
 public class LAMSNewToolWizardPage extends WizardNewProjectCreationPage {
 	private Text toolName;
+	private Text toolSignature;
 	private Text vendor;
 	private Text compatibility;
 	private Text toolDisplayName;
@@ -77,6 +78,10 @@
 		namesGroup.setLayout(namesLayout);
 		namesGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
+		createLabel(namesGroup,	"Tool Signature");
+		toolSignature = createText(namesGroup);
+
+		
 		// put the key field in the group
 		createLabel(namesGroup,	"Tool Display Name");
 		toolDisplayName = createText(namesGroup);
@@ -421,12 +426,12 @@
 	}
 
 	
-	
-	public String getToolName(){return toolName.getText();}
-	public String getVendor(){return vendor.getText();}
-	public String getToolDisplayName() {return toolDisplayName.getText();}
-	public String getCompatibility(){return compatibility.getText();}
-	public boolean getIsLams(){return LAMSButton.getSelection();}
-	public boolean getVisible(){return isVisible.getSelection();}
+	public String getToolSignature() {return toolSignature.getText().trim().toLowerCase();}
+	public String getToolName() {return toolName.getText().trim();}
+	public String getVendor() {return vendor.getText().trim();}
+	public String getToolDisplayName() {return toolDisplayName.getText().trim();}
+	public String getCompatibility() {return compatibility.getText().trim();}
+	public boolean getIsLams() {return LAMSButton.getSelection();}
+	public boolean getVisible() {return isVisible.getSelection();}
 
 }
\ No newline at end of file