diff --git a/plugins/org.eclipse.dltk.ruby.testing/src/org/eclipse/dltk/ruby/testing/internal/RubyTestingLaunchShortcut.java b/plugins/org.eclipse.dltk.ruby.testing/src/org/eclipse/dltk/ruby/testing/internal/RubyTestingLaunchShortcut.java
index d53a409..bb475d5 100644
--- a/plugins/org.eclipse.dltk.ruby.testing/src/org/eclipse/dltk/ruby/testing/internal/RubyTestingLaunchShortcut.java
+++ b/plugins/org.eclipse.dltk.ruby.testing/src/org/eclipse/dltk/ruby/testing/internal/RubyTestingLaunchShortcut.java
@@ -221,7 +221,7 @@
 		ILaunchConfigurationType configType = getLaunchManager()
 				.getLaunchConfigurationType(getLaunchConfigurationTypeId());
 		final ILaunchConfigurationWorkingCopy wc = configType.newInstance(null,
-				getLaunchManager().generateUniqueLaunchConfigurationNameFrom(
+				getLaunchManager().generateLaunchConfigurationName(
 						testName));
 
 		wc.setAttribute(ScriptLaunchConfigurationConstants.ATTR_PROJECT_NAME,
@@ -415,7 +415,7 @@
 		ILaunchConfigurationType configType = getLaunchManager()
 				.getLaunchConfigurationType(getLaunchConfigurationTypeId());
 		ILaunchConfigurationWorkingCopy wc = configType.newInstance(null,
-				getLaunchManager().generateUniqueLaunchConfigurationNameFrom(
+				getLaunchManager().generateLaunchConfigurationName(
 						testName));
 
 		wc.setAttribute(ScriptLaunchConfigurationConstants.ATTR_PROJECT_NAME,
