diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF
index 9344ede217b..e7dbfaf0296 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.cdt.dsf.gdb;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.dsf.gdb.internal.GdbPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/actions/IReverseResumeHandler.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/actions/IReverseResumeHandler.java
deleted file mode 100644
index deab3d75853..00000000000
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/actions/IReverseResumeHandler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Ericsson 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:
- *     Ericsson - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.dsf.gdb.actions;
-
-import org.eclipse.jface.viewers.ISelection;
-
-/**
- * @since 2.0
- * @deprecated This interface was synchronous.  I has been replaced with the asynchronous
- *             interface @{link org.eclipse.cdt.debug.core.model.IReverseResumeHandler}
- */
-@Deprecated
-public interface IReverseResumeHandler {
-	public boolean canReverseResume(ISelection debugContext);
-	public void reverseResume(ISelection debugContext);
-}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/actions/IReverseStepIntoHandler.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/actions/IReverseStepIntoHandler.java
deleted file mode 100644
index 52262e9d73f..00000000000
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/actions/IReverseStepIntoHandler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Ericsson 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:
- *     Ericsson - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.dsf.gdb.actions;
-
-import org.eclipse.jface.viewers.ISelection;
-
-/**
- * @since 2.0
- * @deprecated This interface was synchronous.  I has been replaced with the asynchronous
- *             interface @{link org.eclipse.cdt.debug.core.model.IReverseStepIntoHandler}
- */
-@Deprecated
-public interface IReverseStepIntoHandler {
-	public boolean canReverseStepInto(ISelection debugContext);
-	public void reverseStepInto(ISelection debugContext);
-}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/actions/IReverseStepOverHandler.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/actions/IReverseStepOverHandler.java
deleted file mode 100644
index 5e07013e04b..00000000000
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/actions/IReverseStepOverHandler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Ericsson 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:
- *     Ericsson - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.dsf.gdb.actions;
-
-import org.eclipse.jface.viewers.ISelection;
-
-/**
- * @since 2.0
- * @deprecated This interface was synchronous.  I has been replaced with the asynchronous
- *             interface @{link org.eclipse.cdt.debug.core.model.IReverseStepOverHandler}
- */
-@Deprecated
-public interface IReverseStepOverHandler {
-	public boolean canReverseStepOver(ISelection debugContext);
-	public void reverseStepOver(ISelection debugContext);
-}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/actions/IReverseToggleHandler.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/actions/IReverseToggleHandler.java
deleted file mode 100644
index 4e59430a433..00000000000
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/actions/IReverseToggleHandler.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Ericsson 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:
- *     Ericsson - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.dsf.gdb.actions;
-
-import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext;
-import org.eclipse.jface.viewers.ISelection;
-
-/**
- * @since 2.0
- * @deprecated This interface was synchronous.  I has been replaced with the asynchronous
- *             interface @{link org.eclipse.cdt.debug.core.model.IReverseToggleHandler}
- */
-@Deprecated
-public interface IReverseToggleHandler {
-	public boolean canToggleReverse(ISelection debugContext);
-	public void toggleReverse(ISelection debugContext);
-	public boolean isReverseToggled(ISelection debugContext);
-	public boolean isReverseToggled(ICommandControlDMContext debugContext);
-
-}
\ No newline at end of file
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/actions/IUncallHandler.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/actions/IUncallHandler.java
deleted file mode 100644
index 0c038b6d62c..00000000000
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/actions/IUncallHandler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Ericsson 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:
- *     Ericsson - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.dsf.gdb.actions;
-
-import org.eclipse.jface.viewers.ISelection;
-
-/**
- * @since 2.0
- * @deprecated This interface was synchronous.  I has been replaced with the asynchronous
- *             interface @{link org.eclipse.cdt.debug.core.model.IUncallHandler}
- */
-@Deprecated
-public interface IUncallHandler {
-	public boolean canUncall(ISelection debugContext);
-	public void uncall(ISelection debugContext);
-}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java
index e676e65198a..50937ddd542 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java
@@ -213,7 +213,7 @@ public class GdbLaunchDelegate extends LaunchConfigurationDelegate
 	/**
 	 * Method used to check that the project, program and binary are correct.
 	 * Can be overridden to avoid checking certain things.
-	 * @since 2.1
+	 * @since 3.0
 	 */
 	protected IPath checkBinaryDetails(final ILaunchConfiguration config) throws CoreException {
 		// First verify we are dealing with a proper project.
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java
index 082ad1c1663..b3156b1bf4c 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java
@@ -46,7 +46,7 @@ public class LaunchUtils {
 
 	/**
 	 * A prefix that we use to indicate that a GDB version is for MAC OS
-	 * @since 2.1
+	 * @since 3.0
 	 */
 	public static final String MACOS_GDB_MARKER = "APPLE"; //$NON-NLS-1$
 	
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_0.java
index 23b20a29aaa..6a3c5eb2108 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_0.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_0.java
@@ -51,7 +51,7 @@ import org.osgi.framework.BundleContext;
 /**
  * Initial breakpoint service implementation.
  * Implements the IBreakpoints interface.
- * @since 2.1
+ * @since 3.0
  */
 public class GDBBreakpoints_7_0 extends AbstractDsfService implements IBreakpoints
 {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBTraceControl_7_1.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBTraceControl_7_1.java
index 6bc9fdc7b03..f49c5b4f7de 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBTraceControl_7_1.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBTraceControl_7_1.java
@@ -43,7 +43,7 @@ import org.osgi.framework.BundleContext;
  * This class implements the ITraceControl interface which gives access
  * to the debugger's tracing functionality.
  * 
- * @since 2.1
+ * @since 3.0
  */
 public class GDBTraceControl_7_1 extends AbstractDsfService implements IGDBTraceControl, ICachingService {
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java
index 6ebc855c395..4dffc283244 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java
@@ -160,7 +160,7 @@ public class GdbDebugServicesFactory extends AbstractDsfDebugServicesFactory {
 		return new MIStack(session);
 	}
 	
-	/** @since 2.1 */
+	/** @since 3.0 */
 	protected IGDBTraceControl createTraceControlService(DsfSession session, ILaunchConfiguration config) {
 		// This service is available for GDB 7.1. But until that GDB is itself available
 		// there is a pre-release that has a version of 6.8.50.20090414
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IGDBTraceControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IGDBTraceControl.java
index 5526e734adb..f4ed53870a9 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IGDBTraceControl.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IGDBTraceControl.java
@@ -22,7 +22,7 @@ import org.eclipse.cdt.dsf.service.IDsfService;
  * The TraceControl service provides access to the debugger Tracing functionality.
  * It is used to do such things as start and stop tracing.
  * 
- * @since 2.1
+ * @since 3.0
  */
 public interface IGDBTraceControl extends IDsfService {
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBBackendCLIProcess.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBBackendCLIProcess.java
index f4c5fc77f39..1d54e1dca13 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBBackendCLIProcess.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBBackendCLIProcess.java
@@ -59,7 +59,7 @@ public class GDBBackendCLIProcess extends MIBackendCLIProcess {
    }
    
    /**
-    * @since 2.1
+    * @since 3.0
     */
    @Override
    protected boolean isMissingSecondaryPromptCommand(String operation) {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBExpressions.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBExpressions.java
index 33e002f73d9..1161feb8a95 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBExpressions.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBExpressions.java
@@ -17,7 +17,7 @@ import org.eclipse.cdt.dsf.service.DsfSession;
 /**
  * Specific ExpressionService for MacOS
  * 
- * @since 2.1
+ * @since 3.0
  */
 public class MacOSGDBExpressions extends MIExpressions {
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBProcesses.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBProcesses.java
index 71cd2a1db8a..046f46cb800 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBProcesses.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBProcesses.java
@@ -22,7 +22,7 @@ import org.eclipse.cdt.dsf.mi.service.MIProcesses;
 import org.eclipse.cdt.dsf.service.DsfServiceEventHandler;
 import org.eclipse.cdt.dsf.service.DsfSession;
 
-/** @since 2.1 */
+/** @since 3.0 */
 public class MacOSGDBProcesses extends GDBProcesses {
 
 	public MacOSGDBProcesses(DsfSession session) {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBRunControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBRunControl.java
index 8808f059e4f..296247358b2 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBRunControl.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBRunControl.java
@@ -23,7 +23,7 @@ import org.eclipse.cdt.dsf.service.DsfSession;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
-/** @since 2.1 */
+/** @since 3.0 */
 public class MacOSGDBRunControl extends GDBRunControl {
 
 	public MacOSGDBRunControl(DsfSession session) {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBVariableManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBVariableManager.java
index e76de9d3618..36d347df01d 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBVariableManager.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBVariableManager.java
@@ -21,7 +21,7 @@ import org.eclipse.cdt.dsf.service.DsfSession;
 /**
  * Specific VariableManager for MacOS
  *   
- * @since 2.1
+ * @since 3.0
  */
 public class MacOSGDBVariableManager extends MIVariableManager {
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGdbDebugServicesFactory.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGdbDebugServicesFactory.java
index 834f30feb79..37a876d482c 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGdbDebugServicesFactory.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGdbDebugServicesFactory.java
@@ -18,7 +18,7 @@ import org.eclipse.cdt.dsf.debug.service.IRunControl;
 import org.eclipse.cdt.dsf.gdb.service.GdbDebugServicesFactory;
 import org.eclipse.cdt.dsf.service.DsfSession;
 
-/** @since 2.1 */
+/** @since 3.0 */
 public class MacOSGdbDebugServicesFactory extends GdbDebugServicesFactory {
 
 	// Mac OS has it's own version of GDB, which does not follow the standard GDB version
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointDMData.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointDMData.java
index 53db39a2cfa..1010d226f3c 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointDMData.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointDMData.java
@@ -40,7 +40,7 @@ public class MIBreakpointDMData implements IBreakpointDMData {
 
 	// Breakpoint types
 	public static enum MIBreakpointNature { UNKNOWN, BREAKPOINT, WATCHPOINT, CATCHPOINT, 
-		                                    /** @since 2.1*/ TRACEPOINT };
+		                                    /** @since 3.0*/ TRACEPOINT };
 	private final MIBreakpointNature fNature;
 
 
@@ -233,14 +233,14 @@ public class MIBreakpointDMData implements IBreakpointDMData {
 	}
 
 	/**
-	 * @since 2.1
+	 * @since 3.0
 	 */
 	public int getPassCount() {
 		return fBreakpoint.getPassCount();
 	}
 	
 	/**
-	 * @since 2.1
+	 * @since 3.0
 	 */
 	public String getCommands() {
 		return fBreakpoint.getCommands();
@@ -298,7 +298,7 @@ public class MIBreakpointDMData implements IBreakpointDMData {
 	}
 	
 	/**
-	 * @since 2.1
+	 * @since 3.0
 	 */
 	public void setPassCount(int count) {
 		fBreakpoint.setPassCount(count);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java
index 4bca623aad6..9dc604968e6 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java
@@ -66,7 +66,7 @@ public class MIBreakpoints extends AbstractDsfService implements IBreakpoints
     public static final String BREAKPOINT      = "breakpoint";          //$NON-NLS-1$
     public static final String WATCHPOINT      = "watchpoint";          //$NON-NLS-1$
     public static final String CATCHPOINT      = "catchpoint";          //$NON-NLS-1$
-    /** @since 2.1 */
+    /** @since 3.0 */
     public static final String TRACEPOINT      = "tracepoint";          //$NON-NLS-1$
 
     // Basic set of breakpoint attribute markers
@@ -76,10 +76,10 @@ public class MIBreakpoints extends AbstractDsfService implements IBreakpoints
     public static final String ADDRESS       = PREFIX + ".address";     //$NON-NLS-1$
     public static final String CONDITION     = PREFIX + ".condition";   //$NON-NLS-1$
     public static final String IGNORE_COUNT  = PREFIX + ".ignoreCount"; //$NON-NLS-1$
-    /** @since 2.1 */
+    /** @since 3.0 */
     public static final String PASS_COUNT    = PREFIX + ".passCount"; //$NON-NLS-1$
     public static final String IS_ENABLED    = PREFIX + ".isEnabled";   //$NON-NLS-1$
-    /** @since 2.1 */
+    /** @since 3.0 */
     public static final String COMMANDS      = PREFIX + ".commands";     //$NON-NLS-1$
 
     // Basic set of watchpoint attribute markers
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java
index 33e1a65e1c4..6d4800dd156 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java
@@ -467,7 +467,7 @@ public class MIExpressions extends AbstractDsfService implements IExpressions, I
 	 * Creates the MI variable manager to be used by this expression service.
 	 * Overriding classes may override to provide a custom services tracker. 
 	 * 
-	 * @since 2.1
+	 * @since 3.0
 	 */
 	protected MIVariableManager createMIVariableManager() {
 	    return new MIVariableManager(getSession(), getServicesTracker());
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java
index 79031ac7c32..dc7fa2cf001 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java
@@ -917,14 +917,14 @@ public class MIVariableManager implements ICommandControl {
 	/**
 	 * Method to allow to override the MIVariableObject creation
 	 * 
-     * @since 2.1
+     * @since 3.0
      */
 	protected MIVariableObject createVariableObject(VariableObjectId id, MIVariableObject parentObj) {
 	    return new MIVariableObject(id, parentObj);
 	}
 	
 	/**
-     * @since 2.1
+     * @since 3.0
      */
 	public class MIRootVariableObject extends MIVariableObject {
 
@@ -1158,7 +1158,7 @@ public class MIVariableManager implements ICommandControl {
     /**
  	 * Method to allow to override the MIRootVariableObject creation.
 	 *
-     * @since 2.1
+     * @since 3.0
      */
 	protected MIRootVariableObject createRootVariableObject(VariableObjectId id) {
 	    return new MIRootVariableObject(id);
@@ -1175,7 +1175,7 @@ public class MIVariableManager implements ICommandControl {
 	 * Note that if no frameContext is specified (only Execution, or even only Container), which can
 	 * characterize a global variable for example, we will only use the available information.
 	 * 
-	 * @since 2.1
+	 * @since 3.0
 	 */
 	public class VariableObjectId {
 		// We don't use the expression context because it is not safe to compare them
@@ -1249,7 +1249,7 @@ public class MIVariableManager implements ICommandControl {
     /**
  	 * Method to allow to override the VariableObjectId creation.
 	 *
-     * @since 2.1
+     * @since 3.0
      */
 	protected VariableObjectId createVariableObjectId() {
 	    return new VariableObjectId();
@@ -1375,28 +1375,28 @@ public class MIVariableManager implements ICommandControl {
 	}
 
     /**
-     * @since 2.1
+     * @since 3.0
      */
 	protected DsfSession getSession() {
 	    return fSession;
 	}
 	
 	/**
-     * @since 2.1
+     * @since 3.0
      */
 	protected ICommandControl getCommandControl() {
 	    return fCommandControl;
 	}
 	
     /**
-     * @since 2.1
+     * @since 3.0
      */
 	protected void rootVariableUpdated(MIRootVariableObject rootObj) {
 	    updatedRootList.add(rootObj);
 	}
 	
     /**
-     * @since 2.1
+     * @since 3.0
      */
 	protected Map<VariableObjectId, MIVariableObject> getLRUCache() {
 		return lruVariableList;
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java
index 5b4e5f26b4f..2201da7b6d5 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java
@@ -313,7 +313,7 @@ public abstract class AbstractCLIProcess extends Process
      * does not send the secondary prompt for, but should.                                                   
      * If so, we'll need to pretend we are receiving the secondary prompt.
      *                                     
-     * @since 2.1
+     * @since 3.0
      */                                                                                                        
     protected boolean isMissingSecondaryPromptCommand(String operation) {
     	return false;
@@ -355,7 +355,7 @@ public abstract class AbstractCLIProcess extends Process
     }
     
     /**
-	 * @since 2.1
+	 * @since 3.0
 	 */
     public boolean inMissingSecondaryPrompt() {
         return fPrompt == PromptType.IN_SECONDARY_PROMPT_MISSING;
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIPasscount.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIPasscount.java
index 7a4d4712db8..c2023e7cb4a 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIPasscount.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIPasscount.java
@@ -19,7 +19,7 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
  * time that tracepoint is hit.  If no passcount is given, the trace experiment will run until stopped 
  * explicitly by the user.
 
- * @since 2.1
+ * @since 3.0
  */
 public class CLIPasscount extends CLICommand<MIInfo> {
     public CLIPasscount(IBreakpointsTargetDMContext ctx, int breakpoint, int passcount) {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIRecord.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIRecord.java
index cac4859b98b..26bf9fa71c3 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIRecord.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIRecord.java
@@ -16,7 +16,7 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
 /**
  * This command turns on on off the recording of "Process Record and Replay".
  * 
- * @since 2.1
+ * @since 3.0
  */
 public class CLIRecord extends CLICommand<MIInfo> {
 	public CLIRecord(ICommandControlDMContext ctx, boolean enable) {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLITrace.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLITrace.java
index 8c038652544..7d01164105d 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLITrace.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLITrace.java
@@ -17,7 +17,7 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput;
 
 /**
  * This command creates a tracepoint.
- * @since 2.1
+ * @since 3.0
  */
 public class CLITrace extends CLICommand<CLITraceInfo> {
 	public CLITrace(IBreakpointsTargetDMContext ctx, String location) {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakInsert.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakInsert.java
index 9242cd17d19..dd6f2b7d5be 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakInsert.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakInsert.java
@@ -77,7 +77,7 @@ public class MIBreakInsert extends MICommand<MIBreakInsertInfo>
 	 * This constructor allows to specify if the breakpoint should actually be
 	 * a tracepoint (this will only work starting with GDB 7.1)
 	 * It also includes if a breakpoint should be created disabled (starting GDB 7.0)
-	 * @since 2.1
+	 * @since 3.0
 	 */
 	public MIBreakInsert(IBreakpointsTargetDMContext ctx, boolean isTemporary, boolean isHardware,
 			String condition, int ignoreCount, String line, int tid, boolean disabled, boolean isTracepoint) {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakPasscount.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakPasscount.java
index e24c1bf0954..90db3a3ada5 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakPasscount.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakPasscount.java
@@ -24,7 +24,7 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
  *  
  * Available starting with GDB 7.1
  * 
- * @since 2.1
+ * @since 3.0
  */
  
 public class MIBreakPasscount extends MICommand<MIInfo>
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIExecContinue.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIExecContinue.java
index 6386100af03..1d87d1cbb80 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIExecContinue.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIExecContinue.java
@@ -37,7 +37,7 @@ public class MIExecContinue extends MICommand<MIInfo>
     }
 
     /**
-	 * @since 2.1
+	 * @since 3.0
 	 */
     public MIExecContinue(IExecutionDMContext dmc, String groupId) {
     	this(dmc, false, groupId);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIExecInterrupt.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIExecInterrupt.java
index 74766792449..66bee5c035f 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIExecInterrupt.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIExecInterrupt.java
@@ -42,7 +42,7 @@ public class MIExecInterrupt extends MICommand<MIInfo>
     }
     
     /**
-	 * @since 2.1
+	 * @since 3.0
 	 */
     public MIExecInterrupt(IExecutionDMContext dmc, String groupId) {
     	this(dmc, false, groupId);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetPagination.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetPagination.java
index 003e4ed9dbf..39895f8124e 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetPagination.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetPagination.java
@@ -16,7 +16,7 @@ import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommand
  * 
  * -gdb-set pagination [on | off]
  *     
- * @since 2.1
+ * @since 3.0
  */
 public class MIGDBSetPagination extends MIGDBSet 
 {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetTargetAsync.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetTargetAsync.java
index 1502f0c26aa..e86036d3248 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetTargetAsync.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetTargetAsync.java
@@ -16,7 +16,7 @@ import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommand
  * 
  * -gdb-set target-async [on | off]
  * 
- * @since 2.1
+ * @since 3.0
  */
 public class MIGDBSetTargetAsync extends MIGDBSet 
 {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetSelectTFile.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetSelectTFile.java
index c2dcc797dae..39f9e71e4a6 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetSelectTFile.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetSelectTFile.java
@@ -17,7 +17,7 @@ import org.eclipse.cdt.dsf.datamodel.IDMContext;
  * 
  * Available with GDB 7.1
  *
- * @since 2.1
+ * @since 3.0
  */
 public class MITargetSelectTFile extends MITargetSelect {
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceDefineVariable.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceDefineVariable.java
index e8d8a6f5b31..9f318424399 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceDefineVariable.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceDefineVariable.java
@@ -22,7 +22,7 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
  * 
  * Available with GDB 7.1
  * 
- * @since 2.1
+ * @since 3.0
  */
 public class MITraceDefineVariable extends MICommand<MIInfo> {
 	public MITraceDefineVariable(ITraceTargetDMContext ctx, String varName) {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceListVariables.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceListVariables.java
index e5faf1f995f..ce4fe017a43 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceListVariables.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceListVariables.java
@@ -27,7 +27,7 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MITraceListVariablesInfo;
  * 
  * Available with GDB 7.1
  * 
- * @since 2.1
+ * @since 3.0
  */
 public class MITraceListVariables extends MICommand<MITraceListVariablesInfo> {
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceSave.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceSave.java
index eb4b852933d..7fdc8e59f51 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceSave.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceSave.java
@@ -22,7 +22,7 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
  * 
  * Available with GDB 7.1
  * 
- * @since 2.1
+ * @since 3.0
  */
 public class MITraceSave extends MICommand<MIInfo> {
 	
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceStart.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceStart.java
index ecdf458270c..c2e736e7866 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceStart.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceStart.java
@@ -20,7 +20,7 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
  * 
  * Available with GDB 7.1
  * 
- * @since 2.1
+ * @since 3.0
  */
 public class MITraceStart extends MICommand<MIInfo> {
 	public MITraceStart(ITraceTargetDMContext ctx) {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceStatus.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceStatus.java
index c591b86231c..13d67d57510 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceStatus.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceStatus.java
@@ -21,7 +21,7 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MITraceStatusInfo;
  * 
  * Available with GDB 7.1
  * 
- * @since 2.1
+ * @since 3.0
  */
 public class MITraceStatus extends MICommand<MITraceStatusInfo> {
 	public MITraceStatus(ITraceTargetDMContext ctx) {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceStop.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceStop.java
index a6180093273..3c89217dd65 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceStop.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITraceStop.java
@@ -22,7 +22,7 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MITraceStopInfo;
  * 
  * Available with GDB 7.1
  *  
- * @since 2.1
+ * @since 3.0
  */
 public class MITraceStop extends MICommand<MITraceStopInfo> {
 	public MITraceStop(ITraceTargetDMContext ctx) {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/macos/MacOSMIVarUpdate.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/macos/MacOSMIVarUpdate.java
index 8a0326836f8..602d3e26d23 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/macos/MacOSMIVarUpdate.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/macos/MacOSMIVarUpdate.java
@@ -33,7 +33,7 @@ import org.eclipse.cdt.dsf.mi.service.command.output.macos.MacOSMIVarUpdateInfo;
  *  It seems that for MacOS, we must use the full string for print-values, such as
  *  --all-values.
  * 
- * @since 2.1
+ * @since 3.0
  */
 public class MacOSMIVarUpdate extends MICommand<MacOSMIVarUpdateInfo> {
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLITraceInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLITraceInfo.java
index dc486e56c30..35cfc462be9 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLITraceInfo.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLITraceInfo.java
@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
  * 
  * ~"Tracepoint 2 at 0x4035a9: file /scratch/marc/test/src/main.cxx, line 109"
  * 
- * @since 2.1
+ * @since 3.0
  */
 public class CLITraceInfo extends MIInfo {
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakpoint.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakpoint.java
index 6d9b3923d94..1f8e74b6c56 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakpoint.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakpoint.java
@@ -242,7 +242,7 @@ public class MIBreakpoint  {
      * To know of fast vs slow tracepoint use {@link getType()} and look
      * for "tracepoint" or "fast tracepoint"
      * 
-	 * @since 2.1
+	 * @since 3.0
 	 */
     public boolean isTracepoint() {
         return isTpt;
@@ -252,7 +252,7 @@ public class MIBreakpoint  {
      * Returns the passcount of a tracepoint.  Will return 0 if this
      * breakpoint is not a tracepoint.
      * 
-	 * @since 2.1
+	 * @since 3.0
 	 */
     public int getPassCount() {
         return passcount;
@@ -261,7 +261,7 @@ public class MIBreakpoint  {
     /**
      * Set the passcount of a tracepoint.  Will not do anything if
      * this breakpoint is not a tracepoint.
-	 * @since 2.1
+	 * @since 3.0
 	 */
     public void setPassCount(int count) {
     	if (isTpt == false) return;
@@ -271,7 +271,7 @@ public class MIBreakpoint  {
     /**
      * Return the commands associated with this breakpoint (or tracepoint)
      * 
-	 * @since 2.1
+	 * @since 3.0
 	 */
     public String getCommands() {
         return commands;
@@ -280,7 +280,7 @@ public class MIBreakpoint  {
     /**
      * Sets the commands associated with this breakpoint (or tracepoint)
      * 
-	 * @since 2.1
+	 * @since 3.0
 	 */
     public void setCommands(String cmds) {
         commands = cmds;
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITraceListVariablesInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITraceListVariablesInfo.java
index 42287d25fe2..4c064c7454d 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITraceListVariablesInfo.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITraceListVariablesInfo.java
@@ -23,7 +23,7 @@ import java.util.List;
  *                        body=[variable={name="$trace_timestamp",initial="0"}
  *                              variable={name="$foo",initial="10",current="15"}]}
  *                          
- * @since 2.1
+ * @since 3.0
  */
 public class MITraceListVariablesInfo extends MIInfo {
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITraceStatusInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITraceStatusInfo.java
index ea634208829..c41e61de0a0 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITraceStatusInfo.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITraceStatusInfo.java
@@ -19,7 +19,7 @@ import org.eclipse.cdt.dsf.gdb.service.IGDBTraceControl.STOP_REASON_ENUM;
  * ^done,supported="1",running="0",stop-reason="request",frames="0",buffer-size="5242880",buffer-free="5242880"
  * ^done,supported="1",running="0",stop-reason="passcount",stopping-tracepoint="7",frames="3",buffer-size="5242880",buffer-free="5242862"
  * 
- * @since 2.1
+ * @since 3.0
  */
 public class MITraceStatusInfo extends MIInfo {
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITraceStopInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITraceStopInfo.java
index b4aa30540b5..85791963275 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITraceStopInfo.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITraceStopInfo.java
@@ -19,7 +19,7 @@ package org.eclipse.cdt.dsf.mi.service.command.output;
  * The output is therefore a subset of the output of the -trace-status command.  
  * The way MI fields are optional allows us to simply re-use the MITraceStatusInfo class
  * 
- * @since 2.1
+ * @since 3.0
  */
 public class MITraceStopInfo extends MITraceStatusInfo {
 	public MITraceStopInfo(MIOutput out) {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/macos/MacOSMIVarUpdateInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/macos/MacOSMIVarUpdateInfo.java
index a983fb9f455..68785c1909b 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/macos/MacOSMIVarUpdateInfo.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/macos/MacOSMIVarUpdateInfo.java
@@ -29,7 +29,7 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MIVarChange;
  * -var-update *
  * ^done,changelist=[varobj={name="var1",in_scope="true",type_changed="false"}],time={.....}
  * 
- * @since 2.1
+ * @since 3.0
  */
 public class MacOSMIVarUpdateInfo extends MIInfo {