From 3151dce4375a12aea78913e104806902a5703daf Mon Sep 17 00:00:00 2001
From: ManikaDhiman <v-madhi@microsoft.com>
Date: Mon, 5 Oct 2020 16:44:57 -0700
Subject: [PATCH] Updated GP names

---
 .../mdm/policy-csp-admx-smartcard.md          |  10 +-
 .../mdm/policy-csp-admx-snmp.md               |   6 +-
 .../mdm/policy-csp-admx-tcpip.md              |  18 +-
 .../mdm/policy-csp-admx-tpm.md                |  20 +-
 ...y-csp-admx-userexperiencevirtualization.md | 228 +++++++++---------
 .../mdm/policy-csp-admx-w32time.md            |   4 +
 .../mdm/policy-csp-admx-wincal.md             |   4 +-
 .../mdm/policy-csp-admx-windowsconnectnow.md  |   6 +-
 .../mdm/policy-csp-admx-windowsmediaplayer.md |  22 +-
 .../mdm/policy-csp-admx-wininit.md            |   6 +-
 10 files changed, 164 insertions(+), 160 deletions(-)

diff --git a/windows/client-management/mdm/policy-csp-admx-smartcard.md b/windows/client-management/mdm/policy-csp-admx-smartcard.md
index 8f5ba3ad7f..11af8944fe 100644
--- a/windows/client-management/mdm/policy-csp-admx-smartcard.md
+++ b/windows/client-management/mdm/policy-csp-admx-smartcard.md
@@ -422,7 +422,7 @@ If you disable this policy setting, certificate propagation will not occur and t
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Turn on certificate propagation from smart card*
--   GP name: *CertPropEnabled*
+-   GP name: *CertPropEnabledString*
 -   GP path: *Windows Components\Smart Card*
 -   GP ADMX file name: *Smartcard.admx*
 
@@ -487,7 +487,7 @@ Available in Windows 10 Insider Preview Build 20185. This policy setting allows
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Configure root certificate clean up*
--   GP name: *RootCertificateCleanupOption*
+-   GP name: *CertPropRootCleanupString*
 -   GP path: *Windows Components\Smart Card*
 -   GP ADMX file name: *Smartcard.admx*
 
@@ -559,7 +559,7 @@ If you disable this policy setting then root certificates will not be propagated
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Turn on root certificate propagation from smart card*
--   GP name: *EnableRootCertificatePropagation*
+-   GP name: *CertPropRootEnabledString*
 -   GP path: *Windows Components\Smart Card*
 -   GP ADMX file name: *Smartcard.admx*
 
@@ -1065,7 +1065,7 @@ If you disable this policy setting, Smart Card Plug and Play will be disabled an
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Turn on Smart Card Plug and Play service*
--   GP name: *EnableScPnP*
+-   GP name: *SCPnPEnabled*
 -   GP path: *Windows Components\Smart Card*
 -   GP ADMX file name: *Smartcard.admx*
 
@@ -1137,7 +1137,7 @@ If you disable this policy setting, a confirmation message will not be displayed
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Notify user of successful smart card driver installation*
--   GP name: *ScPnPNotification*
+-   GP name: *SCPnPNotification*
 -   GP path: *Windows Components\Smart Card*
 -   GP ADMX file name: *Smartcard.admx*
 
diff --git a/windows/client-management/mdm/policy-csp-admx-snmp.md b/windows/client-management/mdm/policy-csp-admx-snmp.md
index 66c2ed2606..2a83f8346c 100644
--- a/windows/client-management/mdm/policy-csp-admx-snmp.md
+++ b/windows/client-management/mdm/policy-csp-admx-snmp.md
@@ -109,7 +109,7 @@ Also, see the other two SNMP settings: "Specify permitted managers" and "Specify
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Specify communities*
--   GP name: *ValidCommunities*
+-   GP name: *SNMP_Communities*
 -   GP path: *Network\SNMP*
 -   GP ADMX file name: *Snmp.admx*
 
@@ -189,7 +189,7 @@ Also, see the other two SNMP policy settings: "Specify trap configuration" and "
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Specify permitted managers*
--   GP name: *PermittedManagers*
+-   GP name: *SNMP_PermittedManagers*
 -   GP path: *Network\SNMP*
 -   GP ADMX file name: *Snmp.admx*
 
@@ -267,7 +267,7 @@ Also, see the other two SNMP settings: "Specify permitted managers" and "Specify
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Specify traps for public community*
--   GP name: *public*
+-   GP name: *SNMP_Traps_Public*
 -   GP path: *Network\SNMP*
 -   GP ADMX file name: *Snmp.admx*
 
diff --git a/windows/client-management/mdm/policy-csp-admx-tcpip.md b/windows/client-management/mdm/policy-csp-admx-tcpip.md
index 48501c3925..7bcfda06c8 100644
--- a/windows/client-management/mdm/policy-csp-admx-tcpip.md
+++ b/windows/client-management/mdm/policy-csp-admx-tcpip.md
@@ -127,7 +127,7 @@ If you disable or do not configure this policy setting, the local host setting i
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Set 6to4 Relay Name*
--   GP name: *6to4_RouterName*
+-   GP name: *6to4_Router_Name*
 -   GP path: *Network\TCPIP Settings\IPv6 Transition Technologies*
 -   GP ADMX file name: *tcpip.admx*
 
@@ -196,7 +196,7 @@ If you disable or do not configure this policy setting, the local host setting i
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Set 6to4 Relay Name Resolution Interval*
--   GP name: *6to4_RouterNameResolutionInterval*
+-   GP name: *6to4_Router_Name_Resolution_Interval*
 -   GP path: *Network\TCPIP Settings\IPv6 Transition Technologies*
 -   GP ADMX file name: *tcpip.admx*
 
