diff --git a/CLIENT_DATA/opsi-melk.capslockgoodbye.ini b/CLIENT_DATA/opsi-melk.capslockgoodbye.ini
index d603fda..a47ff02 100644
--- a/CLIENT_DATA/opsi-melk.capslockgoodbye.ini
+++ b/CLIENT_DATA/opsi-melk.capslockgoodbye.ini
@@ -11,7 +11,7 @@ DesktopShortcut=1
 InstallTo=1
 StartMenuShortcut=1
 NoUserInteraction=1
-InstallFolder=%zi.ProgramFiles%\%zi.ProductName%
+InstallFolder=%zi.ProgramFiles%\%zi.CompanyName%\%zi.ProductName%
 StartMenuFolder=%zi.CompanyName%\%zi.ProductName%
 ProductName=CapsLock Goodbye
 ProductVersion=2.0
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 0ecdefe..f56999d 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -39,7 +39,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; no white space use '-' as a seperator
 Set $MinimumSpace$    = "4 MB"
 ; the path were we find the product after the installation
-Set $InstallDir$      = "%ProgramFiles32Dir%\CapsLock Goodbye"
+Set $InstallDir$      = "%ProgramFiles32Dir%\Melk\CapsLock Goodbye"
 ; ----------------------------------------------------------------
 
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index 0ac5e60..3785350 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall32.ins
@@ -33,7 +33,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $InstallDir$      = "%ProgramFiles32Dir%\CapsLock Goodbye"
+Set $InstallDir$      = "%ProgramFiles32Dir%\Melk\CapsLock Goodbye"
 ; ----------------------------------------------------------------
 
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"