diff --git a/windows/device/Group Policy/Any Removable Storage and CD-DVD and WPD Group.xml b/windows/device/Group Policy/Any Removable Storage and CD-DVD and WPD Group.xml
index 75d47d0..610a98e 100644
--- a/windows/device/Group Policy/Any Removable Storage and CD-DVD and WPD Group.xml	
+++ b/windows/device/Group Policy/Any Removable Storage and CD-DVD and WPD Group.xml	
@@ -1,4 +1,4 @@
-<Groups>
+<PolicyGroups>
 	<Group Id="{9b28fae8-72f7-4267-a1a5-685f747a7146}">
 	<!-- ./Vendor/MSFT/Defender/Configuration/DeviceControl/PolicyGroups/%7b9b28fae8-72f7-4267-a1a5-685f747a7146%7d/GroupData -->
 		<MatchType>MatchAny</MatchType>
@@ -8,4 +8,4 @@
 			<PrimaryId>WpdDevices</PrimaryId>
 		</DescriptorIdList>
 	</Group>
-</Groups>
\ No newline at end of file
+</PolicyGroups>
\ No newline at end of file
diff --git a/windows/device/Group Policy/Approved USBs Group.xml b/windows/device/Group Policy/Approved USBs Group.xml
index 5dd0327..40b6039 100644
--- a/windows/device/Group Policy/Approved USBs Group.xml	
+++ b/windows/device/Group Policy/Approved USBs Group.xml	
@@ -1,8 +1,8 @@
-<Groups>
+<PolicyGroups>
 	<Group Id="{65fa649a-a111-4912-9294-fb6337a25038}">
 		<MatchType>MatchAny</MatchType>
 		<DescriptorIdList>
 			<InstancePathId>USBSTOR\DISK&amp;VEN__USB&amp;PROD__SANDISK_3.2GEN1&amp;REV_1.00\03003324080520232521&amp;0</InstancePathId>
 		</DescriptorIdList>
 	</Group>
-</Groups>
\ No newline at end of file
+</PolicyGroups>
\ No newline at end of file
diff --git a/windows/device/Group Policy/Block Read and Write access to specific file _Groups.xml b/windows/device/Group Policy/Block Read and Write access to specific file _Groups.xml
index 00d76e0..3d2fd87 100644
--- a/windows/device/Group Policy/Block Read and Write access to specific file _Groups.xml	
+++ b/windows/device/Group Policy/Block Read and Write access to specific file _Groups.xml	
@@ -1,4 +1,4 @@
-<Groups>
+<PolicyGroups>
 	<Group Id="{9b28fae8-72f7-4267-a1a5-685f747a7146}">
 		<!-- any removable storage group -->
 		<MatchType>MatchAny</MatchType>
@@ -16,4 +16,4 @@
 			<PathId>*.dll</PathId>
 		</DescriptorIdList>
 	</Group>
-</Groups>
\ No newline at end of file
+</PolicyGroups>
\ No newline at end of file
diff --git a/windows/device/Group Policy/Demo_2_Groups.xml b/windows/device/Group Policy/Demo_2_Groups.xml
index d17c4ea..30bf728 100644
--- a/windows/device/Group Policy/Demo_2_Groups.xml	
+++ b/windows/device/Group Policy/Demo_2_Groups.xml	
@@ -1,4 +1,4 @@
-<Groups>
+<PolicyGroups>
 	<Group Id="{9b28fae8-72f7-4267-a1a5-685f747a7146}">
 		<!-- any removable storage group -->
 		<MatchType>MatchAny</MatchType>
@@ -24,4 +24,4 @@
 			<PathId>*.dll</PathId>
 		</DescriptorIdList>
 	</Group>
-</Groups>
\ No newline at end of file
+</PolicyGroups>
\ No newline at end of file
diff --git a/windows/device/Group Policy/Demo_Groups.xml b/windows/device/Group Policy/Demo_Groups.xml
index da3ebb2..96c7971 100644
--- a/windows/device/Group Policy/Demo_Groups.xml	
+++ b/windows/device/Group Policy/Demo_Groups.xml	
@@ -1,4 +1,4 @@
-<Groups>
+<PolicyGroups>
 	<Group Id="{65fa649a-a111-4912-9294-fb6337a25038}">
 	   <!-- Approved USBs Group -->
 		<MatchType>MatchAny</MatchType>