@@ -415,7 +415,7 @@ If you disable this policy setting, IP Stateless Autoconfiguration Limits will b
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Set IP Stateless Autoconfiguration Limits State*
--   GP name: *EnableIPAutoConfigurationLimits*
+-   GP name: *IP_Stateless_Autoconfiguration_Limits_State*
 -   GP path: *Network\TCPIP Settings\Parameters*
 -   GP ADMX file name: *tcpip.admx*
 
@@ -484,7 +484,7 @@ If you disable or do not configure this policy setting, the local host setting i
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Set ISATAP Router Name*
--   GP name: *ISATAP_RouterName*
+-   GP name: *ISATAP_Router_Name*
 -   GP path: *Network\TCPIP Settings\IPv6 Transition Technologies*
 -   GP ADMX file name: *tcpip.admx*
 
@@ -628,7 +628,7 @@ If you disable or do not configure this policy setting, the local host setting i
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Set Teredo Client Port*
--   GP name: *Teredo_ClientPort*
+-   GP name: *Teredo_Client_Port*
 -   GP path: *Network\TCPIP Settings\IPv6 Transition Technologies*
 -   GP ADMX file name: *tcpip.admx*
 
@@ -699,7 +699,7 @@ Policy Enabled State: If Default Qualified is enabled, Teredo will attempt quali
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Set Teredo Default Qualified*
--   GP name: *Teredo_DefaultQualified*
+-   GP name: *Teredo_Default_Qualified*
 -   GP path: *Network\TCPIP Settings\IPv6 Transition Technologies*
 -   GP ADMX file name: *tcpip.admx*
 
@@ -771,7 +771,7 @@ If you disable or do not configure this policy setting, the refresh rate is conf
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Set Teredo Refresh Rate*
--   GP name: *Teredo_RefreshRate*
+-   GP name: *Teredo_Refresh_Rate*
 -   GP path: *Network\TCPIP Settings\IPv6 Transition Technologies*
 -   GP ADMX file name: *tcpip.admx*
 
@@ -840,7 +840,7 @@ If you disable or do not configure this policy setting, the local settings on th
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Set Teredo Server Name*
--   GP name: *Teredo_ServerName*
+-   GP name: *Teredo_Server_Name*
 -   GP path: *Network\TCPIP Settings\IPv6 Transition Technologies*
 -   GP ADMX file name: *tcpip.admx*
 
@@ -988,7 +988,7 @@ If you disable this policy setting, Window Scaling Heuristics will be disabled a
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Set Window Scaling Heuristics State*
--   GP name: *EnableWsd*
+-   GP name: *Windows_Scaling_Heuristics_State*
 -   GP path: *Network\TCPIP Settings\Parameters*
 -   GP ADMX file name: *tcpip.admx*
 
diff --git a/windows/client-management/mdm/policy-csp-admx-tpm.md b/windows/client-management/mdm/policy-csp-admx-tpm.md
index 9ceb1ccce8..aeec40aa7f 100644
--- a/windows/client-management/mdm/policy-csp-admx-tpm.md
+++ b/windows/client-management/mdm/policy-csp-admx-tpm.md
@@ -118,7 +118,7 @@ If you disable or do not configure this policy setting, only those TPM commands
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Configure the list of blocked TPM commands*
--   GP name: *Enabled*
+-   GP name: *BlockedCommandsList_Name*
 -   GP path: *System\Trusted Platform Module Services*
 -   GP ADMX file name: *TPM.admx*
 
@@ -183,7 +183,7 @@ Available in Windows 10 Insider Preview Build 20185. This policy setting configu
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Configure the system to clear the TPM if it is not in a ready state.*
--   GP name: *ClearTPMIfNotReadyGP*
+-   GP name: *ClearTPMIfNotReady_Name*
 -   GP path: *System\Trusted Platform Module Services*
 -   GP ADMX file name: *TPM.admx*
 
@@ -254,7 +254,7 @@ If you disable or do not configure this policy setting, Windows will block the T
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Ignore the default list of blocked TPM commands*
--   GP name: *IgnoreDefaultList*
+-   GP name: *IgnoreDefaultList_Name*
 -   GP path: *System\Trusted Platform Module Services*
 -   GP ADMX file name: *TPM.admx*
 
@@ -325,7 +325,7 @@ If you disable or do not configure this policy setting, Windows will block the T
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Ignore the local list of blocked TPM commands*
--   GP name: *IgnoreLocalList*
+-   GP name: *IgnoreLocalList_Name*
 -   GP path: *System\Trusted Platform Module Services*
 -   GP ADMX file name: *TPM.admx*
 
@@ -403,7 +403,7 @@ Choose the operating system managed TPM authentication setting of "None" for com
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Configure the level of TPM owner authorization information available to the operating system*
--   GP name: *OSManagedAuthLevel*
+-   GP name: *OSManagedAuth_Name*
 -   GP path: *System\Trusted Platform Module Services*
 -   GP ADMX file name: *TPM.admx*
 
@@ -468,7 +468,7 @@ Available in Windows 10 Insider Preview Build 20185. This group policy enables D
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Enable Device Health Attestation Monitoring and Reporting*
--   GP name: *EnableDeviceHealthAttestationService*
+-   GP name: *OptIntoDSHA_Name*
 -   GP path: *System\Device Health Attestation Service*
 -   GP ADMX file name: *TPM.admx*
 
