diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 9844e71..c639961 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$       = "filezilla.filezilla"
+Set $ProductId$       = "filezilla.client"
 Set $MinimumSpace$    = "20 MB"
 ; the path were we find the product after the installation
 Set $InstallDir$      = "%ProgramFiles32Dir%\FileZilla FTP Client"
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index d15bc9a..49ffbe0 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$       = "filezilla.filezilla"
+Set $ProductId$       = "filezilla.client"
 Set $InstallDir$      = "%ProgramFiles32Dir%\FileZilla FTP Client"
 ; ----------------------------------------------------------------
 
diff --git a/OPSI/control b/OPSI/control
index bc4d36b..15441d5 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -5,8 +5,8 @@ incremental: False
 
 [Product]
 type: localboot
-id: filezilla.filezilla
-name: FileZilla
+id: filezilla.client
+name: FileZilla.client
 description: FileZilla ist ein modernes und leistungsstarkes FTP-Programm fuer Windows, MAC und Linux Betriebssysteme.
 advice: ADVICE
 version: VERSION
diff --git a/builder-product.cfg b/builder-product.cfg
index ee2b3a3..5b54a22 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -2,7 +2,7 @@
 # Setup product information 
 ############################
 VENDOR="filezilla.de"
-PN="filezilla.filezilla"
+PN="filezilla.client"
 VERSION="3.6.0.2"
 RELEASE="3"
 PRIORITY="0"