diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 25fb1c0..e2ba93d 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -24,7 +24,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$       = "putty"
+Set $ProductId$       = "bitvise.putty"
 Set $MinimumSpace$    = "10 MB"
 ; the path were we find the product after the installation
 Set $InstallDir$      = "%ProgramFiles32Dir%\PuTTY"
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index 877ed77..e21e79e 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall32.ins
@@ -17,7 +17,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $ProductId$       = "putty"
+Set $ProductId$       = "bitvise.putty"
 Set $InstallDir$      = "%ProgramFiles32Dir%\PuTTY"
 ; ----------------------------------------------------------------
 
diff --git a/OPSI/control b/OPSI/control
index 3aafa2a..dc86558 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -5,7 +5,7 @@ incremental: False
 
 [Product]
 type: localboot
-id: putty
+id: bitvise.putty
 name: Putty
 description: PuTTY is a free implementation of Telnet and SSH for Windows and Unix platforms, along with an xterm terminal emulator.
 advice: ADVICE
diff --git a/builder-product.cfg b/builder-product.cfg
index db6fcbd..2332d54 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -2,7 +2,7 @@
 # Setup product information 
 ############################
 VENDOR="www.putty.org"
-PN="putty"
+PN="bitvise.putty"
 VERSION="0.62"
 RELEASE="1"
 PRIORITY="0"