@@ -549,7 +549,7 @@ If this value is not configured, a default value of 480 minutes (8 hours) is use
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Standard User Lockout Duration*
--   GP name: *StandardUserAuthorizationFailureDuration*
+-   GP name: *StandardUserAuthorizationFailureDuration_Name*
 -   GP path: *System\Trusted Platform Module Services*
 -   GP ADMX file name: *TPM.admx*
 
@@ -632,7 +632,7 @@ A value of zero means the OS will not allow standard users to send commands to t
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Standard User Individual Lockout Threshold*
--   GP name: *StandardUserAuthorizationFailureIndividualThreshold*
+-   GP name: *StandardUserAuthorizationFailureIndividualThreshold_Name*
 -   GP path: *System\Trusted Platform Module Services*
 -   GP ADMX file name: *TPM.admx*
 
@@ -715,7 +715,7 @@ A value of zero means the OS will not allow standard users to send commands to t
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Standard User Total Lockout Threshold*
--   GP name: *StandardUserAuthorizationFailureTotalThreshold*
+-   GP name: *StandardUserAuthorizationFailureTotalThreshold_Name*
 -   GP path: *System\Trusted Platform Module Services*
 -   GP ADMX file name: *TPM.admx*
 
@@ -780,7 +780,7 @@ Available in Windows 10 Insider Preview Build 20185. This policy setting configu
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Configure the system to use legacy Dictionary Attack Prevention Parameters setting for TPM 2.0.*
--   GP name: *UseLegacyDictionaryAttackParameters*
+-   GP name: *UseLegacyDAP_Name*
 -   GP path: *System\Trusted Platform Module Services*
 -   GP ADMX file name: *TPM.admx*
 
