--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java	Thu Nov 05 13:22:54 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java	Fri Nov 06 12:28:33 2009 -0600
@@ -48,7 +48,7 @@
 import com.nokia.carbide.remoteconnections.interfaces.IService;
 import com.nokia.cdt.debug.cw.symbian.*;
 import com.nokia.cdt.internal.debug.launch.wizard.LaunchCreationWizard;
-import com.nokia.cdt.internal.debug.launch.wizard.LaunchCreationWizardFactory;
+import com.nokia.cdt.internal.debug.launch.wizard.LaunchCreationWizardInstance;
 import com.nokia.cpp.internal.api.utils.core.Logging;
 
 /**
@@ -294,7 +294,7 @@
 			// or both
 			try {
 				final LaunchCreationWizard wizard =
-					LaunchCreationWizardFactory.getInstance().get(project, defaultConfigName, mmpPaths, exePaths, defaultExecutable, isX86, useEmulatorByDefault, mode);
+					LaunchCreationWizardInstance.getInstance().create(project, defaultConfigName, mmpPaths, exePaths, defaultExecutable, isX86, useEmulatorByDefault, mode);
 				Display.getDefault().syncExec(new Runnable() {
 					public void run() {
 						wizard.init(PlatformUI.getWorkbench(), null);

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/ILaunchCreationWizardFactory.java	Thu Nov 05 13:22:54 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/ILaunchCreationWizardFactory.java	Fri Nov 06 12:28:33 2009 -0600
@@ -22,7 +22,7 @@
 import org.eclipse.core.runtime.IPath;
 
 public interface ILaunchCreationWizardFactory {
-	public LaunchCreationWizard get(IProject project, String configurationName, 
+	public LaunchCreationWizard create(IProject project, String configurationName, 
 			List<IPath> mmps, List<IPath> exes, IPath defaultExecutable,  
 			boolean isEmulation, boolean emulatorOnly, String mode) throws Exception;
 }