diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins
index ddb0aae..e92ee24 100644
--- a/CLIENT_DATA/cleanup3264.ins
+++ b/CLIENT_DATA/cleanup3264.ins
@@ -30,112 +30,112 @@ if ($reboot$ = "true")
 endif
 
 if ($sereby_msjsharp$ = "reinstall")
-    Dosbatch_msjsharp_uninstall
+    DosInAnIcon_msjsharp_uninstall
     opsiservicecall_msjsharp_reinstall
     Set $reboot$ = "true"
 endif
 if ($sereby_msjsharp$ = "uninstall")
-    Dosbatch_msjsharp_uninstall
+    DosInAnIcon_msjsharp_uninstall
     opsiservicecall_msjsharp_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_msfsharp$ = "reinstall")
-    Dosbatch_msfsharp_uninstall
+    DosInAnIcon_msfsharp_uninstall
     opsiservicecall_msfsharp_reinstall
     Set $reboot$ = "true"
 endif
 if ($sereby_msfsharp$ = "uninstall")
-    Dosbatch_msfsharp_uninstall
+    DosInAnIcon_msfsharp_uninstall
     opsiservicecall_msfsharp_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_silver$ = "reinstall")
-    Dosbatch_silver_uninstall
+    DosInAnIcon_silver_uninstall
     opsiservicecall_silver_reinstall
     Set $reboot$ = "true"
 endif
 if ($sereby_silver$ = "uninstall")
-    Dosbatch_silver_uninstall
+    DosInAnIcon_silver_uninstall
     opsiservicecall_silver_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_jre7$ = "reinstall")
-    Dosbatch_jre7_uninstall
+    DosInAnIcon_jre7_uninstall
     opsiservicecall_jre7_reinstall
     Set $reboot$ = "true"
 endif
 if ($sereby_jre7$ = "uninstall")
-    Dosbatch_jre7_uninstall
+    DosInAnIcon_jre7_uninstall
     opsiservicecall_jre7_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_jre8$ = "reinstall")
-    Dosbatch_jre8_uninstall
+    DosInAnIcon_jre8_uninstall
     opsiservicecall_jre8_reinstall
     Set $reboot$ = "true"
 endif
 if ($sereby_jre8$ = "uninstall")
-    Dosbatch_jre8_uninstall
+    DosInAnIcon_jre8_uninstall
     opsiservicecall_jre8_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_AdobeShock$ = "reinstall")
-    Dosbatch_AdobeShock_uninstall
+    DosInAnIcon_AdobeShock_uninstall
     opsiservicecall_AdobeShock_reinstall
     Set $reboot$ = "true"
 endif
 if ($sereby_AdobeShock$ = "uninstall")
-    Dosbatch_AdobeShock_uninstall
+    DosInAnIcon_AdobeShock_uninstall
     opsiservicecall_AdobeShock_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_basicruntimes$ = "reinstall")
-    Dosbatch_basicruntimes_uninstall
+    DosInAnIcon_basicruntimes_uninstall
     opsiservicecall_basicruntimes_reinstall
     Set $reboot$ = "true"
 endif
 if ($sereby_basicruntimes$ = "uninstall")
-    Dosbatch_basicruntimes_uninstall
+    DosInAnIcon_basicruntimes_uninstall
     opsiservicecall_basicruntimes_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_msdx9$ = "reinstall")
-    Dosbatch_msdx9_uninstall
+    DosInAnIcon_msdx9_uninstall
     opsiservicecall_msdx9_reinstall
     Set $reboot$ = "true"
 endif
 if ($sereby_msdx9$ = "uninstall")
-    Dosbatch_msdx9_uninstall
+    DosInAnIcon_msdx9_uninstall
     opsiservicecall_msdx9_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_msvc$ = "reinstall")
-    Dosbatch_msvc_uninstall
+    DosInAnIcon_msvc_uninstall
     opsiservicecall_msvc_reinstall
     Set $reboot$ = "true"
 endif
 if ($sereby_msvc$ = "uninstall")
-    Dosbatch_msvc_uninstall
+    DosInAnIcon_msvc_uninstall
     opsiservicecall_msvc_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_AdobeFlash$ = "reinstall")
-    Dosbatch_AdobeFlash_uninstall
+    DosInAnIcon_AdobeFlash_uninstall
     opsiservicecall_AdobeFlash_reinstall
     Set $reboot$ = "true"
 endif
 if ($sereby_AdobeFlash$ = "uninstall")
-    Dosbatch_AdobeFlash_uninstall
+    DosInAnIcon_AdobeFlash_uninstall
     opsiservicecall_AdobeFlash_uninstall
     Set $reboot$ = "true"
 endif
 if ($sereby_AdobeAir$ = "reinstall")
-    Dosbatch_AdobeAir_uninstall
+    DosInAnIcon_AdobeAir_uninstall
     opsiservicecall_AdobeAir_reinstall
     Set $reboot$ = "true"
 endif
 if ($sereby_AdobeAir$ = "uninstall")
-    Dosbatch_AdobeAir_uninstall
+    DosInAnIcon_AdobeAir_uninstall
     opsiservicecall_AdobeAir_uninstall
     Set $reboot$ = "true"
 endif