diff --git a/windows/client-management/mdm/policy-csp-admx-userexperiencevirtualization.md b/windows/client-management/mdm/policy-csp-admx-userexperiencevirtualization.md
index 40d4574a53..d967a2db8e 100644
--- a/windows/client-management/mdm/policy-csp-admx-userexperiencevirtualization.md
+++ b/windows/client-management/mdm/policy-csp-admx-userexperiencevirtualization.md
@@ -471,7 +471,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Calculator*
--   GP name: *MicrosoftCalculator6*
+-   GP name: *Calculator*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -550,7 +550,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Configure Sync Method*
--   GP name: *SyncMethod*
+-   GP name: *ConfigureSyncMethod*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -625,7 +625,7 @@ If you do not configure this policy, no UE-V rollback state is copied to the set
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *VDI Configuration*
--   GP name: *MicrosoftCalculator6*
+-   GP name: *ConfigureVdi*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -843,7 +843,7 @@ If you do not configure this policy setting, any defined values are deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Do not synchronize Windows Apps*
--   GP name: *DontSyncWindows8AppSettings*
+-   GP name: *DisableWin8Sync*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -915,7 +915,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Synchronize Windows settings*
--   GP name: *DesktopSettings*
+-   GP name: *DisableWindowsOSSettings*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -982,7 +982,7 @@ Reboot is needed for enable to take effect. With Auto-register inbox templates e
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Enable UEV*
--   GP name: *Enabled*
+-   GP name: *EnableUEV*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -1054,7 +1054,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Finance*
--   GP name: *SyncSettings*
+-   GP name: *Finance*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Windows Apps*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -1197,7 +1197,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Games*
--   GP name: *SyncSettings*
+-   GP name: *Games*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Windows Apps*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -1271,7 +1271,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Internet Explorer 8*
--   GP name: *MicrosoftInternetExplorer.Version8*
+-   GP name: *InternetExplorer8*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -1343,7 +1343,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Internet Explorer 9*
--   GP name: *MicrosoftInternetExplorer.Version9*
+-   GP name: *InternetExplorer9*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -1415,7 +1415,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Internet Explorer 10*
--   GP name: *MicrosoftInternetExplorer.Version10*
+-   GP name: *InternetExplorer10*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -1487,7 +1487,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Internet Explorer 11*
--   GP name: *MicrosoftInternetExplorer.Version11*
+-   GP name: *InternetExplorer11*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -1560,7 +1560,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Internet Explorer Common Settings*
--   GP name: *MicrosoftInternetExplorer.Common*
+-   GP name: *InternetExplorerCommon*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -1631,7 +1631,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Maps*
--   GP name: *SyncSettings*
+-   GP name: *Maps*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Windows Apps*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -1773,7 +1773,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Access 2010*
--   GP name: *MicrosoftOffice2010Win32.Access*
+-   GP name: *MicrosoftOffice2010Access*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -1845,7 +1845,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 2010 Common Settings*
--   GP name: *MicrosoftOffice2010Win32.Common*
+-   GP name: *MicrosoftOffice2010Common*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -1916,7 +1916,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Excel 2010*
--   GP name: *MicrosoftOffice2010Win32.Excel*
+-   GP name: *MicrosoftOffice2010Excel*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -1988,7 +1988,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft InfoPath 2010*
--   GP name: *MicrosoftOffice2010Win32.InfoPath*
+-   GP name: *MicrosoftOffice2010InfoPath*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -2060,7 +2060,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Lync 2010*
--   GP name: *MicrosoftLync2010*
+-   GP name: *MicrosoftOffice2010Lync*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -2131,7 +2131,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft OneNote 2010*
--   GP name: *MicrosoftOffice2010Win32.OneNote*
+-   GP name: *MicrosoftOffice2010OneNote*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -2203,7 +2203,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Outlook 2010*
--   GP name: *MicrosoftOffice2010Win32.Outlook*
+-   GP name: *MicrosoftOffice2010Outlook*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -2275,7 +2275,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft PowerPoint 2010*
--   GP name: *MicrosoftOffice2010Win32.PowerPoint*
+-   GP name: *MicrosoftOffice2010PowerPoint*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -2346,7 +2346,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Project 2010*
--   GP name: *MicrosoftOffice2010Win32.Project*
+-   GP name: *MicrosoftOffice2010Project*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -2418,7 +2418,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Publisher 2010*
--   GP name: *MicrosoftOffice2010Win32.Publisher*
+-   GP name: *MicrosoftOffice2010Publisher*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -2490,7 +2490,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft SharePoint Designer 2010*
--   GP name: *MicrosoftOffice2010Win32.SharePointDesigner*
+-   GP name: *MicrosoftOffice2010SharePointDesigner*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -2562,7 +2562,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft SharePoint Workspace 2010*
--   GP name: *MicrosoftOffice2010Win32.Groove*
+-   GP name: *MicrosoftOffice2010SharePointWorkspace*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -2634,7 +2634,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Visio 2010*
--   GP name: *MicrosoftOffice2010Win32.Visio*
+-   GP name: *MicrosoftOffice2010Visio*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -2706,7 +2706,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Word 2010*
--   GP name: *MicrosoftOffice2010Win32.Word*
+-   GP name: *MicrosoftOffice2010Word*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -2777,7 +2777,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Access 2013*
--   GP name: *MicrosoftOffice2013Win32.Access*
+-   GP name: *MicrosoftOffice2013Access*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -2849,7 +2849,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Access 2013 backup only*
--   GP name: *MicrosoftOffice2013BackupWin32.Access*
+-   GP name: *MicrosoftOffice2013AccessBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -2921,7 +2921,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 2013 Common Settings*
--   GP name: *MicrosoftOffice2013Win32.Common*
+-   GP name: *MicrosoftOffice2013Common*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -2994,7 +2994,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Common 2013 backup only*
--   GP name: *MicrosoftOffice2013BackupWin32.Common*
+-   GP name: *MicrosoftOffice2013CommonBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -3067,7 +3067,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Excel 2013*
--   GP name: *MicrosoftOffice2013Win32.Excel*
+-   GP name: *MicrosoftOffice2013Excel*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -3138,7 +3138,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Excel 2013 backup only*
--   GP name: *MicrosoftOffice2013BackupWin32.Excel*
+-   GP name: *MicrosoftOffice2013ExcelBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -3210,7 +3210,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft InfoPath 2013*
--   GP name: *MicrosoftOffice2013Win32.InfoPath*
+-   GP name: *MicrosoftOffice2013InfoPath*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -3282,7 +3282,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *InfoPath 2013 backup only*
--   GP name: *MicrosoftOffice2013BackupWin32.InfoPath*
+-   GP name: *MicrosoftOffice2013InfoPathBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -3353,7 +3353,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Lync 2013*
--   GP name: *MicrosoftLync2013Win32*
+-   GP name: *MicrosoftOffice2013Lync*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -3425,7 +3425,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Lync 2013 backup only*
--   GP name: *MicrosoftLync2013BackupWin32*
+-   GP name: *MicrosoftOffice2013LyncBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -3497,7 +3497,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft OneDrive for Business 2013*
--   GP name: *MicrosoftOffice2013Win32.OneDrive*
+-   GP name: *MicrosoftOffice2013OneDriveForBusiness*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -3569,7 +3569,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft OneNote 2013*
--   GP name: *MicrosoftOffice2013Win32.OneNote*
+-   GP name: *MicrosoftOffice2013OneNote*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -3641,7 +3641,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *OneNote 2013 backup only*
--   GP name: *MicrosoftOffice2013BackupWin32.OneNote*
+-   GP name: *MicrosoftOffice2013OneNoteBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -3712,7 +3712,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Outlook 2013*
--   GP name: *MicrosoftOffice2013Win32.Outlook*
+-   GP name: *MicrosoftOffice2013Outlook*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -3784,7 +3784,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Outlook 2013 backup only*
--   GP name: *MicrosoftOffice2013BackupWin32.Outlook*
+-   GP name: *MicrosoftOffice2013OutlookBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -3856,7 +3856,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft PowerPoint 2013*
--   GP name: *MicrosoftOffice2013Win32.PowerPoint*
+-   GP name: *MicrosoftOffice2013PowerPoint*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -3928,7 +3928,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *PowerPoint 2013 backup only*
--   GP name: *MicrosoftOffice2013BackupWin32.PowerPoint*
+-   GP name: *MicrosoftOffice2013PowerPointBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -3999,7 +3999,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Project 2013*
--   GP name: *MicrosoftOffice2013Win32.Project*
+-   GP name: *MicrosoftOffice2013Project*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -4071,7 +4071,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Project 2013 backup only*
--   GP name: *MicrosoftOffice2013BackupWin32.Project*
+-   GP name: *MicrosoftOffice2013ProjectBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -4143,7 +4143,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Publisher 2013*
--   GP name: *MicrosoftOffice2013Win32.Publisher*
+-   GP name: *MicrosoftOffice2013Publisher*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -4215,7 +4215,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Publisher 2013 backup only*
--   GP name: *MicrosoftOffice2013BackupWin32.Publisher*
+-   GP name: *MicrosoftOffice2013PublisherBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -4287,7 +4287,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft SharePoint Designer 2013*
--   GP name: *MicrosoftOffice2013Win32.SharePointDesigner*
+-   GP name: *MicrosoftOffice2013SharePointDesigner*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -4358,7 +4358,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *SharePoint Designer 2013 backup only*
--   GP name: *MicrosoftOffice2013BackupWin32.SharePointDesigner*
+-   GP name: *MicrosoftOffice2013SharePointDesignerBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -4429,7 +4429,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 2013 Upload Center*
--   GP name: *MicrosoftOffice2013Win32.UploadCenter*
+-   GP name: *MicrosoftOffice2013UploadCenter*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -4501,7 +4501,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Visio 2013*
--   GP name: *MicrosoftOffice2013Win32.Visio*
+-   GP name: *MicrosoftOffice2013Visio*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -4573,7 +4573,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Visio 2013 backup only*
--   GP name: *MicrosoftOffice2013BackupWin32.Visio*
+-   GP name: *MicrosoftOffice2013VisioBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -4645,7 +4645,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Word 2013*
--   GP name: *MicrosoftOffice2013Win32.Word*
+-   GP name: *MicrosoftOffice2013Word*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -4717,7 +4717,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Word 2013 backup only*
--   GP name: *MicrosoftOffice2013BackupWin32.Word*
+-   GP name: *MicrosoftOffice2013WordBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -4789,7 +4789,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Access 2016*
--   GP name: *MicrosoftOffice2016Win32.Access*
+-   GP name: *MicrosoftOffice2016Access*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -4861,7 +4861,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Access 2016 backup only*
--   GP name: *MicrosoftOffice2016BackupWin32.Access*
+-   GP name: *MicrosoftOffice2016AccessBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -4933,7 +4933,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 2016 Common Settings*
--   GP name: *MicrosoftOffice2016Win32.Common*
+-   GP name: *MicrosoftOffice2016Common*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -5006,7 +5006,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Common 2016 backup only*
--   GP name: *MicrosoftOffice2016BackupWin32.Common*
+-   GP name: *MicrosoftOffice2016CommonBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -5078,7 +5078,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Excel 2016*
--   GP name: *MicrosoftOffice2016Win32.Excel*
+-   GP name: *MicrosoftOffice2016Excel*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -5150,7 +5150,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Excel 2016 backup only*
--   GP name: *MicrosoftOffice2016BackupWin32.Excel*
+-   GP name: *MicrosoftOffice2016ExcelBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -5222,7 +5222,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Lync 2016*
--   GP name: *MicrosoftLync2016Win32*
+-   GP name: *MicrosoftOffice2016Lync*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -5294,7 +5294,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Lync 2016 backup only*
--   GP name: *MicrosoftLync2016BackupWin32*
+-   GP name: *MicrosoftOffice2016LyncBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -5366,7 +5366,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft OneDrive for Business 2016*
--   GP name: *MicrosoftOffice2016Win32.OneDrive*
+-   GP name: *MicrosoftOffice2016OneDriveForBusiness*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -5438,7 +5438,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft OneNote 2016*
--   GP name: *MicrosoftOffice2016Win32.OneNote*
+-   GP name: *MicrosoftOffice2016OneNote*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -5510,7 +5510,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *OneNote 2016 backup only*
--   GP name: *MicrosoftOffice2016BackupWin32.OneNote*
+-   GP name: *MicrosoftOffice2016OneNoteBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -5582,7 +5582,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Outlook 2016*
--   GP name: *MicrosoftOffice2016Win32.Outlook*
+-   GP name: *MicrosoftOffice2016Outlook*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -5654,7 +5654,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Outlook 2016 backup only*
--   GP name: *MicrosoftOffice2016BackupWin32.Outlook*
+-   GP name: *MicrosoftOffice2016OutlookBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -5726,7 +5726,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft PowerPoint 2016*
--   GP name: *MicrosoftOffice2016Win32.PowerPoint*
+-   GP name: *MicrosoftOffice2016PowerPoint*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -5798,7 +5798,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *PowerPoint 2016 backup only*
--   GP name: *MicrosoftOffice2016BackupWin32.PowerPoint*
+-   GP name: *MicrosoftOffice2016PowerPointBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -5871,7 +5871,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Project 2016*
--   GP name: *MicrosoftOffice2016Win32.Project*
+-   GP name: *MicrosoftOffice2016Project*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -5942,7 +5942,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Project 2016 backup only*
--   GP name: *MicrosoftOffice2016BackupWin32.Project*
+-   GP name: *MicrosoftOffice2016ProjectBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -6014,7 +6014,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Publisher 2016*
--   GP name: *MicrosoftOffice2016Win32.Publisher*
+-   GP name: *MicrosoftOffice2016Publisher*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -6086,7 +6086,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Publisher 2016 backup only*
--   GP name: *MicrosoftOffice2016BackupWin32.Publisher*
+-   GP name: *MicrosoftOffice2016PublisherBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -6157,7 +6157,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 2016 Upload Center*
--   GP name: *MicrosoftOffice2016Win32.UploadCenter*
+-   GP name: *MicrosoftOffice2016UploadCenter*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -6229,7 +6229,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Visio 2016*
--   GP name: *MicrosoftOffice2016Win32.Visio*
+-   GP name: *MicrosoftOffice2016Visio*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -6301,7 +6301,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Visio 2016 backup only*
--   GP name: *MicrosoftOffice2016BackupWin32.Visio*
+-   GP name: *MicrosoftOffice2016VisioBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -6373,7 +6373,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Word 2016*
--   GP name: *MicrosoftOffice2016Win32.Word*
+-   GP name: *MicrosoftOffice2016Word*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -6445,7 +6445,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Word 2016 backup only*
--   GP name: *MicrosoftOffice2016BackupWin32.Word*
+-   GP name: *MicrosoftOffice2016WordBackup*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -6517,7 +6517,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 Access 2013*
--   GP name: *MicrosoftOffice2013Office365Win32.Access*
+-   GP name: *MicrosoftOffice365Access2013*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -6589,7 +6589,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 Access 2016*
--   GP name: *MicrosoftOffice2016Office365Win32.Access*
+-   GP name: *MicrosoftOffice365Access2016*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -6661,7 +6661,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 Common 2013*
--   GP name: *MicrosoftOffice2013Office365Win32.Common*
+-   GP name: *MicrosoftOffice365Common2013*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -6732,7 +6732,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 Common 2016*
--   GP name: *MicrosoftOffice2016Office365Win32.Common*
+-   GP name: *MicrosoftOffice365Common2016*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -6804,7 +6804,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 Excel 2013*
--   GP name: *MicrosoftOffice2013Office365Win32.Excel*
+-   GP name: *MicrosoftOffice365Excel2013*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -6876,7 +6876,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 Excel 2016*
--   GP name: *MicrosoftOffice2016Office365Win32.Excel*
+-   GP name: *MicrosoftOffice365Excel2016*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -6947,7 +6947,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 InfoPath 2013*
--   GP name: *MicrosoftOffice2013Office365Win32.InfoPath*
+-   GP name: *MicrosoftOffice365InfoPath2013*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -7019,7 +7019,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 Lync 2013*
--   GP name: *MicrosoftLync2013Office365Win32*
+-   GP name: *MicrosoftOffice365Lync2013*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -7091,7 +7091,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 Lync 2016*
--   GP name: *MicrosoftLync2016Office365Win32*
+-   GP name: *MicrosoftOffice365Lync2016*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -7163,7 +7163,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 OneNote 2013*
--   GP name: *MicrosoftOffice2013Office365Win32.OneNote*
+-   GP name: *MicrosoftOffice365OneNote2013*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -7235,7 +7235,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 OneNote 2016*
--   GP name: *MicrosoftOffice2016Office365Win32.OneNote*
+-   GP name: *MicrosoftOffice365OneNote2016*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -7307,7 +7307,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 Outlook 2013*
--   GP name: *MicrosoftOffice2013Office365Win32.Outlook*
+-   GP name: *MicrosoftOffice365Outlook2013*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -7379,7 +7379,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 Outlook 2016*
--   GP name: *MicrosoftOffice2016Office365Win32.Outlook*
+-   GP name: *MicrosoftOffice365Outlook2016*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -7451,7 +7451,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 PowerPoint 2013*
--   GP name: *MicrosoftOffice2013Office365Win32.PowerPoint*
+-   GP name: *MicrosoftOffice365PowerPoint2013*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -7523,7 +7523,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 PowerPoint 2016*
--   GP name: *MicrosoftOffice2016Office365Win32.PowerPoint*
+-   GP name: *MicrosoftOffice365PowerPoint2016*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -7595,7 +7595,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 Project 2013*
--   GP name: *MicrosoftOffice2013Office365Win32.Project*
+-   GP name: *MicrosoftOffice365Project2013*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -7666,7 +7666,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 Project 2016*
--   GP name: *MicrosoftOffice2016Office365Win32.Project*
+-   GP name: *MicrosoftOffice365Project2016*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -7738,7 +7738,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 Publisher 2013*
--   GP name: *MicrosoftOffice2013Office365Win32.Publisher*
+-   GP name: *MicrosoftOffice365Publisher2013*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -7810,7 +7810,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 Publisher 2016*
--   GP name: *MicrosoftOffice2016Office365Win32.Publisher*
+-   GP name: *MicrosoftOffice365Publisher2016*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -7882,7 +7882,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 SharePoint Designer 2013*
--   GP name: *MicrosoftOffice2013Office365Win32.SharePointDesigner*
+-   GP name: *MicrosoftOffice365SharePointDesigner2013*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -7954,7 +7954,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 Visio 2013*
--   GP name: *MicrosoftOffice2013Office365Win32.Visio*
+-   GP name: *MicrosoftOffice365Visio2013*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -8026,7 +8026,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 Visio 2016*
--   GP name: *MicrosoftOffice2016Office365Win32.Visio*
+-   GP name: *MicrosoftOffice365Visio2016*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -8098,7 +8098,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 Word 2013*
--   GP name: *MicrosoftOffice2013Office365Win32.Word*
+-   GP name: *MicrosoftOffice365Word2013*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -8170,7 +8170,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Microsoft Office 365 Word 2016*
--   GP name: *MicrosoftOffice2016Office365Win32.Word*
+-   GP name: *MicrosoftOffice365Word2016*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -8241,7 +8241,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Music*
--   GP name: *SyncSettings*
+-   GP name: *Music*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Windows Apps*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -8313,7 +8313,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *News*
--   GP name: *SyncSettings*
+-   GP name: *News*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Windows Apps*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -8385,7 +8385,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Notepad*
--   GP name: *MicrosoftNotepad6*
+-   GP name: *Notepad*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -8458,7 +8458,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Reader*
--   GP name: *SyncSettings*
+-   GP name: *Reader*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Windows Apps*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -8528,7 +8528,7 @@ If you disable or do not configure this policy setting, the default value of 200
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Synchronization timeout*
--   GP name: *SyncTimeoutInMilliseconds*
+-   GP name: *RepositoryTimeout*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -8746,7 +8746,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Sports*
--   GP name: *SyncSettings*
+-   GP name: *Sports*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Windows Apps*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -9170,7 +9170,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Travel*
--   GP name: *SyncSettings*
+-   GP name: *Travel*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Windows Apps*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -9311,7 +9311,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Video*
--   GP name: *SyncSettings*
+-   GP name: *Video*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Windows Apps*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -9383,7 +9383,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Weather*
--   GP name: *SyncSettings*
+-   GP name: *Weather*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Windows Apps*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
@@ -9454,7 +9454,7 @@ If you do not configure this policy setting, any defined values will be deleted.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *WordPad*
--   GP name: *MicrosoftWordpad6*
+-   GP name: *Wordpad*
 -   GP path: *Windows Components\Microsoft User Experience Virtualization\Applications*
 -   GP ADMX file name: *UserExperienceVirtualization.admx*
 
