diff --git a/components/jvcllaz/design/JvCtrls/JvCtrlsReg.pas b/components/jvcllaz/design/JvCtrls/jvctrlsreg.pas
similarity index 100%
rename from components/jvcllaz/design/JvCtrls/JvCtrlsReg.pas
rename to components/jvcllaz/design/JvCtrls/jvctrlsreg.pas
diff --git a/components/jvcllaz/design/JvCtrls/JvHTHintForm.lfm b/components/jvcllaz/design/JvCtrls/jvhthintform.lfm
similarity index 100%
rename from components/jvcllaz/design/JvCtrls/JvHTHintForm.lfm
rename to components/jvcllaz/design/JvCtrls/jvhthintform.lfm
diff --git a/components/jvcllaz/design/JvCtrls/JvHTHintForm.pas b/components/jvcllaz/design/JvCtrls/jvhthintform.pas
similarity index 100%
rename from components/jvcllaz/design/JvCtrls/JvHTHintForm.pas
rename to components/jvcllaz/design/JvCtrls/jvhthintform.pas
diff --git a/components/jvcllaz/packages/JvCtrlsLazD.lpk b/components/jvcllaz/packages/jvctrlslazd.lpk
similarity index 87%
rename from components/jvcllaz/packages/JvCtrlsLazD.lpk
rename to components/jvcllaz/packages/jvctrlslazd.lpk
index 282ee9b78..03c23af1c 100644
--- a/components/jvcllaz/packages/JvCtrlsLazD.lpk
+++ b/components/jvcllaz/packages/jvctrlslazd.lpk
@@ -10,7 +10,7 @@
       <PathDelim Value="\"/>
       <SearchPaths>
         <IncludeFiles Value="..\design\JvCtrls"/>
-        <OtherUnitFiles Value="..\design\JvCtrls"/>
+        <OtherUnitFiles Value="..\design\vCtrls"/>
         <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\design\JvCtrls"/>
       </SearchPaths>
     </CompilerOptions>
@@ -23,16 +23,16 @@
     <Version Major="1" Release="4"/>
     <Files Count="3">
       <Item1>
-        <Filename Value="..\design\JvCtrls\JvCtrlsReg.pas"/>
+        <Filename Value="..\design\JvCtrls\jvctrlsreg.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="JvCtrlsReg"/>
       </Item1>
       <Item2>
-        <Filename Value="..\design\JvCtrls\JvHTHintForm.lfm"/>
+        <Filename Value="..\design\JvCtrls\jvhthintform.lfm"/>
         <Type Value="LFM"/>
       </Item2>
       <Item3>
-        <Filename Value="..\design\JvCtrls\JvHTHintForm.pas"/>
+        <Filename Value="..\design\JvCtrls\jvhthintform.pas"/>
         <UnitName Value="JvHTHintForm"/>
       </Item3>
     </Files>
diff --git a/components/jvcllaz/packages/JvCtrlsLazR.lpk b/components/jvcllaz/packages/jvctrlslazr.lpk
similarity index 86%
rename from components/jvcllaz/packages/JvCtrlsLazR.lpk
rename to components/jvcllaz/packages/jvctrlslazr.lpk
index 09aa6d0e5..0d1f8bbda 100644
--- a/components/jvcllaz/packages/JvCtrlsLazR.lpk
+++ b/components/jvcllaz/packages/jvctrlslazr.lpk
@@ -21,19 +21,19 @@
     <Version Major="1" Release="4"/>
     <Files Count="4">
       <Item1>
-        <Filename Value="..\run\JvCtrls\JvHint.pas"/>
+        <Filename Value="..\run\JvCtrls\jvhint.pas"/>
         <UnitName Value="JvHint"/>
       </Item1>
       <Item2>
-        <Filename Value="..\run\JvCtrls\JvHtControls.pas"/>
+        <Filename Value="..\run\JvCtrls\jvhtcontrols.pas"/>
         <UnitName Value="JvHtControls"/>
       </Item2>
       <Item3>
-        <Filename Value="..\run\JvCtrls\JvMovableBevel.pas"/>
+        <Filename Value="..\run\JvCtrls\jvmovablebevel.pas"/>
         <UnitName Value="JvMovableBevel"/>
       </Item3>
       <Item4>
-        <Filename Value="..\run\JvCtrls\JvRuler.pas"/>
+        <Filename Value="..\run\JvCtrls\jvruler.pas"/>
         <UnitName Value="JvRuler"/>
       </Item4>
     </Files>
diff --git a/components/jvcllaz/run/JvCtrls/JvHint.pas b/components/jvcllaz/run/JvCtrls/jvhint.pas
similarity index 100%
rename from components/jvcllaz/run/JvCtrls/JvHint.pas
rename to components/jvcllaz/run/JvCtrls/jvhint.pas
diff --git a/components/jvcllaz/run/JvCtrls/JvHtControls.pas b/components/jvcllaz/run/JvCtrls/jvhtcontrols.pas
similarity index 100%
rename from components/jvcllaz/run/JvCtrls/JvHtControls.pas
rename to components/jvcllaz/run/JvCtrls/jvhtcontrols.pas
diff --git a/components/jvcllaz/run/JvCtrls/JvMovableBevel.pas b/components/jvcllaz/run/JvCtrls/jvmovablebevel.pas
similarity index 100%
rename from components/jvcllaz/run/JvCtrls/JvMovableBevel.pas
rename to components/jvcllaz/run/JvCtrls/jvmovablebevel.pas
diff --git a/components/jvcllaz/run/JvCtrls/JvRuler.pas b/components/jvcllaz/run/JvCtrls/jvruler.pas
similarity index 100%
rename from components/jvcllaz/run/JvCtrls/JvRuler.pas
rename to components/jvcllaz/run/JvCtrls/jvruler.pas