diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index fdf67f9..ba27f92 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -35,7 +35,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$       = "camstudio"
+Set $ProductId$       = "camstudio.camstudio"
 Set $MinimumSpace$    = "20 MB"
 ; the path were we find the product after the installation
 Set $InstallDir$      = "%ProgramFiles32Dir%\CamStudio 2.6b"
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index 7a8c223..226c324 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall32.ins
@@ -20,7 +20,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $ProductId$       = "camstudio"
+Set $ProductId$       = "camstudio.camstudio"
 Set $InstallDir$      = "%ProgramFiles32Dir%\CamStudio 2.6b"
 Set $LicenseRequired$ = "false"
 Set $LicensePool$     = "p_" + $ProductId$
diff --git a/OPSI/control b/OPSI/control
index d415539..cb97a28 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -5,7 +5,7 @@ incremental: False
 
 [Product]
 type: localboot
-id: camstudio
+id: camstudio.camstudio
 name: camstudio
 description: Free Streaming Video Software 
 advice: ADVICE
diff --git a/builder-product.cfg b/builder-product.cfg
index e667cfa..4ef20fd 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -2,7 +2,7 @@
 # Setup product information 
 ############################
 VENDOR="camstudio.org"
-PN="camstudio"
+PN="camstudio.camstudio"
 VERSION="2.6b.rev294"
 RELEASE="1"
 PRIORITY="0"