diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index a9e3eeb..afd1b3a 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$       = "vlc"
+Set $ProductId$       = "videolan.vlc"
 Set $MinimumSpace$    = "30 MB"
 ; the path were we find the product after the installation
 Set $InstallDir$      = "%ProgramFiles32Dir%\VideoLAN\VLC"
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index a0863eb..b6554f4 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$       = "vlc"
+Set $ProductId$       = "videolan.vlc"
 Set $InstallDir$      = "%ProgramFiles32Dir%\VideoLAN\VLC"
 ; ----------------------------------------------------------------
 
diff --git a/OPSI/control b/OPSI/control
index c6e7218..53bda80 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -5,7 +5,7 @@ incremental: False
 
 [Product]
 type: localboot
-id: vlc
+id: videolan.vlc
 name: VLC media player
 description: VLC is a free and open source cross-platform multimedia player and framework that plays most multimedia files as well as DVD, Audio CD, VCD, and various streaming protocols.
 advice: ADVICE
diff --git a/builder-product.cfg b/builder-product.cfg
index 273b25c..d1390a5 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -2,7 +2,7 @@
 # Setup product information 
 ############################
 VENDOR="videolan.org"
-PN="vlc"
+PN="videolan.vlc"
 VERSION="2.0.1"
 RELEASE="1"
 PRIORITY="0"