diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index d5d24c9..785aeab 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -42,7 +42,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$       = "msoffice2010"
+Set $ProductId$       = "microsoft.office2010"
 Set $MinimumSpace$    = "1500 MB"
 ; the path were we find the product after the installation
 Set $InstallDir32$      = "%ProgramFiles32Dir%\Microsoft Office"
diff --git a/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall3264.ins
index 81c3d5a..a8b67ba 100644
--- a/CLIENT_DATA/uninstall3264.ins
+++ b/CLIENT_DATA/uninstall3264.ins
@@ -37,7 +37,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $ProductId$       = "msoffice2010"
+Set $ProductId$       = "microsoft.office2010"
 Set $InstallDir32$    = "%ProgramFiles32Dir%\Microsoft Office
 Set $InstallDir64$    = "%ProgramFiles64Dir%\MicroSoft Office
 Set $LicenseRequired$ = "true
diff --git a/OPSI/control b/OPSI/control
index 51278f0..0f270e4 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -5,7 +5,7 @@ incremental: False
 
 [Product]
 type: localboot
-id: msoffice2010
+id: microsoft.office2010
 name: Microsoft Office 2010
 description: Microsoft Office 2010
 advice: ADVICE
@@ -32,6 +32,6 @@ default: ["system specific"]
 
 [ProductDependency]
 action: setup
-requiredProduct: xmlstarlet
+requiredProduct: sourceforge.xmlstarlet
 requiredStatus: installed
 requirementType: before
diff --git a/builder-product.cfg b/builder-product.cfg
index b7490e9..d62a9ad 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -2,7 +2,7 @@
 # Setup product information 
 ############################
 VENDOR="microsoft.com"
-PN="msoffice2010"
+PN="microsoft.office2010"
 VERSION="2010.1"
 RELEASE="3"
 PRIORITY="0"