diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 35790b0..9768d42 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -31,7 +31,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$       = "winscp"
+Set $ProductId$       = "winscp.winscp"
 Set $MinimumSpace$    = "20 MB"
 ; the path were we find the product after the installation
 Set $InstallDir$      = "%ProgramFiles32Dir%\WinSCP"
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index f73b6b7..c407f3f 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall32.ins
@@ -27,7 +27,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $ProductId$       = "winscp"
+Set $ProductId$       = "winscp.winscp"
 Set $InstallDir$      = "%ProgramFiles32Dir%\WinSCP"
 ; ----------------------------------------------------------------
 
diff --git a/OPSI/control b/OPSI/control
index 162a929..9f89374 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -5,7 +5,7 @@ incremental: False
 
 [Product]
 type: localboot
-id: winscp
+id: winscp.winscp
 name: WinSCP
 description: WinSCP ist ein grafischer Open Source SFTP und FTP Client fuer Windows, der auch das alte SCP-Protokoll unterstuetzt.
 advice: ADVICE
diff --git a/builder-product.cfg b/builder-product.cfg
index f6ede31..744f0f9 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -2,7 +2,7 @@
 # Setup product information 
 ############################
 VENDOR="winscp.net"
-PN="winscp"
+PN="winscp.winscp"
 VERSION="4.3.7"
 RELEASE="1"
 PRIORITY="0"