diff --git a/windows/client-management/mdm/policy-csp-admx-w32time.md b/windows/client-management/mdm/policy-csp-admx-w32time.md
index b36e9f1f97..42e29846f8 100644
--- a/windows/client-management/mdm/policy-csp-admx-w32time.md
+++ b/windows/client-management/mdm/policy-csp-admx-w32time.md
@@ -176,6 +176,7 @@ This parameter controls the frequency at which an event that indicates the numbe
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Global Configuration Settings*
+-   GP name: *W32TIME_POLICY_CONFIG*
 -   GP path: *System\Windows Time Service*
 -   GP ADMX file name: *W32Time.admx*
 
@@ -265,6 +266,7 @@ This value is a bitmask that controls events that may be logged to the System lo
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Configure Windows NTP Client*
+-   GP name: *W32TIME_POLICY_CONFIGURE_NTPCLIENT*
 -   GP path: *System\Windows Time Service\Time Providers*
 -   GP ADMX file name: *W32Time.admx*
 
@@ -335,6 +337,7 @@ If you disable or do not configure this policy setting, the local computer clock
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Enable Windows NTP Client*
+-   GP name: *W32TIME_POLICY_ENABLE_NTPCLIENT*
 -   GP path: *System\Windows Time Service\Time Providers*
 -   GP ADMX file name: *W32Time.admx*
 