@@ -14,4 +14,4 @@
 			<PrimaryId>WpdDevices</PrimaryId>
 		</DescriptorIdList>
 	</Group>
-</Groups>
\ No newline at end of file
+</PolicyGroups>
\ No newline at end of file
diff --git a/windows/device/Group Policy/Mass_storage_groups_GPO_2.xml b/windows/device/Group Policy/Mass_storage_groups_GPO_2.xml
index a3fd642..a34bdcc 100644
--- a/windows/device/Group Policy/Mass_storage_groups_GPO_2.xml	
+++ b/windows/device/Group Policy/Mass_storage_groups_GPO_2.xml	
@@ -1,4 +1,4 @@
-<Groups>
+<PolicyGroups>
     <Group Id="{fb4ad01e-f41a-46c6-9ac1-268efa0ea083}">
         <!-- ./Vendor/MSFT/Defender/Configuration/DeviceControl/PolicyGroups/%7bfb4ad01e-f41a-46c6-9ac1-268efa0ea083%7d/GroupData -->
         <!-- Group for all mass storage devices groups -->
@@ -65,6 +65,6 @@
             <VID_PID>0F7E_900C</VID_PID>
         </DescriptorIdList> 
     </Group>
-</Groups>
+</PolicyGroups>
 
 
diff --git a/windows/device/Group Policy/Scenario 2 GPO Removable Storage Group.xml b/windows/device/Group Policy/Scenario 2 GPO Removable Storage Group.xml
index 8df4ae3..051a0d3 100644
--- a/windows/device/Group Policy/Scenario 2 GPO Removable Storage Group.xml	
+++ b/windows/device/Group Policy/Scenario 2 GPO Removable Storage Group.xml	
@@ -1,4 +1,4 @@
-<Groups>
+<PolicyGroups>
 
 	<Group Id="{9b28fae8-72f7-4267-a1a5-685f747a7146}">
 		<MatchType>MatchAny</MatchType>
@@ -18,4 +18,4 @@
 	</Group>
 
 
