diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/SharedMessages.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/SharedMessages.java
index 0bb507d..4b18d2b 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/SharedMessages.java
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/SharedMessages.java
@@ -57,12 +57,11 @@
 	
 	public static String FindReplaceAction_name;
 	public static String FindReplaceAction_tooltip;
-	
-	public static String FindNext_name;
-	public static String FindNext_tooltip;
-	
-	public static String FindPrevious_name;
-	public static String FindPrevious_tooltip;
+	public static String FindAction_name;
+	public static String FindNextMatchAction_name;
+	public static String FindNextMatchAction_tooltip;
+	public static String FindPreviousMatchAction_name;
+	public static String FindPreviousMatchAction_tooltip;
 	
 	public static String CollectionEditing_AddItem_label;
 	public static String CollectionEditing_CopyItem_label;
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/SharedMessages.properties b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/SharedMessages.properties
index 257819e..37f947d 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/SharedMessages.properties
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/SharedMessages.properties
@@ -55,12 +55,15 @@
 
 FindReplaceAction_name = &Find/Replace...
 # for compatibility 'label'
-FindReplaceAction_label = &Find/Replace...
-FindReplaceAction_tooltip = Find/Replace
-FindNext_name = Find Next
-FindNext_tooltip = Next Match
-FindPrevious_name = Find Previous
-FindPrevious_tooltip = Previous Match
+FindReplaceAction_label= &Find/Replace...
+FindReplaceAction_tooltip= Find/Replace
+FindAction_name = &Find...
+FindNextMatch_name= Find Next
+FindNextMatch_label= Find Next
+FindNextMatch_tooltip= Find Next Match
+FindPreviousMatch_name= Find Previous
+FindPreviousMatch_label= Find Previous
+FindPreviousMatch_tooltip= Find Previous Match
 
 CollectionEditing_AddItem_label = &Add
 CollectionEditing_CopyItem_label = &Copy
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/mpbv/PageBookBrowserPage.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/mpbv/PageBookBrowserPage.java
index f308c81..d2fc8e4 100644
--- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/mpbv/PageBookBrowserPage.java
+++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/mpbv/PageBookBrowserPage.java
@@ -163,14 +163,14 @@
 					new CommandContributionItemParameter(serviceLocator,
 							"Search.Next", SharedUIResources.FIND_NEXT_COMMAND_ID, null, //$NON-NLS-1$
 							ecommonsImages.getDescriptor(SharedUIResources.LOCTOOL_DOWN_IMAGE_ID), null, ecommonsImages.getDescriptor(SharedUIResources.LOCTOOL_DOWN_H_IMAGE_ID),
-							SharedMessages.FindNext_tooltip, null, null,
+							null, null, SharedMessages.FindNextMatchAction_tooltip,
 							SWT.PUSH, null, false ),
 					pageHandlers ));
 			this.toolBarManager.add(new HandlerContributionItem(
 					new CommandContributionItemParameter(serviceLocator,
 							"Search.Previous", SharedUIResources.FIND_PREVIOUS_COMMAND_ID, null, //$NON-NLS-1$
 							ecommonsImages.getDescriptor(SharedUIResources.LOCTOOL_UP_IMAGE_ID), null, ecommonsImages.getDescriptor(SharedUIResources.LOCTOOL_UP_H_IMAGE_ID),
-							SharedMessages.FindPrevious_tooltip, null, null,
+							null, null, SharedMessages.FindPreviousMatchAction_tooltip,
 							SWT.PUSH, null, false ),
 					pageHandlers ));