diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/ToolTipContentProvider.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/IToolTipContentProvider.java
similarity index 81%
rename from plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/ToolTipContentProvider.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/IToolTipContentProvider.java
index c9c2f6a..7486a9e 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/ToolTipContentProvider.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/IToolTipContentProvider.java
@@ -3,7 +3,7 @@ package com.minres.scviewer.database.ui.swt;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Composite;
 
-public interface ToolTipContentProvider {
+public interface IToolTipContentProvider {
 	
 	public boolean createContent(Composite parent, Point pt);
 
diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/ToolTipHelpTextProvider.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/IToolTipHelpTextProvider.java
similarity index 83%
rename from plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/ToolTipHelpTextProvider.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/IToolTipHelpTextProvider.java
index 524751c..cc059db 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/ToolTipHelpTextProvider.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/IToolTipHelpTextProvider.java
@@ -2,7 +2,7 @@ package com.minres.scviewer.database.ui.swt;
 
 import org.eclipse.swt.widgets.Widget;
 
-public interface ToolTipHelpTextProvider {
+public interface IToolTipHelpTextProvider {
 	/**
 	 * Get help text
 	 * @param widget the widget that is under help
diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ToolTipHandler.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ToolTipHandler.java
index 9c62d72..7371185 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ToolTipHandler.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ToolTipHandler.java
@@ -14,8 +14,8 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Widget;
 
 import com.minres.scviewer.database.ui.swt.Constants;
-import com.minres.scviewer.database.ui.swt.ToolTipContentProvider;
-import com.minres.scviewer.database.ui.swt.ToolTipHelpTextProvider;
+import com.minres.scviewer.database.ui.swt.IToolTipContentProvider;
+import com.minres.scviewer.database.ui.swt.IToolTipHelpTextProvider;
 
 class ToolTipHandler {
 
@@ -71,8 +71,8 @@ class ToolTipHandler {
 			}
 			private void createHoverWindow(final Control control, Event event) {
 				Object o = control.getData(Constants.CONTENT_PROVIDER_TAG);
-				if(o instanceof ToolTipContentProvider) {
-					ToolTipContentProvider provider = ((ToolTipContentProvider)o);
+				if(o instanceof IToolTipContentProvider) {
+					IToolTipContentProvider provider = ((IToolTipContentProvider)o);
 					Point pt = new Point (event.x, event.y);
 					tipPosition = control.toDisplay(pt);
 					if (shell != null  && !shell.isDisposed ()) shell.dispose ();
@@ -104,7 +104,7 @@ class ToolTipHandler {
 		 */
 		control.addHelpListener(event -> {
 			if (tipWidget == null) return;
-			ToolTipHelpTextProvider handler = (ToolTipHelpTextProvider)tipWidget.getData(Constants.HELP_PROVIDER_TAG);
+			IToolTipHelpTextProvider handler = (IToolTipHelpTextProvider)tipWidget.getData(Constants.HELP_PROVIDER_TAG);
 			if (handler == null) return;
 			String text = handler.getHelpText(tipWidget);
 			if (text == null) return;
diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java
index 1ff4cc5..d6ede73 100644
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java
@@ -93,8 +93,8 @@ import com.minres.scviewer.database.ui.TrackEntry;
 import com.minres.scviewer.database.ui.TrackEntry.ValueDisplay;
 import com.minres.scviewer.database.ui.TrackEntry.WaveDisplay;
 import com.minres.scviewer.database.ui.swt.Constants;
-import com.minres.scviewer.database.ui.swt.ToolTipContentProvider;
-import com.minres.scviewer.database.ui.swt.ToolTipHelpTextProvider;
+import com.minres.scviewer.database.ui.swt.IToolTipContentProvider;
+import com.minres.scviewer.database.ui.swt.IToolTipHelpTextProvider;
 import com.minres.scviewer.database.ui.swt.WaveformViewFactory;
 import com.minres.scviewer.e4.application.Messages;
 import com.minres.scviewer.e4.application.internal.status.WaveStatusBarControl;
@@ -393,13 +393,13 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 		});
 		waveformPane.addDisposeListener(this);
 
-		waveformPane.getWaveformControl().setData(Constants.HELP_PROVIDER_TAG, new ToolTipHelpTextProvider() {
+		waveformPane.getWaveformControl().setData(Constants.HELP_PROVIDER_TAG, new IToolTipHelpTextProvider() {
 			@Override
 			public String getHelpText(Widget widget) {
 				return "Waveform pane: press F2 to set the focus to the tooltip";
 			}
 		});
-		waveformPane.getWaveformControl().setData(Constants.CONTENT_PROVIDER_TAG, new ToolTipContentProvider() {
+		waveformPane.getWaveformControl().setData(Constants.CONTENT_PROVIDER_TAG, new IToolTipContentProvider() {
 			@Override
 			public boolean createContent(Composite parent, Point pt) {
 				if(!showHover) return false;