diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/service/command/events/Messages.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/service/command/events/EventMessages.java
similarity index 84%
rename from dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/service/command/events/Messages.java
rename to dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/service/command/events/EventMessages.java
index b6946be763d..7778058d369 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/service/command/events/Messages.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/service/command/events/EventMessages.java
@@ -16,15 +16,15 @@ import org.eclipse.osgi.util.NLS;
 /**
  * @noinstantiate This class is not intended to be instantiated by clients.
  */
-public class Messages extends NLS {
+public class EventMessages extends NLS {
     public static String Tracepoint;
     public static String Record;
 
     static {
         // initialize resource bundle
-        NLS.initializeMessages(Messages.class.getName(), Messages.class);
+        NLS.initializeMessages(EventMessages.class.getName(), EventMessages.class);
     }
 
-    private Messages() {
+    private EventMessages() {
     }
 }
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/service/command/events/messages.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/service/command/events/EventMessages.properties
similarity index 100%
rename from dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/service/command/events/messages.properties
rename to dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/service/command/events/EventMessages.properties
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/service/command/events/MITracepointSelectedEvent.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/service/command/events/MITracepointSelectedEvent.java
index 13a941a0861..16dfe14e911 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/service/command/events/MITracepointSelectedEvent.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/service/command/events/MITracepointSelectedEvent.java
@@ -47,8 +47,8 @@ public class MITracepointSelectedEvent extends MIBreakpointHitEvent {
 	 * Returns a text to display for the reason why we show the debug view as stopped.
 	 */
 	public String getReason() {
-		return Messages.Tracepoint + " " + getNumber() + //$NON-NLS-1$
-		       ", " + Messages.Record + " " + fRecNo; //$NON-NLS-1$ //$NON-NLS-2$
+		return EventMessages.Tracepoint + " " + getNumber() + //$NON-NLS-1$
+		       ", " + EventMessages.Record + " " + fRecNo; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
     @ConfinedToDsfExecutor("")