diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index 011e036..d28c2a7 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -39,7 +39,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ;$ProductId$ should be the name of the product in opsi
 ; therefore please: only lower letters, no umlauts, 
 ; no white space use '-' as a seperator
-Set $ProductId$       = "autoit"
+Set $ProductId$       = "autoit.script"
 Set $MinimumSpace$    = "15 MB"
 ; the path were we find the product after the installation
 Set $InstallDir32$      = "%ProgramFiles32Dir%\AutoIt3"
diff --git a/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall3264.ins
index 442afc5..be18c28 100644
--- a/CLIENT_DATA/uninstall3264.ins
+++ b/CLIENT_DATA/uninstall3264.ins
@@ -35,7 +35,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $ProductId$       = "autoit"
+Set $ProductId$       = "autoit.script"
 Set $InstallDir32$    = "%ProgramFiles32Dir%\AutoIt3"
 Set $InstallDir64$    = "%ProgramFiles64Dir%\AutoIt3"
 ; ----------------------------------------------------------------
diff --git a/OPSI/control b/OPSI/control
index d19f02a..af58fc6 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -5,7 +5,7 @@ incremental: False
 
 [Product]
 type: localboot
-id: autoit
+id: autoit.script
 name: AutoIt
 description: AutoIt v3 is a freeware BASIC-like scripting language designed for automating the Windows GUI and general scripting.
 advice: ADVICE
diff --git a/builder-product.cfg b/builder-product.cfg
index 4c45f3a..5936bb7 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -2,7 +2,7 @@
 # Setup product information 
 ############################
 VENDOR="autoitscript.com"
-PN="autoit"
+PN="autoit.script"
 VERSION="3.3.8.1"
 RELEASE="1"
 PRIORITY="0"