@@ -403,6 +406,7 @@ If you disable or do not configure this policy setting, your computer cannot ser
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Enable Windows NTP Server*
+-   GP name: *W32TIME_POLICY_ENABLE_NTPSERVER*
 -   GP path: *System\Windows Time Service\Time Providers*
 -   GP ADMX file name: *W32Time.admx*
 
diff --git a/windows/client-management/mdm/policy-csp-admx-wincal.md b/windows/client-management/mdm/policy-csp-admx-wincal.md
index 68a446f126..bceaf394ed 100644
--- a/windows/client-management/mdm/policy-csp-admx-wincal.md
+++ b/windows/client-management/mdm/policy-csp-admx-wincal.md
@@ -96,7 +96,7 @@ The default is for Windows Calendar to be turned on.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Turn off Windows Calendar*
--   GP name: *TurnOffWinCal*
+-   GP name: *TurnOffWinCal_1*
 -   GP path: *Windows Components\Windows Calendar*
 -   GP ADMX file name: *WinCal.admx*
 
@@ -169,7 +169,7 @@ The default is for Windows Calendar to be turned on.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Turn off Windows Calendar*
--   GP name: *TurnOffWinCal*
+-   GP name: *TurnOffWinCal_2*
 -   GP path: *Windows Components\Windows Calendar*
 -   GP ADMX file name: *WinCal.admx*
 
