diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index f4c6972..4262faf 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -28,7 +28,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$       = "notepad-plus-plus.notepad-plus-plus"
+Set $ProductId$       = "notepad++.notepad++"
 Set $MinimumSpace$    = "20 MB"
 ; the path were we find the product after the installation
 Set $InstallDir$      = "%ProgramFiles32Dir%\Notepad++"
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index dd4d9d4..a78b616 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall32.ins
@@ -21,7 +21,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $ProductId$       = "notepad-plus-plus.notepad-plus-plus"
+Set $ProductId$       = "notepad++.notepad++"
 Set $InstallDir$      = "%ProgramFiles32Dir%\Notepad++"
 Set $LicenseRequired$ = "false"
 Set $LicensePool$     = "p_" + $ProductId$
diff --git a/OPSI/control b/OPSI/control
index 5a54961..f58139f 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -5,7 +5,7 @@ incremental: False
 
 [Product]
 type: localboot
-id: notepad-plus-plus.notepad-plus-plus
+id: notepad++.notepad++
 name: Notepad++
 description: Notepad++ is a free (as in "free speech" and also as in "free beer") source code editor and Notepad replacement that supports several languages.
 advice: ADVICE
diff --git a/builder-product.cfg b/builder-product.cfg
index da1cafe..4a314b5 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -1,7 +1,7 @@
 ############################
 # Setup product information 
 ############################
-PN="notepad-plus-plus.notepad-plus-plus"
+PN="notepad++.notepad++"
 VERSION="6.1.2"
 RELEASE="4"
 PRIORITY="0"