diff --git a/extensions/merge-conflict/package.nls.json b/extensions/merge-conflict/package.nls.json
index 3310dac7e21cceb4437cc3bd790cbc120d786441..3353f40b31649596b1c0cb567f433ed67971b9d8 100644
--- a/extensions/merge-conflict/package.nls.json
+++ b/extensions/merge-conflict/package.nls.json
@@ -14,10 +14,10 @@
 	"command.compare": "Compare Current Conflict",
 	"config.title": "Merge Conflict",
 	"config.autoNavigateNextConflictEnabled": "Whether to automatically navigate to the next merge conflict after resolving a merge conflict.",
-	"config.codeLensEnabled": "Create a Code Lens for merge conflict blocks within editor.",
+	"config.codeLensEnabled": "Create a CodeLens for merge conflict blocks within editor.",
 	"config.decoratorsEnabled": "Create decorators for merge conflict blocks within editor.",
 	"config.diffViewPosition": "Controls where the diff view should be opened when comparing changes in merge conflicts.",
 	"config.diffViewPosition.current": "Open the diff view in the current editor group.",
 	"config.diffViewPosition.beside": "Open the diff view next to the current editor group.",
 	"config.diffViewPosition.below": "Open the diff view below the current editor group."
-}
\ No newline at end of file
+}
diff --git a/src/vs/editor/common/view/editorColorRegistry.ts b/src/vs/editor/common/view/editorColorRegistry.ts
index 83cb17204f65e30fb0291c94bce693672ee1868e..d8645e68049cc56d8834234aaca933e366fab822 100644
--- a/src/vs/editor/common/view/editorColorRegistry.ts
+++ b/src/vs/editor/common/view/editorColorRegistry.ts
@@ -30,7 +30,7 @@ export const editorActiveLineNumber = registerColor('editorLineNumber.activeFore
 
 export const editorRuler = registerColor('editorRuler.foreground', { dark: '#5A5A5A', light: Color.lightgrey, hc: Color.white }, nls.localize('editorRuler', 'Color of the editor rulers.'));
 
-export const editorCodeLensForeground = registerColor('editorCodeLens.foreground', { dark: '#999999', light: '#999999', hc: '#999999' }, nls.localize('editorCodeLensForeground', 'Foreground color of editor code lenses'));
+export const editorCodeLensForeground = registerColor('editorCodeLens.foreground', { dark: '#999999', light: '#999999', hc: '#999999' }, nls.localize('editorCodeLensForeground', 'Foreground color of editor CodeLens'));
 
 export const editorBracketMatchBackground = registerColor('editorBracketMatch.background', { dark: '#0064001a', light: '#0064001a', hc: '#0064001a' }, nls.localize('editorBracketMatchBackground', 'Background color behind matching brackets'));
 export const editorBracketMatchBorder = registerColor('editorBracketMatch.border', { dark: '#888', light: '#B9B9B9', hc: contrastBorder }, nls.localize('editorBracketMatchBorder', 'Color for matching brackets boxes'));
diff --git a/src/vs/editor/contrib/codelens/codelensController.ts b/src/vs/editor/contrib/codelens/codelensController.ts
index 2f2721cf15053935fd3564162269db1647bd01d2..b561522a2255862acaf87e7acda0cba04d7ccb49 100644
--- a/src/vs/editor/contrib/codelens/codelensController.ts
+++ b/src/vs/editor/contrib/codelens/codelensController.ts
@@ -419,8 +419,8 @@ registerEditorAction(class ShowLensesInCurrentLine extends EditorAction {
 		super({
 			id: 'codelens.showLensesInCurrentLine',
 			precondition: EditorContextKeys.hasCodeLensProvider,
-			label: localize('showLensOnLine', "Show Code Lens Commands For Current Line"),
-			alias: 'Show Code Lens Commands For Current Line',
+			label: localize('showLensOnLine', "Show CodeLens Commands For Current Line"),
+			alias: 'Show CodeLens Commands For Current Line',
 		});
 	}