-</Groups>
+</PolicyGroups>
diff --git a/windows/device/Group Policy/mass_storage_groups_gpo_2_1{fb4ad01e-f41a-46c6-9ac1-268efa0ea083}.xml b/windows/device/Group Policy/mass_storage_groups_gpo_2_1{fb4ad01e-f41a-46c6-9ac1-268efa0ea083}.xml
index 8c2df39..c7c62ef 100644
--- a/windows/device/Group Policy/mass_storage_groups_gpo_2_1{fb4ad01e-f41a-46c6-9ac1-268efa0ea083}.xml	
+++ b/windows/device/Group Policy/mass_storage_groups_gpo_2_1{fb4ad01e-f41a-46c6-9ac1-268efa0ea083}.xml	
@@ -1,16 +1,18 @@
-<Group Id="{fb4ad01e-f41a-46c6-9ac1-268efa0ea083}" Type="Device">
-	<!-- ./Vendor/MSFT/Defender/Configuration/DeviceControl/PolicyGroups/%7Bfb4ad01e-f41a-46c6-9ac1-268efa0ea083%7D/GroupData -->
-	<Name>Mass_storage_groups_GPO_2_1</Name>
-	<MatchType>MatchAny</MatchType>
-	<DescriptorIdList>
-		<PrimaryId>RemovableMediaDevices</PrimaryId>
-		<PrimaryId>CdRomDevices</PrimaryId>
-		<PrimaryId>WpdDevices</PrimaryId>
-		<FriendlyNameId>SDHC*</FriendlyNameId>
-		<FriendlyNameId>SDXC*</FriendlyNameId>
-		<DeviceId>USBSTOR\CDROM&amp;VEN_KINGSTON&amp;PROD_DTLOCKER+G3</DeviceId>
-		<VID_PID>0951_169D</VID_PID>
-		<VID_PID>2009_16AF</VID_PID>
-		<VID_PID>1908_0226</VID_PID>
-	</DescriptorIdList>
-</Group>
\ No newline at end of file
+<PolicyGroups>
+	<Group Id="{fb4ad01e-f41a-46c6-9ac1-268efa0ea083}" Type="Device">
+		<!-- ./Vendor/MSFT/Defender/Configuration/DeviceControl/PolicyGroups/%7Bfb4ad01e-f41a-46c6-9ac1-268efa0ea083%7D/GroupData -->
+		<Name>Mass_storage_groups_GPO_2_1</Name>
+		<MatchType>MatchAny</MatchType>
+		<DescriptorIdList>
+			<PrimaryId>RemovableMediaDevices</PrimaryId>
+			<PrimaryId>CdRomDevices</PrimaryId>
+			<PrimaryId>WpdDevices</PrimaryId>
+			<FriendlyNameId>SDHC*</FriendlyNameId>
+			<FriendlyNameId>SDXC*</FriendlyNameId>
+			<DeviceId>USBSTOR\CDROM&amp;VEN_KINGSTON&amp;PROD_DTLOCKER+G3</DeviceId>
+			<VID_PID>0951_169D</VID_PID>
+			<VID_PID>2009_16AF</VID_PID>
+			<VID_PID>1908_0226</VID_PID>
+		</DescriptorIdList>
+	</Group>
+</PolicyGroups>	
\ No newline at end of file
diff --git a/windows/device/Group Policy/mass_storage_groups_gpo_2_2{7f191817-c305-451d-812a-1c4b03ebcec8}.xml b/windows/device/Group Policy/mass_storage_groups_gpo_2_2{7f191817-c305-451d-812a-1c4b03ebcec8}.xml
index cf87530..0fc954e 100644
--- a/windows/device/Group Policy/mass_storage_groups_gpo_2_2{7f191817-c305-451d-812a-1c4b03ebcec8}.xml	
+++ b/windows/device/Group Policy/mass_storage_groups_gpo_2_2{7f191817-c305-451d-812a-1c4b03ebcec8}.xml	
@@ -1,19 +1,21 @@
-<Group Id="{7f191817-c305-451d-812a-1c4b03ebcec8}" Type="Device">
-	<!-- ./Vendor/MSFT/Defender/Configuration/DeviceControl/PolicyGroups/%7B7f191817-c305-451d-812a-1c4b03ebcec8%7D/GroupData -->
-	<Name>Mass_storage_groups_GPO_2_2</Name>
-	<MatchType>MatchAny</MatchType>
-	<DescriptorIdList>
-		<VID_PID>07B4_0232</VID_PID>
-		<VID_PID>07B4_0279</VID_PID>
-		<VID_PID>07B4_0244</VID_PID>
-		<VID_PID>07B4_0264</VID_PID>
-		<VID_PID>07B4_0236</VID_PID>
-		<VID_PID>07B4_0245</VID_PID>
-		<VID_PID>0911_1F40</VID_PID>
-		<VID_PID>0911_251C</VID_PID>
-		<VID_PID>1D54_1072</VID_PID>
-		<VID_PID>1D54_1070</VID_PID>
-		<VID_PID>1D54_1080</VID_PID>
-		<VID_PID>054C_0B6F</VID_PID>
-	</DescriptorIdList>
-</Group>
\ No newline at end of file
+<PolicyGroups>
+	<Group Id="{7f191817-c305-451d-812a-1c4b03ebcec8}" Type="Device">
+		<!-- ./Vendor/MSFT/Defender/Configuration/DeviceControl/PolicyGroups/%7B7f191817-c305-451d-812a-1c4b03ebcec8%7D/GroupData -->
+		<Name>Mass_storage_groups_GPO_2_2</Name>
+		<MatchType>MatchAny</MatchType>
+		<DescriptorIdList>
+			<VID_PID>07B4_0232</VID_PID>
+			<VID_PID>07B4_0279</VID_PID>
+			<VID_PID>07B4_0244</VID_PID>
+			<VID_PID>07B4_0264</VID_PID>
+			<VID_PID>07B4_0236</VID_PID>
+			<VID_PID>07B4_0245</VID_PID>
+			<VID_PID>0911_1F40</VID_PID>
+			<VID_PID>0911_251C</VID_PID>
+			<VID_PID>1D54_1072</VID_PID>
+			<VID_PID>1D54_1070</VID_PID>
+			<VID_PID>1D54_1080</VID_PID>
+			<VID_PID>054C_0B6F</VID_PID>
+		</DescriptorIdList>
+	</Group>
+</PolicyGroups>
\ No newline at end of file
diff --git a/windows/device/Group Policy/mass_storage_groups_gpo_2_3{1653593b-5b92-47e6-975a-c43ffa9cd28d}.xml b/windows/device/Group Policy/mass_storage_groups_gpo_2_3{1653593b-5b92-47e6-975a-c43ffa9cd28d}.xml
index d2087f4..89bba8d 100644
--- a/windows/device/Group Policy/mass_storage_groups_gpo_2_3{1653593b-5b92-47e6-975a-c43ffa9cd28d}.xml	
+++ b/windows/device/Group Policy/mass_storage_groups_gpo_2_3{1653593b-5b92-47e6-975a-c43ffa9cd28d}.xml	
@@ -1,22 +1,24 @@
-<Group Id="{1653593b-5b92-47e6-975a-c43ffa9cd28d}" Type="Device">
-	<!-- ./Vendor/MSFT/Defender/Configuration/DeviceControl/PolicyGroups/%7B1653593b-5b92-47e6-975a-c43ffa9cd28d%7D/GroupData -->
-	<Name>Mass_storage_groups_GPO_2_3</Name>
-	<MatchType>MatchAny</MatchType>
-	<DescriptorIdList>
-		<VID_PID>046D_0837</VID_PID>
-		<VID_PID>046D_085B</VID_PID>
-		<VID_PID>046D_0825</VID_PID>
-		<VID_PID>03F0_5705</VID_PID>
-		<VID_PID>03F0_5D05</VID_PID>
-		<VID_PID>040A_6030</VID_PID>
-		<VID_PID>040A_601D</VID_PID>
-		<VID_PID>1083_1646</VID_PID>
-		<VID_PID>1083_1647</VID_PID>
-		<VID_PID>04CA_7053</VID_PID>
-		<VID_PID>04CA_7054</VID_PID>
-		<VID_PID>04F2_B51C</VID_PID>
-		<VID_PID>05C8_0383</VID_PID>
-		<VID_PID>05C8_034B</VID_PID>
-		<VID_PID>0461_4DFE</VID_PID>
-	</DescriptorIdList>
-</Group>
\ No newline at end of file
+<PolicyGroups>
+	<Group Id="{1653593b-5b92-47e6-975a-c43ffa9cd28d}" Type="Device">
+		<!-- ./Vendor/MSFT/Defender/Configuration/DeviceControl/PolicyGroups/%7B1653593b-5b92-47e6-975a-c43ffa9cd28d%7D/GroupData -->
+		<Name>Mass_storage_groups_GPO_2_3</Name>
+		<MatchType>MatchAny</MatchType>
+		<DescriptorIdList>
+			<VID_PID>046D_0837</VID_PID>
+			<VID_PID>046D_085B</VID_PID>
+			<VID_PID>046D_0825</VID_PID>
+			<VID_PID>03F0_5705</VID_PID>
+			<VID_PID>03F0_5D05</VID_PID>
+			<VID_PID>040A_6030</VID_PID>
+			<VID_PID>040A_601D</VID_PID>
+			<VID_PID>1083_1646</VID_PID>
+			<VID_PID>1083_1647</VID_PID>
+			<VID_PID>04CA_7053</VID_PID>
+			<VID_PID>04CA_7054</VID_PID>
+			<VID_PID>04F2_B51C</VID_PID>
+			<VID_PID>05C8_0383</VID_PID>
+			<VID_PID>05C8_034B</VID_PID>
+			<VID_PID>0461_4DFE</VID_PID>
+		</DescriptorIdList>
+	</Group>
+</PolicyGroups>
\ No newline at end of file
diff --git a/windows/device/Group Policy/mass_storage_groups_gpo_2_4{d2887bd4-a916-4011-a385-83c6b15df529}.xml b/windows/device/Group Policy/mass_storage_groups_gpo_2_4{d2887bd4-a916-4011-a385-83c6b15df529}.xml
index e34e627..e807738 100644
--- a/windows/device/Group Policy/mass_storage_groups_gpo_2_4{d2887bd4-a916-4011-a385-83c6b15df529}.xml	
+++ b/windows/device/Group Policy/mass_storage_groups_gpo_2_4{d2887bd4-a916-4011-a385-83c6b15df529}.xml	
@@ -1,9 +1,11 @@
-<Group Id="{d2887bd4-a916-4011-a385-83c6b15df529}" Type="Device">
-	<!-- ./Vendor/MSFT/Defender/Configuration/DeviceControl/PolicyGroups/%7Bd2887bd4-a916-4011-a385-83c6b15df529%7D/GroupData -->
-	<Name>Mass_storage_groups_GPO_2_4</Name>
-	<MatchType>MatchAny</MatchType>
-	<DescriptorIdList>
-		<VID_PID>09CB_1007</VID_PID>
-		<VID_PID>0F7E_900C</VID_PID>
-	</DescriptorIdList>
-</Group>
\ No newline at end of file
+<PolicyGroups>
+	<Group Id="{d2887bd4-a916-4011-a385-83c6b15df529}" Type="Device">
+		<!-- ./Vendor/MSFT/Defender/Configuration/DeviceControl/PolicyGroups/%7Bd2887bd4-a916-4011-a385-83c6b15df529%7D/GroupData -->
+		<Name>Mass_storage_groups_GPO_2_4</Name>
+		<MatchType>MatchAny</MatchType>
+		<DescriptorIdList>
+			<VID_PID>09CB_1007</VID_PID>
+			<VID_PID>0F7E_900C</VID_PID>
+		</DescriptorIdList>
+	</Group>
+</PolicyGroups>
\ No newline at end of file
diff --git a/windows/printer/Group Policy/Printer_Groups.xml b/windows/printer/Group Policy/Printer_Groups.xml
index 082c6ae..0f02579 100644
--- a/windows/printer/Group Policy/Printer_Groups.xml	
+++ b/windows/printer/Group Policy/Printer_Groups.xml	
@@ -1,4 +1,4 @@
-<Groups>	
+<PolicyGroups>	
 	<Group Id="{e5170dfb-19a9-4466-8109-d36c9c912b4e}" Type="Device">
 		<Name>PDF_XPS Printer</Name>
 		<MatchType>MatchAny</MatchType>
