diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog
index 5bfb3bd1406..f85ac9b59bc 100644
--- a/launch/org.eclipse.cdt.launch/ChangeLog
+++ b/launch/org.eclipse.cdt.launch/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-21 Mikhail Khodjaiants
+	Replaced the decprecated target factory methods.
+	* CoreFileLaunchDelegate.java
+	* LocalCLaunchConfigurationDelegate.java
+
 2004-07-14 Mikhail Khodjaiants
 	Fix for bug 69977: TVT3.0: Non-externalized strings in Launching Debug.
 	Applied patch from Tanya Wollf.
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java
index 071f2335d95..8854df185c3 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java
@@ -11,7 +11,7 @@
 package org.eclipse.cdt.launch.internal;
 
 import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.cdt.debug.core.CDebugModel;
+import org.eclipse.cdt.debug.core.CDIDebugModel;
 import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.debug.core.ICDebugConfiguration;
 import org.eclipse.cdt.debug.core.cdi.CDIException;
@@ -78,7 +78,7 @@ public class CoreFileLaunchDelegate extends AbstractCLaunchDelegate {
 		// set the source locator
 		setSourceLocator(launch, config);
 
-		CDebugModel.newCoreFileDebugTarget(
+		CDIDebugModel.newCoreFileDebugTarget(
 			launch,
 			dsession.getCurrentTarget(),
 			renderTargetLabel(debugConfig),
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
index 73bf231c06b..e2dba009800 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
@@ -16,11 +16,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.Properties;
-
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.IProcessInfo;
 import org.eclipse.cdt.core.IProcessList;
-import org.eclipse.cdt.debug.core.CDebugModel;
+import org.eclipse.cdt.debug.core.CDIDebugModel;
 import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.debug.core.ICDebugConfiguration;
 import org.eclipse.cdt.debug.core.cdi.CDIException;
@@ -103,7 +102,7 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
 						debuggerProcess = DebugPlugin.newProcess(launch, debugger, renderDebuggerProcessLabel());
 					}
 					boolean stopInMain = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, false);
-					CDebugModel.newDebugTarget(
+					CDIDebugModel.newDebugTarget(
 						launch,
 						dsession.getCurrentTarget(),
 						renderTargetLabel(debugConfig),
@@ -125,7 +124,7 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
 						debuggerProcess = DebugPlugin.newProcess(launch, debugger, renderDebuggerProcessLabel());
 						launch.removeProcess(debuggerProcess);
 					}
-					CDebugModel.newAttachDebugTarget(
+					CDIDebugModel.newAttachDebugTarget(
 						launch,
 						dsession.getCurrentTarget(),
 						renderTargetLabel(debugConfig),