diff --git a/windows/client-management/mdm/policy-csp-admx-windowsconnectnow.md b/windows/client-management/mdm/policy-csp-admx-windowsconnectnow.md
index 42a8d63502..80b7d947fa 100644
--- a/windows/client-management/mdm/policy-csp-admx-windowsconnectnow.md
+++ b/windows/client-management/mdm/policy-csp-admx-windowsconnectnow.md
@@ -97,7 +97,7 @@ If you disable or do not configure this policy setting, users can access the wiz
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Prohibit access of the Windows Connect Now wizards*
--   GP name: *DisableWcnUi*
+-   GP name: *WCN_DisableWcnUi_1*
 -   GP path: *Network\Windows Connect Now*
 -   GP ADMX file name: *WindowsConnectNow.admx*
 
@@ -166,7 +166,7 @@ If you disable or do not configure this policy setting, users can access the wiz
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Prohibit access of the Windows Connect Now wizards*
--   GP name: *DisableWcnUi*
+-   GP name: *WCN_DisableWcnUi_2*
 -   GP path: *Network\Windows Connect Now*
 -   GP ADMX file name: *WindowsConnectNow.admx*
 
@@ -241,7 +241,7 @@ The default for this policy setting allows operations over all media.
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Configuration of wireless settings using Windows Connect Now*
--   GP name: *EnableRegistrars*
+-   GP name: *WCN_EnableRegistrar*
 -   GP path: *Network\Windows Connect Now*
 -   GP ADMX file name: *WindowsConnectNow.admx*
 
diff --git a/windows/client-management/mdm/policy-csp-admx-windowsmediaplayer.md b/windows/client-management/mdm/policy-csp-admx-windowsmediaplayer.md
index 60960251b2..61330c15e0 100644
--- a/windows/client-management/mdm/policy-csp-admx-windowsmediaplayer.md
+++ b/windows/client-management/mdm/policy-csp-admx-windowsmediaplayer.md
@@ -163,7 +163,7 @@ If you do not configure this policy setting, users can configure the HTTP proxy
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Configure HTTP Proxy*
--   GP name: *ProxyPolicy*
+-   GP name: *ConfigureHTTPProxySettings*
 -   GP path: *Windows Components\Windows Media Player\Networking*
 -   GP ADMX file name: *WindowsMediaPlayer.admx*
 
