diff --git a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
index 54fcf01e4d9..7d1bd38ba36 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
@@ -69,6 +69,9 @@ export function getLocalExtensionTelemetryData(extension: ILocalExtension): any
 		id: getGalleryExtensionIdFromLocal(extension),
 		name: extension.manifest.name,
 		galleryId: null,
+		publisherId: extension.metadata ? extension.metadata.publisherId : null,
+		publisherName: extension.manifest.publisher,
+		publisherDisplayName: extension.metadata ? extension.metadata.publisherDisplayName : null,
 		dependencies: extension.manifest.extensionDependencies && extension.manifest.extensionDependencies.length > 0
 	};
 }
@@ -79,12 +82,9 @@ export function getLocalExtensionTelemetryData(extension: ILocalExtension): any
 		"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 		"name": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 		"galleryId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		"publisherId": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
-		"publisherName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
-		"publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
-		"galleryPublisherId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-		"galleryPublisherName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-		"galleryPublisherDisplayName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+		"publisherId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"publisherName": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"publisherDisplayName": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 		"dependencies": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 		"${include}": [
 			"${GalleryExtensionTelemetryData2}"
@@ -99,9 +99,6 @@ export function getGalleryExtensionTelemetryData(extension: IGalleryExtension):
 		publisherId: extension.publisherId,
 		publisherName: extension.publisher,
 		publisherDisplayName: extension.publisherDisplayName,
-		galleryPublisherId: extension.publisherId,
-		galleryPublisherName: extension.publisher,
-		galleryPublisherDisplayName: extension.publisherDisplayName,
 		dependencies: extension.properties.dependencies.length > 0,
 		...extension.telemetryData
 	};
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index 949c69abdca..25e95031280 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -423,8 +423,7 @@ function getTelemetryActivationEvent(extensionDescription: IExtensionDescription
 		"TelemetryActivationEvent" : {
 			"id": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 			"name": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-			"publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
-			"galleryPublisherDisplayName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+			"publisherDisplayName": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			"activationEvents": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			"isBuiltin": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 		}
@@ -433,7 +432,6 @@ function getTelemetryActivationEvent(extensionDescription: IExtensionDescription
 		id: extensionDescription.id,
 		name: extensionDescription.name,
 		publisherDisplayName: extensionDescription.publisher,
-		galleryPublisherDisplayName: extensionDescription.publisher,
 		activationEvents: extensionDescription.activationEvents ? extensionDescription.activationEvents.join(',') : null,
 		isBuiltin: extensionDescription.isBuiltin
 	};
diff --git a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
index 9c91aa72e6f..6e1bab75448 100644
--- a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
@@ -362,8 +362,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 						"id" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 						"name": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 						"isBuiltin": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-						"publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
-						"galleryPublisherDisplayName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+						"publisherDisplayName": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 						"themeId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
 					}
 				*/
@@ -372,7 +371,6 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 					name: themeData.extensionName,
 					isBuiltin: themeData.extensionIsBuiltin,
 					publisherDisplayName: themeData.extensionPublisher,
-					galleryPublisherDisplayName: themeData.extensionPublisher,
 					themeId: themeId
 				});
 				this.themeExtensionsActivated.set(key, true);