@@ -54,4 +54,4 @@
 	</Group>
 
 		
-</Groups>
\ No newline at end of file
+</PolicyGroups>
\ No newline at end of file
diff --git a/windows/printer/Group Policy/network_printers{257e3e1e-790c-4e29-ae2c-45a5f3363201}.xml b/windows/printer/Group Policy/network_printers{257e3e1e-790c-4e29-ae2c-45a5f3363201}.xml
index d368b79..1682fc7 100644
--- a/windows/printer/Group Policy/network_printers{257e3e1e-790c-4e29-ae2c-45a5f3363201}.xml	
+++ b/windows/printer/Group Policy/network_printers{257e3e1e-790c-4e29-ae2c-45a5f3363201}.xml	
@@ -1,8 +1,10 @@
-<Group Id="{257e3e1e-790c-4e29-ae2c-45a5f3363201}" Type="Device">
-	<!-- ./Vendor/MSFT/Defender/Configuration/DeviceControl/PolicyGroups/%7B257e3e1e-790c-4e29-ae2c-45a5f3363201%7D/GroupData -->
-	<Name>Network Printers</Name>
-	<MatchType>MatchAny</MatchType>
-	<DescriptorIdList>
-		<PrinterConnectionId>Network</PrinterConnectionId>
-	</DescriptorIdList>
-</Group>
\ No newline at end of file
+<PolicyGroups>
+	<Group Id="{257e3e1e-790c-4e29-ae2c-45a5f3363201}" Type="Device">
+		<!-- ./Vendor/MSFT/Defender/Configuration/DeviceControl/PolicyGroups/%7B257e3e1e-790c-4e29-ae2c-45a5f3363201%7D/GroupData -->
+		<Name>Network Printers</Name>
+		<MatchType>MatchAny</MatchType>
+		<DescriptorIdList>
+			<PrinterConnectionId>Network</PrinterConnectionId>
+		</DescriptorIdList>
+	</Group>
+</PolicyGroups>
\ No newline at end of file