@@ -243,7 +243,7 @@ If you do not configure this policy setting, users can configure the MMS proxy s
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Configure MMS Proxy*
--   GP name: *ProxyPolicy*
+-   GP name: *ConfigureMMSProxySettings*
 -   GP path: *Windows Components\Windows Media Player\Networking*
 -   GP ADMX file name: *WindowsMediaPlayer.admx*
 
@@ -321,7 +321,7 @@ If you do not configure this policy setting, users can configure the RTSP proxy
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Configure RTSP Proxy*
--   GP name: *ProxyPolicy*
+-   GP name: *ConfigureRTSPProxySettings*
 -   GP path: *Windows Components\Windows Media Player\Networking*
 -   GP ADMX file name: *WindowsMediaPlayer.admx*
 
@@ -461,7 +461,7 @@ If you disable or do not configure this policy setting, the Network tab appears
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Hide Network Tab*
--   GP name: *HideNetworkTab*
+-   GP name: *DisableNetworkSettings*
 -   GP path: *Windows Components\Windows Media Player\Networking*
 -   GP ADMX file name: *WindowsMediaPlayer.admx*
 
@@ -532,7 +532,7 @@ If you do not configure this policy setting, and the "Set and lock skin" policy
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Do Not Show First Use Dialog Boxes*
--   GP name: *GroupPrivacyAcceptance*
+-   GP name: *DisableSetupFirstUseConfiguration*
 -   GP path: *Windows Components\Windows Media Player*
 -   GP ADMX file name: *WindowsMediaPlayer.admx*
 
@@ -961,7 +961,7 @@ If you disable or do not configure this policy setting, users can change the buf
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Configure Network Buffering*
--   GP name: *NetworkBufferingPolicy*
+-   GP name: *NetworkBuffering*
 -   GP path: *Windows Components\Windows Media Player\Networking*
 -   GP ADMX file name: *WindowsMediaPlayer.admx*
 
@@ -1032,7 +1032,7 @@ If you do not configure this policy setting, users can change the setting for th
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Prevent Codec Download*
--   GP name: *PreventCodecDownload*
+-   GP name: *PolicyCodecUpdate*
 -   GP path: *Windows Components\Windows Media Player\Playback*
 -   GP ADMX file name: *WindowsMediaPlayer.admx*
 
@@ -1308,7 +1308,7 @@ If you disable or do not configure this policy setting, the user can choose whet
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Prevent Quick Launch Toolbar Shortcut Creation*
--   GP name: *QuickLaunchShortcut*
+-   GP name: *PreventQuickLaunchShortcut*
 -   GP path: *Windows Components\Windows Media Player*
 -   GP ADMX file name: *WindowsMediaPlayer.admx*
 
@@ -1445,7 +1445,7 @@ If you disable or do not configure this policy setting, users can choose whether
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Prevent Desktop Shortcut Creation*
--   GP name: *DesktopShortcut*
+-   GP name: *PreventWMPDeskTopShortcut*
 -   GP path: *Windows Components\Windows Media Player*
 -   GP ADMX file name: *WindowsMediaPlayer.admx*
 
@@ -1518,7 +1518,7 @@ If you disable or do not configure this policy setting, users can display the Pl
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Set and Lock Skin*
--   GP name: *SetAndLockSkin*
+-   GP name: *SkinLockDown*
 -   GP path: *Windows Components\Windows Media Player\User Interface*
 -   GP ADMX file name: *WindowsMediaPlayer.admx*
 
@@ -1591,7 +1591,7 @@ If you disable this policy setting, the Protocols for MMS URLs and Multicast str
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Streaming Media Protocols*
--   GP name: *WindowsMediaStreamingProtocols*
+-   GP name: *WindowsStreamingMediaProtocols*
 -   GP path: *Windows Components\Windows Media Player\Networking*
 -   GP ADMX file name: *WindowsMediaPlayer.admx*
 
diff --git a/windows/client-management/mdm/policy-csp-admx-wininit.md b/windows/client-management/mdm/policy-csp-admx-wininit.md
index d643b12d8e..dbbecca9d5 100644
--- a/windows/client-management/mdm/policy-csp-admx-wininit.md
+++ b/windows/client-management/mdm/policy-csp-admx-wininit.md
@@ -97,7 +97,7 @@ If you disable or do not configure this policy setting, the system creates the n
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Turn off legacy remote shutdown interface*
--   GP name: *DisableShutdownNamedPipe*
+-   GP name: *DisableNamedPipeShutdownPolicyDescription*
 -   GP path: *Windows Components\Shutdown Options*
 -   GP ADMX file name: *WinInit.admx*
 
@@ -166,7 +166,7 @@ If you disable or do not configure this policy setting, the local setting is use
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Require use of fast startup*
--   GP name: *HiberbootEnabled*
+-   GP name: *Hiberboot*
 -   GP path: *System\Shutdown*
 -   GP ADMX file name: *WinInit.admx*
 
@@ -235,7 +235,7 @@ If you disable or do not configure this policy setting, the default timeout valu
 <!--ADMXBacked-->
 ADMX Info:  
 -   GP English name: *Timeout for hung logon sessions during shutdown*
--   GP name: *ShutdownSessionTimeout*
+-   GP name: *ShutdownTimeoutHungSessionsDescription*
 -   GP path: *Windows Components\Shutdown Options*
 -   GP ADMX file name: *WinInit.admx*