diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.properties b/debug/org.eclipse.cdt.debug.ui/plugin.properties
index eba255ae1a4..322d0a9cbb9 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.properties
@@ -224,15 +224,10 @@ ReverseStepOver.label = Reverse Step Over
 Uncall.name = Uncall
 Uncall.description = Perform Uncall
 Uncall.label = Uncall
-ChangeTraceMethod.name = Set Reverse Debugging Trace Method
-ChangeTraceMethod.description = Set Reverse Debugging Trace Method
-ChangeTraceMethod.label = Set Reverse Debugging Trace Method
-SoftwareTrace.name = Enable Software Trace Method
-SoftwareTrace.description = Enable Software Trace Method for Reverse Debugging. Slow, but detailed reverse debugging method.
-SoftwareTrace.label = Enable Software Trace Method
-HardwareTrace.name = Enable Hardware Trace Method
-HardwareTrace.description = Enable Hardware Trace Method for Reverse Debugging. Fast, but less detailed reverse debugging method.
-HardwareTrace.label = Enable Hardware Trace Method
+SoftwareTrace.label = Enable Software Reverse Debugging
+SoftwareTrace.description = Enable Software Reverse Debugging. Slow, but detailed.
+HardwareTrace.label = Enable Hardware Reverse Debugging
+HardwareTrace.description = Enable Hardware Reverse Debugging. Fast, but less detailed.
 ReverseDisable.label = Disable Reverse Debugging
 ReverseDisable.description = Disable Reverse Debugging
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties
index eb63be1d7ef..4a570463e63 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2008, 2014 Ericsson and others.
+# Copyright (c) 2008, 2016 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
@@ -17,7 +17,7 @@ pluginName=GDB DSF Debugger Integration UI
 providerName=Eclipse CDT
 
 gdbPreferencePage.name = GDB
-reverseDebugPreferences.name = Reverse Debugging Preferences
+reverseDebugPreferences.name = Reverse Debugging
 
 launchTab.main.name=Main
 launchTab.arguments.name=Arguments
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.properties
index 500b80bcd30..8f69ef8f8d4 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.properties
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.properties
@@ -57,7 +57,7 @@ GdbDebugPreferencePage_Non_stop_mode=Non-stop mode (Note: Requires non-stop GDB)
 GdbDebugPreferencePage_Stop_on_startup_at=Stop on startup at:
 
 ReverseDebugPreferencePage_ReverseSettings=Settings for Reverse Debugging
-ReverseDebugPreferencePage_SelectHardwareTracingMethod=Hardware Tracing Method:
-ReverseDebugPreferencePage_GDBPreference=GDB Preference
-ReverseDebugPreferencePage_BranchTrace=Branch Trace
-ReverseDebugPreferencePage_ProcessorTrace=Processor Trace
+ReverseDebugPreferencePage_SelectHardwareTracingMethod=Hardware technology for instruction recording:
+ReverseDebugPreferencePage_GDBPreference=Automatic (let GDB choose)
+ReverseDebugPreferencePage_BranchTrace=Branch Trace Store
+ReverseDebugPreferencePage_ProcessorTrace=Intel(R) Processor Trace
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/ReverseDebugPreferencePage.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/ReverseDebugPreferencePage.java
index 7ad61fe2aff..81744ab62a7 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/ReverseDebugPreferencePage.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/ReverseDebugPreferencePage.java
@@ -25,7 +25,6 @@ public class ReverseDebugPreferencePage extends FieldEditorPreferencePage implem
 		super( GRID );
 		IPreferenceStore store = GdbUIPlugin.getDefault().getPreferenceStore();
 		setPreferenceStore( store );
-		setDescription( MessagesForPreferences.ReverseDebugPreferencePage_ReverseSettings );  
 	}
 
 	@Override