diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
index 18d96189d65..e0df741a76a 100644
--- a/src/vs/workbench/browser/workbench.contribution.ts
+++ b/src/vs/workbench/browser/workbench.contribution.ts
@@ -288,11 +288,11 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 				'markdownDescription': localize('exclude', "Configure [glob patterns](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options) for excluding files from the local file history. Changing this setting has no effect on existing local file history entries."),
 				'scope': ConfigurationScope.RESOURCE
 			},
-			'workbench.localHistory.mergePeriod': {
+			'workbench.localHistory.mergeWindow': {
 				'type': 'number',
 				'default': 10,
 				'minimum': 1,
-				'markdownDescription': localize('mergePeriod', "Configure an interval in seconds during which the last entry in local file history is replaced with the entry that is being added. This helps reduce the overall number of entries that are added, for example when auto save is enabled. This setting is only applied to entries that have the same source of origin. Changing this setting has no effect on existing local file history entries."),
+				'markdownDescription': localize('mergeWindow', "Configure an interval in seconds during which the last entry in local file history is replaced with the entry that is being added. This helps reduce the overall number of entries that are added, for example when auto save is enabled. This setting is only applied to entries that have the same source of origin. Changing this setting has no effect on existing local file history entries."),
 				'scope': ConfigurationScope.RESOURCE
 			},
 			'workbench.commandPalette.history': {
diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyHistoryService.ts b/src/vs/workbench/services/workingCopy/common/workingCopyHistoryService.ts
index ac98822ceb8..a331cf98eef 100644
--- a/src/vs/workbench/services/workingCopy/common/workingCopyHistoryService.ts
+++ b/src/vs/workbench/services/workingCopy/common/workingCopyHistoryService.ts
@@ -50,7 +50,7 @@ export class WorkingCopyHistoryModel {
 
 	private static readonly SETTINGS = {
 		MAX_ENTRIES: 'workbench.localHistory.maxFileEntries',
-		MERGE_PERIOD: 'workbench.localHistory.mergePeriod'
+		MERGE_PERIOD: 'workbench.localHistory.mergeWindow'
 	};
 
 	private entries: IWorkingCopyHistoryEntry[] = [];
diff --git a/src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyHistoryService.test.ts b/src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyHistoryService.test.ts
index 397264e7081..0630f52aae0 100644
--- a/src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyHistoryService.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyHistoryService.test.ts
@@ -638,7 +638,7 @@ flakySuite('WorkingCopyHistoryService', () => {
 
 		const workingCopy1 = new TestWorkingCopy(URI.file(testFile1Path));
 
-		service._configurationService.setUserConfiguration('workbench.localHistory.mergePeriod', 1);
+		service._configurationService.setUserConfiguration('workbench.localHistory.mergeWindow', 1);
 
 		const entry1 = await addEntry({ resource: workingCopy1.resource, source: 'test-source' }, CancellationToken.None);
 		assert.strictEqual(replaced, undefined);
@@ -653,7 +653,7 @@ flakySuite('WorkingCopyHistoryService', () => {
 		assert.strictEqual(entries.length, 1);
 		assertEntryEqual(entries[0], entry3);
 
-		service._configurationService.setUserConfiguration('workbench.localHistory.mergePeriod', undefined);
+		service._configurationService.setUserConfiguration('workbench.localHistory.mergeWindow', undefined);
 
 		await addEntry({ resource: workingCopy1.resource, source: 'test-source' }, CancellationToken.None);
 		await addEntry({ resource: workingCopy1.resource, source: 'test-source' }, CancellationToken.None);