diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts
index 1e473ef61..8d9b59666 100644
--- a/Extension/src/LanguageServer/client.ts
+++ b/Extension/src/LanguageServer/client.ts
@@ -59,7 +59,7 @@ import { CopilotCompletionContextFeatures, CopilotCompletionContextProvider } fr
 import { CustomConfigurationProvider1, getCustomConfigProviders, isSameProviderExtensionId } from './customProviders';
 import { DataBinding } from './dataBinding';
 import { cachedEditorConfigSettings, getEditorConfigSettings } from './editorConfig';
-import { CppSourceStr, clients, configPrefix, initializeIntervalTimer, isWritingCrashCallStack, updateLanguageConfigurations, usesCrashHandler, watchForCrashes } from './extension';
+import { CppIntelliSenseSourceStr, CppSourceStr, clients, configPrefix, initializeIntervalTimer, isWritingCrashCallStack, updateLanguageConfigurations, usesCrashHandler, watchForCrashes } from './extension';
 import { LocalizeStringParams, getLocaleId, getLocalizedString } from './localization';
 import { PersistentFolderState, PersistentState, PersistentWorkspaceState } from './persistentState';
 import { RequestCancelled, ServerCancelled, createProtocolFilter } from './protocolFilter';
@@ -155,7 +155,7 @@ function publishRefactorDiagnostics(params: PublishRefactorDiagnosticsParams): v
         const message: string = getLocalizedString(d.localizeStringParams);
         const diagnostic: vscode.Diagnostic = new vscode.Diagnostic(makeVscodeRange(d.range), message, d.severity);
         diagnostic.code = d.code;
-        diagnostic.source = CppSourceStr;
+        diagnostic.source = CppSourceStr + ": Refactor";
         if (d.relatedInformation) {
             diagnostic.relatedInformation = [];
             for (const info of d.relatedInformation) {
@@ -2696,7 +2696,7 @@ export class DefaultClient implements Client {
             const message: string = getLocalizedString(d.localizeStringParams);
             const diagnostic: vscode.Diagnostic = new vscode.Diagnostic(makeVscodeRange(d.range), message, d.severity);
             diagnostic.code = d.code;
-            diagnostic.source = CppSourceStr;
+            diagnostic.source = CppIntelliSenseSourceStr;
             if (d.relatedInformation) {
                 diagnostic.relatedInformation = [];
                 for (const info of d.relatedInformation) {
diff --git a/Extension/src/LanguageServer/codeAnalysis.ts b/Extension/src/LanguageServer/codeAnalysis.ts
index 3e9bcec3e..45ddc2953 100644
--- a/Extension/src/LanguageServer/codeAnalysis.ts
+++ b/Extension/src/LanguageServer/codeAnalysis.ts
@@ -404,7 +404,7 @@ export function publishCodeAnalysisDiagnostics(params: PublishCodeAnalysisDiagno
         } else {
             diagnostic.code = d.code;
         }
-        diagnostic.source = CppSourceStr;
+        diagnostic.source = CppSourceStr + ": clang-tidy";
         codeActionDiagnosticInfo.push(codeAction);
         if (relatedCodeActions.length > 0) {
             codeActionDiagnosticInfo.push(...relatedCodeActions);
diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts
index 043678c63..deac4f550 100644
--- a/Extension/src/LanguageServer/extension.ts
+++ b/Extension/src/LanguageServer/extension.ts
@@ -45,6 +45,7 @@ import { makeLspRange, rangeEquals, showInstallCompilerWalkthrough } from './uti
 nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })();
 const localize: nls.LocalizeFunc = nls.loadMessageBundle();
 export const CppSourceStr: string = "C/C++";
+export const CppIntelliSenseSourceStr: string = CppSourceStr + ": IntelliSense";
 export const configPrefix: string = "C/C++: ";
 
 let prevMacCrashFile: string;
@@ -132,7 +133,7 @@ function isMissingIncludeDiagnostic(diagnostic: vscode.Diagnostic): boolean {
     if (diagnostic.code === null || diagnostic.code === undefined || !diagnostic.source) {
         return false;
     }
-    return diagnostic.code === missingIncludeCode && diagnostic.source === 'C/C++';
+    return diagnostic.code === missingIncludeCode && diagnostic.source === CppIntelliSenseSourceStr;
 }
 
 function sendActivationTelemetry(): void {