diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java
index 237e64f24da..cb9ced1447a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java
@@ -123,7 +123,7 @@ public class ChangeGenerator extends ASTVisitor {
 
 	public void generateChange(IASTNode rootNode, ASTVisitor pathProvider)
 			throws ProblemRuntimeException {
-		change = new CompositeChange(Messages.ChangeGenerator_compositeChange);
+		change = new CompositeChange(ChangeGeneratorMessages.ChangeGenerator_compositeChange);
 		classifyModifications();
 		rootNode.accept(pathProvider);
 		for (IFile currentFile : changes.keySet()) {
@@ -912,7 +912,7 @@ public class ChangeGenerator extends ASTVisitor {
 			edit = new MultiTextEdit();
 			changes.put(file, edit);
 		}
-		TextEditGroup editGroup = new TextEditGroup(Messages.ChangeGenerator_group);
+		TextEditGroup editGroup = new TextEditGroup(ChangeGeneratorMessages.ChangeGenerator_group);
 		for (List<ASTModification> modifications : getModifications(modifiedNode).values()) {
 			for (ASTModification modification : modifications) {
 				if (modification.getAssociatedEditGroup() != null) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/Messages.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGeneratorMessages.java
similarity index 70%
rename from core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/Messages.java
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGeneratorMessages.java
index b082183a05d..8165953bfb9 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/Messages.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGeneratorMessages.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Markus Schorn - initial API and implementation
+ *     Markus Schorn - initial API and implementation
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.dom.rewrite.changegenerator;
 
@@ -16,15 +16,15 @@ import org.eclipse.osgi.util.NLS;
  * External strings for the change generator.
  * @since 5.0
  */
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.cdt.internal.core.dom.rewrite.changegenerator.messages"; //$NON-NLS-1$
+public class ChangeGeneratorMessages extends NLS {
 	public static String ChangeGenerator_compositeChange;
 	public static String ChangeGenerator_group;
+
 	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+		// Initialize resource bundle
+		NLS.initializeMessages(ChangeGeneratorMessages.class.getName(), ChangeGeneratorMessages.class);
 	}
 
-	private Messages() {
+	private ChangeGeneratorMessages() {
 	}
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/messages.properties b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGeneratorMessages.properties
similarity index 100%
rename from core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/messages.properties
rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGeneratorMessages.properties