diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index a5fe7832684..b18f649bb5a 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -90,9 +90,6 @@ ActionDefinition.toggleComment.description= Comment/Uncomment the selected lines
 ActionDefinition.opendecl.name= Open Declaration
 ActionDefinition.opendecl.description= Open an editor on the selected element's declaration(s)
 
-ActionDefinition.opendef.name= Open Definition
-ActionDefinition.opendef.description= Open an editor on the selected element's definition 
-
 ActionDefinition.opencview.name= Show in C/C++ Project view
 ActionDefinition.opencview.description= Show the selected resource in the C/C++ Project view
 
@@ -586,4 +583,5 @@ ActionDefinition.selectNext.name = Select Next C/C++ Element
 ActionDefinition.selectPrevious.description = Expand the selection to enclosing C/C++ element
 ActionDefinition.selectPrevious.name = Select Previous C/C++ Element
 ActionDefinition.selectLast.description = Restore last selection in C/C++ editor
-ActionDefinition.selectLast.name = Restore Last C/C++ Selection
\ No newline at end of file
+ActionDefinition.selectLast.name = Restore Last C/C++ Selection
+overrideAnnotation.label = C/C++ Override indicators
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index bd268dc27ea..e437bd76637 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -1808,12 +1808,6 @@
             contextId="org.eclipse.cdt.ui.cViewScope"
             commandId="org.eclipse.cdt.ui.edit.open.include.browser"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
-     <!--removed, see bug 167162
-     <key
-            sequence="M1+F3"
-            contextId="org.eclipse.cdt.ui.cEditorScope"
-            commandId="org.eclipse.cdt.ui.edit.opendef"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/-->
      <key
             sequence="F3"
             contextId="org.eclipse.cdt.ui.cEditorScope"
@@ -2054,7 +2048,7 @@
 	    <!-- MSVS Edit.GoToDefinition -->
 		<key
 			sequence="F12"
-			commandId="org.eclipse.cdt.ui.edit.opendef"
+			commandId="org.eclipse.cdt.ui.edit.opendecl"
 			contextId="org.eclipse.cdt.ui.cEditorScope"
 			schemeId="org.eclipse.cdt.ui.visualstudio"/>
 	   
@@ -2263,12 +2257,6 @@
             categoryId="org.eclipse.cdt.ui.category.source"
             id="org.eclipse.cdt.ui.edit.text.c.indent">
       </command>
-      <command
-            name="%ActionDefinition.opendef.name"
-            categoryId="org.eclipse.cdt.ui.category.source"
-            description="%ActionDefinition.opendef.description"
-            id="org.eclipse.cdt.ui.edit.opendef">
-      </command>
       <command
             name="%ActionDefinition.opendecl.name"
             categoryId="org.eclipse.cdt.ui.category.source"
@@ -2624,7 +2612,7 @@
 	  </specification>
 	  <specification
             annotationType="org.eclipse.cdt.ui.overrideIndicator"
-            label="C/C++ Override indicators"
+            label="%overrideAnnotation.label"
 			annotationImageProvider ="org.eclipse.cdt.internal.ui.editor.OverrideIndicatorImageProvider"
             textPreferenceKey="overrideIndicator"
             textPreferenceValue="false"