diff --git a/components/jvcllaz/examples/JvXPBar/WinXPBarDemo.lpi b/components/jvcllaz/examples/JvXPBar/WinXPBarDemo.lpi
index 373d5a011..105e7c0d2 100644
--- a/components/jvcllaz/examples/JvXPBar/WinXPBarDemo.lpi
+++ b/components/jvcllaz/examples/JvXPBar/WinXPBarDemo.lpi
@@ -28,7 +28,7 @@
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
-        <PackageName Value="JvXPBarLaz"/>
+        <PackageName Value="JvXPCtrlsLaz"/>
       </Item1>
       <Item2>
         <PackageName Value="LCL"/>
diff --git a/components/jvcllaz/examples/JvXPBar/WinXPBarDemo.lpr b/components/jvcllaz/examples/JvXPBar/WinXPBarDemo.lpr
index 460afcbc5..a611f4fe1 100644
--- a/components/jvcllaz/examples/JvXPBar/WinXPBarDemo.lpr
+++ b/components/jvcllaz/examples/JvXPBar/WinXPBarDemo.lpr
@@ -2,7 +2,7 @@ program WinXPBarDemo;
 
 uses
   Forms, Interfaces,
-  MainFrm in 'MainFrm.pas', JvXPBarLaz {frmMain};
+  MainFrm in 'MainFrm.pas', JvXPCtrlsLaz;
 
 {$R *.res}
 
diff --git a/components/jvcllaz/packages/JvXPBarLaz.lpk b/components/jvcllaz/packages/JvXPCtrlsLaz.lpk
similarity index 95%
rename from components/jvcllaz/packages/JvXPBarLaz.lpk
rename to components/jvcllaz/packages/JvXPCtrlsLaz.lpk
index 29eea1830..a83bb2a2c 100644
--- a/components/jvcllaz/packages/JvXPBarLaz.lpk
+++ b/components/jvcllaz/packages/JvXPCtrlsLaz.lpk
@@ -2,7 +2,7 @@
 <CONFIG>
   <Package Version="4">
     <PathDelim Value="\"/>
-    <Name Value="JvXPBarLaz"/>
+    <Name Value="JvXPCtrlsLaz"/>
     <Type Value="RunAndDesignTime"/>
     <AddToProjectUsesSection Value="True"/>
     <Author Value="Sergio Samayoa"/>
@@ -38,21 +38,21 @@
         <UnitName Value="JvXPCore"/>
       </Item3>
       <Item4>
-        <Filename Value="JvXPBarReg.pp"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="JvXPBarReg"/>
-      </Item4>
-      <Item5>
         <Filename Value="..\run\JvXPContainer.pas"/>
         <UnitName Value="JvXPContainer"/>
-      </Item5>
-      <Item6>
+      </Item4>
+      <Item5>
         <Filename Value="..\run\JvXPButtons.pas"/>
         <UnitName Value="JvXPButtons"/>
-      </Item6>
-      <Item7>
+      </Item5>
+      <Item6>
         <Filename Value="..\run\JvXPCheckCtrls.pas"/>
         <UnitName Value="JvXPCheckCtrls"/>
+      </Item6>
+      <Item7>
+        <Filename Value="JvXPCtrlsReg.pp"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="JvXPCtrlsReg"/>
       </Item7>
     </Files>
     <RequiredPkgs Count="3">
diff --git a/components/jvcllaz/packages/JvXPBarLaz.pas b/components/jvcllaz/packages/JvXPCtrlsLaz.pas
similarity index 52%
rename from components/jvcllaz/packages/JvXPBarLaz.pas
rename to components/jvcllaz/packages/JvXPCtrlsLaz.pas
index a650d1827..9497f1972 100644
--- a/components/jvcllaz/packages/JvXPBarLaz.pas
+++ b/components/jvcllaz/packages/JvXPCtrlsLaz.pas
@@ -2,22 +2,22 @@
   This source is only used to compile and install the package.
  }
 
-unit JvXPBarLaz;
+unit JvXPCtrlsLaz;
 
 {$warn 5023 off : no warning about unused units}
 interface
 
 uses
-  JvXPCoreUtils, JvXPBar, JvXPCore, JvXPBarReg, JvXPContainer, JvXPButtons, 
-  JvXPCheckCtrls, LazarusPackageIntf;
+  JvXPCoreUtils, JvXPBar, JvXPCore, JvXPContainer, JvXPButtons, 
+  JvXPCheckCtrls, JvXPCtrlsReg, LazarusPackageIntf;
 
 implementation
 
 procedure Register;
 begin
-  RegisterUnit('JvXPBarReg', @JvXPBarReg.Register);
+  RegisterUnit('JvXPCtrlsReg', @JvXPCtrlsReg.Register);
 end;
 
 initialization
-  RegisterPackage('JvXPBarLaz', @Register);
+  RegisterPackage('JvXPCtrlsLaz', @Register);
 end.
diff --git a/components/jvcllaz/packages/JvXPBarReg.pp b/components/jvcllaz/packages/JvXPCtrlsReg.pp
similarity index 87%
rename from components/jvcllaz/packages/JvXPBarReg.pp
rename to components/jvcllaz/packages/JvXPCtrlsReg.pp
index 099c6aff4..1d470bd26 100644
--- a/components/jvcllaz/packages/JvXPBarReg.pp
+++ b/components/jvcllaz/packages/JvXPCtrlsReg.pp
@@ -1,4 +1,4 @@
-unit JvXPBarReg;
+unit JvXPCtrlsReg;
 
 {$mode objfpc}{$H+}
 
@@ -27,7 +27,7 @@ begin
 end;
 
 initialization
-  {$I ../resource/JvXPBarLaz.lrs}
+  {$I ../resource/JvXPCtrlsLaz.lrs}
   
 end.