diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedProject.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedProject.java
index 849d7f01c12..c60529fb1fc 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedProject.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedProject.java
@@ -417,13 +417,7 @@ public class ManagedProject extends BuildObject implements IManagedProject, IBui
 	 * @see org.eclipse.cdt.managedbuilder.core.IManagedProject#(getDefaultArtifactName)
 	 */
 	public String getDefaultArtifactName(){
-		String name = new String();
-		// Check for spaces
-		String[] tokens = getOwner().getName().split("\\s");	//$NON-NLS-1$
-		for (int index = 0; index < tokens.length; ++index) {
-			name += tokens[index];
-		}
-		return name;
+		return "${ProjName}"; //$NON-NLS-1$
 	}
 	
 	/* (non-Javadoc)
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/ProjectCreatedActions.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/ProjectCreatedActions.java
index 9660f26e246..a03d017d2c6 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/ProjectCreatedActions.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/ProjectCreatedActions.java
@@ -135,7 +135,7 @@ public class ProjectCreatedActions {
 				}
 
 				configuration.setName(config.getName());
-				configuration.setArtifactName(project.getName());
+				configuration.setArtifactName(newManagedProject.getDefaultArtifactName());
 
 				IBuildProperty buildProperty = configuration.getBuildProperties().getProperty(PROPERTY);
 				if (buildProperty != null && buildProperty.getValue() != null && PROP_VAL.equals(buildProperty.getValue().getId())) {
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java
index 9c1aba58ce7..f5e337f1c8c 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java
@@ -23,7 +23,6 @@ import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.cdt.managedbuilder.core.IMultiConfiguration;
 import org.eclipse.cdt.managedbuilder.core.ITool;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.cdt.ui.wizards.CWizardHandler;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
@@ -170,7 +169,7 @@ public class ArtifactTab extends AbstractCBuildPropertyTab {
 		String s = fCfg.getArtifactName();
 		if (! page.isMultiCfg() && (s == null || s.trim().length() == 0)) {
 			s = getResDesc().getConfiguration().getProjectDescription().getName();
-			getCfg().setArtifactName(CWizardHandler.removeSpaces(s));
+			getCfg().setArtifactName(s);
 		}
 		
 		canModify = false;
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
index f2541c7d74b..ea7b51cc4c2 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
@@ -579,7 +579,7 @@ public class MBSWizardHandler extends CWizardHandler {
 	    	if (bld != null) { 	bld.setManagedBuildOn(true); }
 	    	
 	    	config.setName(cfgs[i].getName());
-	    	config.setArtifactName(removeSpaces(project.getName()));
+	    	config.setArtifactName(mProj.getDefaultArtifactName());
 	    	
 	    	IBuildProperty b = config.getBuildProperties().getProperty(PROPERTY);
 	    	if (cfgDebug == null && b != null && b.getValue() != null && PROP_VAL.equals(b.getValue().getId()))
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java
index 7660421e715..fa9add83113 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java
@@ -92,7 +92,7 @@ public class STDWizardHandler extends MBSWizardHandler {
 	    	} else {
 	    		System.out.println(UIMessages.getString("StdProjectTypeHandler.3")); //$NON-NLS-1$
 	    	}
-	    	cfg.setArtifactName(removeSpaces(project.getName()));
+	    	cfg.setArtifactName(mProj.getDefaultArtifactName());
 	    	CConfigurationData data = cfg.getConfigurationData();
 	    	des.createConfiguration(ManagedBuildManager.CFG_DATA_PROVIDER_ID, data);
 	    	monitor.worked(work);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java
index a390c3a7601..c2284bc1cfd 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java
@@ -253,6 +253,10 @@ public class CWizardHandler implements Cloneable {
 		} catch (CloneNotSupportedException e) { return null; }
 	}
 	
+	/**
+	 * @deprecated since CDT 6.1.
+	 */
+	@Deprecated
 	public static String removeSpaces(String s) {
 		char[] cs = s.toCharArray();
 		StringBuffer sb = new StringBuffer();