diff --git a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/LogicMessages.java b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/LogicMessages.java
index 188dd1d2f..d9d7fb6ac 100644
--- a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/LogicMessages.java
+++ b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/LogicMessages.java
@@ -14,6 +14,7 @@
 
 import org.eclipse.osgi.util.NLS;
 
+@SuppressWarnings("squid:S3008") // tell sonar the java naming convention does not make sense for this class
 public class LogicMessages extends NLS {
 
 	public static String AddCommand_Label;
diff --git a/org.eclipse.gef.examples.ui.pde/src/org/eclipse/gef/examples/ui/pde/internal/l10n/Messages.java b/org.eclipse.gef.examples.ui.pde/src/org/eclipse/gef/examples/ui/pde/internal/l10n/Messages.java
index 70d0e4c5e..e372bf8ce 100644
--- a/org.eclipse.gef.examples.ui.pde/src/org/eclipse/gef/examples/ui/pde/internal/l10n/Messages.java
+++ b/org.eclipse.gef.examples.ui.pde/src/org/eclipse/gef/examples/ui/pde/internal/l10n/Messages.java
@@ -14,6 +14,7 @@
 
 import org.eclipse.osgi.util.NLS;
 
+@SuppressWarnings("squid:S3008") // tell sonar the java naming convention does not make sense for this class
 public final class Messages extends NLS {
 
 	private static final String BUNDLE_NAME = "org.eclipse.gef.examples.ui.pde.internal.l10n.Messages";//$NON-NLS-1$
diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/GEFMessages.java b/org.eclipse.gef/src/org/eclipse/gef/internal/GEFMessages.java
index 2c7c8a093..6d749c2c9 100644
--- a/org.eclipse.gef/src/org/eclipse/gef/internal/GEFMessages.java
+++ b/org.eclipse.gef/src/org/eclipse/gef/internal/GEFMessages.java
@@ -20,6 +20,7 @@
  * @author hudsonr
  * @since 2.0
  */
+@SuppressWarnings("squid:S3008") // tell sonar the java naming convention does not make sense for this class
 public class GEFMessages extends NLS {
 
 	public static String AlignBottomAction_Label;
diff --git a/org.eclipse.gef/src/org/eclipse/gef/ui/palette/PaletteMessages.java b/org.eclipse.gef/src/org/eclipse/gef/ui/palette/PaletteMessages.java
index a38c97c48..245c8be09 100644
--- a/org.eclipse.gef/src/org/eclipse/gef/ui/palette/PaletteMessages.java
+++ b/org.eclipse.gef/src/org/eclipse/gef/ui/palette/PaletteMessages.java
@@ -17,6 +17,7 @@
 /**
  * @author Pratik Shah
  */
+@SuppressWarnings("squid:S3008") // tell sonar the java naming convention does not make sense for this class
 public class PaletteMessages extends NLS {
 
 	/**