diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/HistoryAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryAction.java
similarity index 93%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/HistoryAction.java
rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryAction.java
index fef719cdb7f..12b1a3aa0d3 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/HistoryAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryAction.java
@@ -23,12 +23,12 @@ import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels;
 /**
  * Action used for the include browser forward / backward buttons
  */
-public class HistoryAction extends Action {
+public class IBHistoryAction extends Action {
 
 	private IBViewPart fViewPart;
 	private ITranslationUnit fElement;
 	
-	public HistoryAction(IBViewPart viewPart, ITranslationUnit element) {
+	public IBHistoryAction(IBViewPart viewPart, ITranslationUnit element) {
         super("", AS_RADIO_BUTTON); //$NON-NLS-1$
 		fViewPart= viewPart;
 		fElement= element;		
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/HistoryDropDownAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryDropDownAction.java
similarity index 89%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/HistoryDropDownAction.java
rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryDropDownAction.java
index e61c47e2a72..59bcac0df94 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/HistoryDropDownAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryDropDownAction.java
@@ -23,7 +23,7 @@ import org.eclipse.cdt.core.model.ITranslationUnit;
 
 import org.eclipse.cdt.internal.ui.CPluginImages;
 
-public class HistoryDropDownAction extends Action implements IMenuCreator {
+public class IBHistoryDropDownAction extends Action implements IMenuCreator {
 	
 	public static class ClearHistoryAction extends Action {
 
@@ -45,7 +45,7 @@ public class HistoryDropDownAction extends Action implements IMenuCreator {
 	private IBViewPart fHierarchyView;
 	private Menu fMenu;
 	
-	public HistoryDropDownAction(IBViewPart view) {
+	public IBHistoryDropDownAction(IBViewPart view) {
 		fHierarchyView= view;
 		fMenu= null;
 		setToolTipText(IBMessages.HistoryDropDownAction_tooltip); 
@@ -73,7 +73,7 @@ public class HistoryDropDownAction extends Action implements IMenuCreator {
 		ITranslationUnit[] elements= fHierarchyView.getHistoryEntries();
 		addEntries(fMenu, elements);
 		new MenuItem(fMenu, SWT.SEPARATOR);
-		addActionToMenu(fMenu, new HistoryListAction(fHierarchyView));
+		addActionToMenu(fMenu, new IBHistoryListAction(fHierarchyView));
 		addActionToMenu(fMenu, new ClearHistoryAction(fHierarchyView));
 		return fMenu;
 	}
@@ -83,7 +83,7 @@ public class HistoryDropDownAction extends Action implements IMenuCreator {
 		
 		int min= Math.min(elements.length, RESULTS_IN_DROP_DOWN);
 		for (int i= 0; i < min; i++) {
-			HistoryAction action= new HistoryAction(fHierarchyView, elements[i]);
+			IBHistoryAction action= new IBHistoryAction(fHierarchyView, elements[i]);
 			action.setChecked(elements[i].equals(fHierarchyView.getInput()));
 			checked= checked || action.isChecked();
 			addActionToMenu(menu, action);
@@ -100,6 +100,6 @@ public class HistoryDropDownAction extends Action implements IMenuCreator {
 	}
 
 	public void run() {
-		(new HistoryListAction(fHierarchyView)).run();
+		(new IBHistoryListAction(fHierarchyView)).run();
 	}
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/HistoryListAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java
similarity index 98%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/HistoryListAction.java
rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java
index 7956bc55a37..73ec4aec227 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/HistoryListAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java
@@ -37,7 +37,7 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField;
 
-public class HistoryListAction extends Action {
+public class IBHistoryListAction extends Action {
 	
 	private class HistoryListDialog extends StatusDialog {
 		
@@ -161,7 +161,7 @@ public class HistoryListAction extends Action {
 	
 	private IBViewPart fView;
 	
-	public HistoryListAction(IBViewPart view) {
+	public IBHistoryListAction(IBViewPart view) {
 		fView= view;
 		setText(IBMessages.HistoryListAction_label); 
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java
index 440c164b81c..ce2807a562a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java
@@ -462,7 +462,7 @@ public class IBViewPart extends ViewPart
         tm.add(new Separator());
         tm.add(fIncludedByAction);
         tm.add(fIncludesToAction);
-        tm.add(new HistoryDropDownAction(this));
+        tm.add(new IBHistoryDropDownAction(this));
         tm.add(fRefresh);
 
         // local menu