@@ -296,7 +296,7 @@ endif
 "%opsiserviceUser%"
 ]
 
-[Dosbatch_msjsharp_uninstall]
+[DosInAnIcon_msjsharp_uninstall]
 
 [opsiservicecall_msjsharp_reinstall]
 "method": "setProductProperty"
@@ -316,7 +316,7 @@ endif
 "%opsiserviceUser%"
 ]
 
-[Dosbatch_msfsharp_uninstall]
+[DosInAnIcon_msfsharp_uninstall]
 
 [opsiservicecall_msfsharp_reinstall]
 "method": "setProductProperty"
@@ -336,7 +336,7 @@ endif
 "%opsiserviceUser%"
 ]
 
-[Dosbatch_silver_uninstall]
+[DosInAnIcon_silver_uninstall]
 ; wmic product where caption='Microsoft Silverlight' call uninstall
 ;"%ScriptPath%\UnInstall\Package\Silverlight\CleanSilverlight.cmd"
 wmic /INTERACTIVE:OFF product where name="Microsoft Silverlight" call uninstall
@@ -359,13 +359,13 @@ wmic /INTERACTIVE:OFF product where name="Microsoft Silverlight" call uninstall
 "%opsiserviceUser%"
 ]
 
-[DosBatch_jre7_uninstall]
+[DosInAnIcon_jre7_uninstall]
 @echo off
 rem copy "%ScriptPath%\UnInstall\Packages\JRE\JavaRa.*" "$LogDir$\"
 rem $LogDir$\JavaRa.exe /SILENT /PURGE /UPDATEDEFS
 cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /keeponly
 
-[DosBatch_jre8_uninstall]
+[DosInAnIcon_jre8_uninstall]
 @echo off
 rem copy "%ScriptPath%\UnInstall\Packages\JRE\JavaRa.*" "$LogDir$\"
 rem $LogDir$\JavaRa.exe /SILENT /PURGE /UPDATEDEFS
@@ -407,7 +407,7 @@ cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /k
 "%opsiserviceUser%"
 ]
 
-[Dosbatch_AdobeShock_uninstall]
+[DosInAnIcon_AdobeShock_uninstall]
 "%ScriptPath%\UnInstall\Packages\Shockwave\uninstall_shock_player.exe" /s
 wmic /INTERACTIVE:OFF product where name="Adobe Shockwave Player 12.1" call uninstall
 
@@ -429,7 +429,7 @@ wmic /INTERACTIVE:OFF product where name="Adobe Shockwave Player 12.1" call unin
 "%opsiserviceUser%"
 ]
 
-[Dosbatch_basicruntimes_uninstall]
+[DosInAnIcon_basicruntimes_uninstall]
 wmic /INTERACTIVE:OFF product where name="Allgemeine Runtime Files (x86)" call uninstall
 
 [opsiservicecall_basicruntimes_reinstall]
@@ -450,7 +450,7 @@ wmic /INTERACTIVE:OFF product where name="Allgemeine Runtime Files (x86)" call u
 "%opsiserviceUser%"
 ]
 
-[Dosbatch_msdx9_uninstall]
+[DosInAnIcon_msdx9_uninstall]
 
 [opsiservicecall_msdx9_reinstall]
 "method": "setProductProperty"
@@ -470,7 +470,7 @@ wmic /INTERACTIVE:OFF product where name="Allgemeine Runtime Files (x86)" call u
 "%opsiserviceUser%"
 ]
 
-[Dosbatch_msdxm_uninstall]
+[DosInAnIcon_msdxm_uninstall]
 
 [opsiservicecall_msdxm_reinstall]
 "method": "setProductProperty"
@@ -490,7 +490,7 @@ wmic /INTERACTIVE:OFF product where name="Allgemeine Runtime Files (x86)" call u
 "%opsiserviceUser%"
 ]
 
-[Dosbatch_msvc_uninstall]
+[DosInAnIcon_msvc_uninstall]
 
 [opsiservicecall_msvc_reinstall]
 "method": "setProductProperty"
@@ -510,7 +510,7 @@ wmic /INTERACTIVE:OFF product where name="Allgemeine Runtime Files (x86)" call u
 "%opsiserviceUser%"
 ]
 
-[Dosbatch_AdobeFlash_uninstall]
+[DosInAnIcon_AdobeFlash_uninstall]
 "%ScriptPath%\UnInstall\Packages\Flash\uninstall_flash_player.exe -uninstall
 ;"%ScriptPath%\UnInstall\Packages\Flash\uninstall_flash_player.exe -uninstall activex
 ;"%ScriptPath%\UnInstall\Packages\Flash\uninstall_flash_player.exe -uninstall plugin
@@ -533,7 +533,7 @@ wmic /INTERACTIVE:OFF product where name="Allgemeine Runtime Files (x86)" call u
 "%opsiserviceUser%"
 ]
 
-[Dosbatch_AdobeAir_uninstall]
+[DosInAnIcon_AdobeAir_uninstall]
 wmic /INTERACTIVE:OFF product where name="Adobe AIR" call uninstall
 
 [opsiservicecall_AdobeAir_reinstall]