diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionMessages.java
index 914cb00938a..0a9d425b337 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionMessages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionMessages.java
@@ -17,8 +17,6 @@ import org.eclipse.osgi.util.NLS;
  * Class that gives access to the action messages resource bundle.
  */
 public class ActionMessages extends NLS {
-	private static final String BUNDLE_NAME= "org.eclipse.cdt.internal.ui.actions.ActionMessages"; //$NON-NLS-1$
-
 	public static String SourceMenu_label;
 	public static String SelectionConverter_codeResolve_failed;
 	public static String OpenAction_label;
@@ -81,7 +79,7 @@ public class ActionMessages extends NLS {
 
 	static {
 		// Initialize resource bundle.
-		NLS.initializeMessages(BUNDLE_NAME, ActionMessages.class);
+		NLS.initializeMessages(ActionMessages.class.getName(), ActionMessages.class);
 	}
 
 	private ActionMessages() {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMessages.java
index b50c7cdd1ff..127fcd48c6f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMessages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMessages.java
@@ -14,7 +14,6 @@ package org.eclipse.cdt.internal.ui.callhierarchy;
 import org.eclipse.osgi.util.NLS;
 
 public class CHMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.cdt.internal.ui.callhierarchy.CHMessages"; //$NON-NLS-1$
 	public static String CallHierarchyUI_label;
 	public static String CallHierarchyUI_openFailureMessage;
 	public static String CallHierarchyUI_selectMessage;
@@ -59,7 +58,7 @@ public class CHMessages extends NLS {
 
 	static {
 		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, CHMessages.class);
+		NLS.initializeMessages(CHMessages.class.getName(), CHMessages.class);
 	}
 
 	private CHMessages() {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.java
index 99bc805413a..3d7e50b59ea 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.java
@@ -29,12 +29,6 @@ public final class CEditorMessages extends NLS {
 		return fgBundleForConstructedKeys;
 	}
 
-	private static final String BUNDLE_NAME = CEditorMessages.class.getName();
-
-	private CEditorMessages() {
-		// Do not instantiate
-	}
-
 	public static String AddIncludeOnSelection_label;
 	public static String AddIncludeOnSelection_description;
 	public static String AddIncludeOnSelection_error_title;
@@ -98,6 +92,10 @@ public final class CEditorMessages extends NLS {
 	public static String CEditor_markOccurrences_job_name;
 
 	static {
-		NLS.initializeMessages(BUNDLE_NAME, CEditorMessages.class);
+		NLS.initializeMessages(CEditorMessages.class.getName(), CEditorMessages.class);
+	}
+
+	// Do not instantiate
+	private CEditorMessages() {
 	}
 }
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/Messages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/Messages.java
index 8871a8be835..5f41e6ca5e5 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/Messages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/Messages.java
@@ -15,12 +15,6 @@ import org.eclipse.osgi.util.NLS;
 
 public final class Messages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.eclipse.cdt.internal.ui.refactoring.messages";//$NON-NLS-1$
-
-	private Messages() {
-		// Do not instantiate
-	}
-
 	public static String DeleteFileChange_0;
 	public static String DeleteFileChange_1;
 	public static String Refactoring_name;
@@ -43,6 +37,10 @@ public final class Messages extends NLS {
 	public static String NO_FILE;
 
 	static {
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+		NLS.initializeMessages(Messages.class.getName(), Messages.class);
+	}
+
+	// Do not instantiate
+	private Messages() {
 	}
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/messages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/Messages.properties
similarity index 100%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/messages.properties
rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/Messages.properties
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/Messages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/Messages.java
index 4e28c25af54..f7fd485bf45 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/Messages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/Messages.java
@@ -15,12 +15,6 @@ import org.eclipse.osgi.util.NLS;
 
 public final class Messages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.eclipse.cdt.internal.ui.refactoring.dialogs.messages";//$NON-NLS-1$
-
-	private Messages() {
-		// Do not instantiate
-	}
-
 	public static String CTextEditChangePreviewViewer_OrgSource;
 	public static String CTextEditChangePreviewViewer_RefactoredSource;
 	public static String ExtractInputPage_ReplaceInSubclass;
@@ -33,6 +27,10 @@ public final class Messages extends NLS {
 	public static String ValidatingLabeledTextField_IsKeyword;
 
 	static {
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+		NLS.initializeMessages(Messages.class.getName(), Messages.class);
+	}
+
+	// Do not instantiate
+	private Messages() {
 	}
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/messages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/Messages.properties
similarity index 100%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/messages.properties
rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/Messages.properties
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CHoverMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CHoverMessages.java
index 09a95419825..9838be3bd8e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CHoverMessages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CHoverMessages.java
@@ -16,12 +16,6 @@ import org.eclipse.osgi.util.NLS;
 
 public final class CHoverMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.eclipse.cdt.internal.ui.text.c.hover.CHoverMessages";//$NON-NLS-1$
-
-	private CHoverMessages() {
-		// Do not instantiate
-	}
-
 	public static String AbstractAnnotationHover_action_configureAnnotationPreferences;
 	public static String AbstractAnnotationHover_message_singleQuickFix;
 	public static String AbstractAnnotationHover_message_multipleQuickFix;
@@ -40,6 +34,10 @@ public final class CHoverMessages extends NLS {
 	public static String CSourceHover_jobTitle;
 
 	static {
-		NLS.initializeMessages(BUNDLE_NAME, CHoverMessages.class);
+		NLS.initializeMessages(CHoverMessages.class.getName(), CHoverMessages.class);
+	}
+
+	// Do not instantiate
+	private CHoverMessages() {
 	}
 }
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/Messages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/Messages.java
index 72ef0dc4db6..5c50aaea35d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/Messages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/Messages.java
@@ -15,7 +15,6 @@ package org.eclipse.cdt.ui;
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.cdt.ui.messages"; //$NON-NLS-1$
 	public static String CElementGrouping_includeGroupingLabel;
 	
 	/**
@@ -24,9 +23,10 @@ public class Messages extends NLS {
 	public static String CElementGrouping_macroGroupingLabel;
 	
 	public static String CUIPlugin_jobStartMakeUI;
+
 	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+		// Initialize resource bundle
+		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
 
 	private Messages() {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/messages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/Messages.properties
similarity index 100%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/messages.properties
rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/Messages.properties