diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/AbstractLanguage.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/AbstractLanguage.java
index fd82caf7a52..9f35e2a651b 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/AbstractLanguage.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/AbstractLanguage.java
@@ -7,7 +7,8 @@
  *
  * Contributors:
  *    Markus Schorn - initial API and implementation
- *******************************************************************************/ 
+ *    Anton Leherbauer (Wind River Systems)
+ *******************************************************************************/
 
 package org.eclipse.cdt.core.model;
 
@@ -51,7 +52,18 @@ public abstract class AbstractLanguage extends PlatformObject implements ILangua
 			int style) throws CoreException {
 		throw new UnsupportedOperationException();
 	}
-	
+
+	/*
+	 * @see org.eclipse.cdt.core.model.ILanguage#getName()
+	 */
+	public String getName() {
+		ILanguageDescriptor languageDescriptor= LanguageManager.getInstance().getLanguageDescriptor(getId());
+		if (languageDescriptor != null) {
+			return languageDescriptor.getName();
+		}
+		return getId();
+	}
+
 	/**
 	 * Construct an AST for the source code provided by <code>reader</code>.
 	 * As an option you can supply 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/Messages.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/Messages.java
deleted file mode 100644
index 81988e7f238..00000000000
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/Messages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.cdt.core.dom.ast.gnu;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.cdt.core.dom.ast.gnu.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/GCCLanguage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/GCCLanguage.java
index f13b39355e4..48f4350e492 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/GCCLanguage.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/GCCLanguage.java
@@ -15,7 +15,6 @@
 package org.eclipse.cdt.core.dom.ast.gnu.c;
 
 import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.dom.ast.gnu.Messages;
 import org.eclipse.cdt.core.dom.parser.IScannerExtensionConfiguration;
 import org.eclipse.cdt.core.dom.parser.c.AbstractCLanguage;
 import org.eclipse.cdt.core.dom.parser.c.GCCParserExtensionConfiguration;
@@ -42,23 +41,19 @@ public class GCCLanguage extends AbstractCLanguage {
 	public String getId() {
 		return ID; 
 	}
-	
-	public String getName() {
-		return Messages.getString("GCCLanguage.name"); //$NON-NLS-1$
-	}
 
 	/*
-	 * @see org.eclipse.cdt.core.parser.AbstractCLanguage#getParserExtensionConfiguration()
-	 */
-	protected ICParserExtensionConfiguration getParserExtensionConfiguration() {
-		return C_GNU_PARSER_EXTENSION;
-	}
-
-	/*
-	 * @see org.eclipse.cdt.core.parser.AbstractCLanguage#getScannerExtensionConfiguration()
+	 * @see org.eclipse.cdt.core.dom.parser.c.AbstractCLanguage#getScannerExtensionConfiguration()
 	 */
 	protected IScannerExtensionConfiguration getScannerExtensionConfiguration() {
 		return C_GNU_SCANNER_EXTENSION;
 	}
 	
+	/*
+	 * @see org.eclipse.cdt.core.dom.parser.c.AbstractCLanguage#getParserExtensionConfiguration()
+	 */
+	protected ICParserExtensionConfiguration getParserExtensionConfiguration() {
+		return C_GNU_PARSER_EXTENSION;
+	}
+
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/GPPLanguage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/GPPLanguage.java
index 5f9eeeae0e2..291a52fcf2c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/GPPLanguage.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/GPPLanguage.java
@@ -14,7 +14,6 @@
 package org.eclipse.cdt.core.dom.ast.gnu.cpp;
 
 import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.dom.ast.gnu.Messages;
 import org.eclipse.cdt.core.dom.parser.IScannerExtensionConfiguration;
 import org.eclipse.cdt.core.dom.parser.cpp.AbstractCPPLanguage;
 import org.eclipse.cdt.core.dom.parser.cpp.AbstractCPPParserExtensionConfiguration;
@@ -41,19 +40,15 @@ public class GPPLanguage extends AbstractCPPLanguage {
 		return ID;
 	}
 	
-	public String getName() {
-		return Messages.getString("GPPLanguage.name"); //$NON-NLS-1$
-	}
-
 	/*
-	 * @see org.eclipse.cdt.core.dom.ast.gnu.cpp.AbstractCPPLanguage#getScannerExtensionConfiguration()
+	 * @see org.eclipse.cdt.core.dom.parser.cpp.AbstractCPPLanguage#getScannerExtensionConfiguration()
 	 */
 	protected IScannerExtensionConfiguration getScannerExtensionConfiguration() {
 		return CPP_GNU_SCANNER_EXTENSION;
 	}
 
 	/*
-	 * @see org.eclipse.cdt.core.dom.ast.gnu.cpp.AbstractCPPLanguage#getParserExtensionConfiguration()
+	 * @see org.eclipse.cdt.core.dom.parser.cpp.AbstractCPPLanguage#getParserExtensionConfiguration()
 	 */
 	protected AbstractCPPParserExtensionConfiguration getParserExtensionConfiguration() {
 		return CPP_GNU_PARSER_EXTENSION;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/messages.properties b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/messages.properties
deleted file mode 100644
index 3edab4464a0..00000000000
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-GPPLanguage.name=C++ for G++ compiler
-GCCLanguage.name=C for GCC compiler
diff --git a/core/org.eclipse.cdt.core/plugin.properties b/core/org.eclipse.cdt.core/plugin.properties
index ed82fc752c0..1e702e7f103 100644
--- a/core/org.eclipse.cdt.core/plugin.properties
+++ b/core/org.eclipse.cdt.core/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
+# Copyright (c) 2003, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
+#     Anton Leherbauer (Wind River Systems)
 ###############################################################################
 pluginName=C/C++ Development Tools Core
 providerName=Eclipse.org
@@ -86,4 +87,6 @@ PDOMProviderName=PDOM Provider
 
 fastIndexer.name=Fast Indexer
 
-language.name=Language
+# built-in languages
+language.name.gcc= GNU C
+language.name.gpp= GNU C++
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index ddf8beb379f..35e38695549 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -575,14 +575,14 @@
       <language
             class="org.eclipse.cdt.core.dom.ast.gnu.c.GCCLanguage"
             id="gcc"
-            name="GNU C">
+            name="%language.name.gcc">
          <contentType id="org.eclipse.cdt.core.cSource"/>
          <contentType id="org.eclipse.cdt.core.cHeader"/>
       </language>
       <language
             class="org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage"
             id="g++"
-            name="GNU C++">
+            name="%language.name.gpp">
          <contentType id="org.eclipse.cdt.core.cxxSource"/>
          <contentType id="org.eclipse.cdt.core.cxxHeader"/>
       </language>