diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
index 8a6572a79e3..cfedda90b8c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
@@ -794,4 +794,12 @@ public class CEditor extends TextEditor implements ISelectionChangedListener {
 	protected void setOutlinerContextMenuId(String menuId) {
 		fOutlinerContextMenuId = menuId;
 	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.editors.text.TextEditor#initializeKeyBindingScopes()
+	 */
+	protected void initializeKeyBindingScopes() {
+		setKeyBindingScopes(new String [] { "org.eclipse.cdt.ui.cEditorScope" } );
+	}
+
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties
index 0ae9b500dfd..3fcdcfe580b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties
@@ -110,11 +110,11 @@ RunToLine.error.message1=Unable to process run to line request.
 
 Comment.label=&Comment
 Comment.tooltip=Comment the Selected Lines
-Comment.description=Turn the selected lines into Java comments
+Comment.description=Turn the selected lines into C // style comments
 
 Uncomment.label=Uncommen&t
-Uncomment.tooltip=Uncomment the Selected Java Comment Lines
-Uncomment.description=Uncomment the selected Java comment lines
+Uncomment.tooltip=Uncomment the Selected C // comment Lines
+Uncomment.description=Uncomment the selected C // comment lines
 
 Format.label=F&ormat
 Format.tooltip=Format the Selected Text