diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup.ins
index 5e4c709..fb7aa59 100644
--- a/CLIENT_DATA/setup.ins
+++ b/CLIENT_DATA/setup.ins
@@ -37,7 +37,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$       = "7zip"
+Set $ProductId$       = "7-zip.7zip"
 Set $MinimumSpace$    = "3 MB"
 ; the path were we find the product after the installation
 Set $InstallDir32$      = "%ProgramFiles32Dir%\7-Zip"
diff --git a/CLIENT_DATA/uninstall.ins b/CLIENT_DATA/uninstall.ins
index 1bb309e..5876ba4 100644
--- a/CLIENT_DATA/uninstall.ins
+++ b/CLIENT_DATA/uninstall.ins
@@ -29,7 +29,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $ProductId$       = "7zip"
+Set $ProductId$       = "7-zip.7zip"
 Set $InstallDir32$      = "%ProgramFiles32Dir%\7-Zip"
 Set $InstallDir64$      = "%ProgramFiles64Dir%\7-Zip"
 Set $LicenseRequired$ = "false"
diff --git a/OPSI/control b/OPSI/control
index 1cf7cee..a34c13d 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -5,7 +5,7 @@ incremental: False
 
 [Product]
 type: localboot
-id: 7zip
+id: 7-zip.7zip
 name: 7-Zip file archiver
 description: 7-Zip is a file archiver with a high compression ratio.
 advice: ADVICE
diff --git a/builder-product.cfg b/builder-product.cfg
index 0a3b218..d7b27dd 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -2,7 +2,7 @@
 # Setup product information 
 ############################
 VENDOR="7-zip.org"
-PN="7zip"
+PN="7-zip.7zip"
 VERSION="9.20"
 RELEASE="2"
 PRIORITY="0"