diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 498d2c5..eaaa025 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -35,7 +35,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$       = "capslockgoodbye"
+Set $ProductId$       = "melk.capslockgoodbye"
 Set $MinimumSpace$    = "1 MB"
 ; the path were we find the product after the installation
 Set $InstallDir$      = "%ProgramFiles32Dir%\CapsLockGoodbye"
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index 958e595..4dfae3f 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall32.ins
@@ -30,7 +30,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $ProductId$       = "capslockgoodbye"
+Set $ProductId$       = "melk.capslockgoodbye"
 Set $InstallDir$      = "%ProgramFiles32Dir%\CapsLockGoodbye"
 Set $LicenseRequired$ = "false"
 Set $LicensePool$     = "p_" + $ProductId$
diff --git a/OPSI/control b/OPSI/control
index 40aeb79..aa1e3a9 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -5,7 +5,7 @@ incremental: False
 
 [Product]
 type: localboot
-id: capslockgoodbye
+id: melk.capslockgoodbye
 name: CapsLock Goodbye
 description: "CapsLock Goodbye" ermoeglicht eine Umbelegung der CapsLock-Tastenfunktion.
 advice: ADVICE
@@ -32,6 +32,6 @@ default: ["system specific"]
 
 [ProductDependency]
 action: setup
-requiredProduct: aio
+requiredProduct: sereby.aio
 requiredStatus: installed
 requirementType: before
diff --git a/builder-product.cfg b/builder-product.cfg
index 41f43f0..97d3ca1 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -2,7 +2,7 @@
 # Setup product information 
 ############################
 VENDOR="melk.de"
-PN="capslockgoodbye"
+PN="melk.capslockgoodbye"
 VERSION="2.0"
 RELEASE="1"
 PRIORITY="0"