diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/Messages.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/Messages.java
index 312c5c2050c..1c70c89d409 100644
--- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/Messages.java
+++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/Messages.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2009,2010 Alena Laskavaia 
+ * Copyright (c) 2009,2010 Alena Laskavaia
  * 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
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Alena Laskavaia  - initial API and implementation
+ *     Alena Laskavaia  - initial API and implementation
  *******************************************************************************/
 package org.eclipse.cdt.codan.core;
 
@@ -16,7 +16,6 @@ import org.eclipse.osgi.util.NLS;
  * Core Messages
  */
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.cdt.codan.core.messages"; //$NON-NLS-1$
 	public static String CodanApplication_all_option;
 	public static String CodanApplication_Error_ProjectDoesNotExists;
 	public static String CodanApplication_LogRunProject;
@@ -26,11 +25,12 @@ public class Messages extends NLS {
 	public static String CodanApplication_verbose_option;
 	public static String CodanBuilder_Code_Analysis_On;
 	public static String FileScopeProblemPreference_Label;
+
 	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+		NLS.initializeMessages(Messages.class.getName(), Messages.class);
 	}
 
+	// Do not instantiate
 	private Messages() {
 	}
 }
diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/Messages.properties b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/Messages.properties
new file mode 100644
index 00000000000..d27aa294057
--- /dev/null
+++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/Messages.properties
@@ -0,0 +1,19 @@
+###############################################################################
+# Copyright (c) 2010 Alena Laskavaia 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Alena Laskavaia - initial API and implementation
+###############################################################################
+CodanApplication_Error_ProjectDoesNotExists=Error: project {0} does not exist
+CodanApplication_LogRunProject=Running code analysis on project 
+CodanApplication_LogRunWorkspace=Running code analysis on workspace
+CodanApplication_Usage=Usage: [options] <project1> <project2> ...
+CodanApplication_Options=Options:
+CodanApplication_all_option=  -all - run on all projects in workspace
+CodanApplication_verbose_option=  -verbose - print verbose build information 
+CodanBuilder_Code_Analysis_On=Code analysis on 
+FileScopeProblemPreference_Label=Exclusion and Inclusion