diff --git a/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi b/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
index c087a5fa0..660e4cf73 100644
--- a/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
+++ b/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
@@ -55,7 +55,7 @@
         <MinVersion Major="1" Release="18" Build="56" Valid="True"/>
       </Item5>
     </RequiredPackages>
-    <Units Count="5">
+    <Units Count="13">
       <Unit0>
         <Filename Value="RxDBGridDemo.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -78,12 +78,10 @@
       </Unit1>
       <Unit2>
         <Filename Value="../../rxdbgrid.pas"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="2489"/>
         <CursorPos X="72" Y="2503"/>
         <UsageCount Value="11"/>
-        <Loaded Value="True"/>
       </Unit2>
       <Unit3>
         <Filename Value="../../rxdbgridexportspreadsheet.pas"/>
@@ -95,53 +93,114 @@
       </Unit3>
       <Unit4>
         <Filename Value="../../rxdconst.pas"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="100"/>
-        <CursorPos X="12" Y="121"/>
+        <CursorPos X="55" Y="121"/>
+        <UsageCount Value="10"/>
+      </Unit4>
+      <Unit5>
+        <Filename Value="../../rxautopanel.pas"/>
+        <UnitName Value="RxAutoPanel"/>
+        <EditorIndex Value="1"/>
+        <TopLine Value="32"/>
+        <CursorPos X="74" Y="56"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
-      </Unit4>
+      </Unit5>
+      <Unit6>
+        <Filename Value="../../registerrx.pas"/>
+        <EditorIndex Value="2"/>
+        <TopLine Value="26"/>
+        <CursorPos X="72" Y="59"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit6>
+      <Unit7>
+        <Filename Value="../../rxpickdate.pas"/>
+        <EditorIndex Value="8"/>
+        <CursorPos X="16" Y="32"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit7>
+      <Unit8>
+        <Filename Value="../../tooledit.pas"/>
+        <EditorIndex Value="3"/>
+        <TopLine Value="19"/>
+        <CursorPos X="25" Y="40"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit8>
+      <Unit9>
+        <Filename Value="../../rxdateutil.pas"/>
+        <EditorIndex Value="4"/>
+        <TopLine Value="16"/>
+        <CursorPos X="16" Y="32"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit9>
+      <Unit10>
+        <Filename Value="../../dbdateedit.pas"/>
+        <EditorIndex Value="5"/>
+        <TopLine Value="97"/>
+        <CursorPos X="16" Y="117"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit10>
+      <Unit11>
+        <Filename Value="../../dbutils.pas"/>
+        <EditorIndex Value="6"/>
+        <TopLine Value="145"/>
+        <CursorPos X="53" Y="168"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit11>
+      <Unit12>
+        <Filename Value="../../rxdaterangeeditunit.pas"/>
+        <UnitName Value="rxDateRangeEditUnit"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="7"/>
+        <TopLine Value="133"/>
+        <CursorPos X="8" Y="150"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit12>
     </Units>
-    <JumpHistory Count="10" HistoryIndex="7">
+    <JumpHistory Count="9" HistoryIndex="8">
       <Position1>
         <Filename Value="rxdbgridmainunit.pas"/>
         <Caret Line="14" Column="134"/>
       </Position1>
       <Position2>
-        <Filename Value="../../rxdbgrid.pas"/>
-      </Position2>
-      <Position3>
         <Filename Value="rxdbgridmainunit.pas"/>
         <Caret Line="172" Column="21" TopLine="158"/>
+      </Position2>
+      <Position3>
+        <Filename Value="../../registerrx.pas"/>
+        <Caret Line="58" Column="59" TopLine="38"/>
       </Position3>
       <Position4>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4649" Column="19" TopLine="4638"/>
+        <Filename Value="../../registerrx.pas"/>
+        <Caret Line="119" Column="24" TopLine="86"/>
       </Position4>
       <Position5>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="114" Column="19" TopLine="82"/>
+        <Filename Value="../../registerrx.pas"/>
+        <Caret Line="120" Column="45" TopLine="88"/>
       </Position5>
       <Position6>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="163" TopLine="131"/>
+        <Filename Value="../../registerrx.pas"/>
+        <Caret Line="191" Column="19" TopLine="158"/>
       </Position6>
       <Position7>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="609" Column="21" TopLine="587"/>
+        <Filename Value="../../registerrx.pas"/>
+        <Caret Line="123" Column="11" TopLine="103"/>
       </Position7>
       <Position8>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="2502" Column="51" TopLine="2491"/>
+        <Filename Value="../../registerrx.pas"/>
       </Position8>
       <Position9>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="741" Column="33" TopLine="722"/>
+        <Filename Value="../../rxdateutil.pas"/>
+        <Caret Line="32" Column="16" TopLine="16"/>
       </Position9>
-      <Position10>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="5423" Column="27" TopLine="5421"/>
-      </Position10>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/components/rx/trunk/dbdateedit.pas b/components/rx/trunk/dbdateedit.pas
index 900713c70..df1f4313c 100644
--- a/components/rx/trunk/dbdateedit.pas
+++ b/components/rx/trunk/dbdateedit.pas
@@ -114,7 +114,7 @@ type
   end;
   
 implementation
-uses DateUtil;
+uses rxdateutil;
 
 { TRxDBDateEdit }
 
diff --git a/components/rx/trunk/dbutils.pas b/components/rx/trunk/dbutils.pas
index f68d39019..d5b59c58f 100644
--- a/components/rx/trunk/dbutils.pas
+++ b/components/rx/trunk/dbutils.pas
@@ -165,7 +165,7 @@ procedure _DBError(const Msg: string);
 implementation
 
 uses Forms, Controls, Dialogs, RXDConst, VCLUtils, FileUtil,
-  AppUtils, RxAppUtils, RxStrUtils, Math, DateUtil, LazUTF8;
+  AppUtils, RxAppUtils, RxStrUtils, Math, rxdateutil, LazUTF8;
 
 { Utility routines }
 
diff --git a/components/rx/trunk/registerrx.pas b/components/rx/trunk/registerrx.pas
index a0d7916cc..fa2a8a72c 100644
--- a/components/rx/trunk/registerrx.pas
+++ b/components/rx/trunk/registerrx.pas
@@ -55,7 +55,7 @@ uses
   {$IFDEF USE_TRxAppIcon}
   RxAppIcon,
   {$ENDIF}
-  Dialogs, ComponentEditors, DBPropEdits, rxctrls, AutoPanel, pickdate, tooledit, rxclock,
+  Dialogs, ComponentEditors, DBPropEdits, rxctrls, RxAutoPanel, rxpickdate, tooledit, rxclock,
   rxspin, RxTimeEdit, rxDateRangeEditUnit, RxAboutDialog, RxViewsPanel, RxMDI;
 
 {$R rx.res}
@@ -187,8 +187,8 @@ begin
   RegisterUnit('rxappicon', @RegisterRxAppIcon);
   {$ENDIF}
   RegisterUnit('rxctrls', @RegisterRxCtrls);
-  RegisterUnit('AutoPanel', @RegisterAutoPanel);
-  RegisterUnit('pickdate', @RegisterPickDate);
+  RegisterUnit('RxAutoPanel', @RegisterAutoPanel);
+  RegisterUnit('rxpickdate', @RegisterPickDate);
   RegisterUnit('tooledit', @RegisterToolEdit);
   RegisterUnit('rxclock', @RegisterRxClock);
   RegisterUnit('rxspin', @RegisterRxSpin);
diff --git a/components/rx/trunk/autopanel.pas b/components/rx/trunk/rxautopanel.pas
similarity index 99%
rename from components/rx/trunk/autopanel.pas
rename to components/rx/trunk/rxautopanel.pas
index d3c86ffde..7d89bcdf0 100644
--- a/components/rx/trunk/autopanel.pas
+++ b/components/rx/trunk/rxautopanel.pas
@@ -29,7 +29,7 @@
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
 
-unit AutoPanel;
+unit RxAutoPanel;
 
 {$mode objfpc}{$H+}
 
diff --git a/components/rx/trunk/rxdaterangeeditunit.pas b/components/rx/trunk/rxdaterangeeditunit.pas
index 6c28d9044..f98f92102 100644
--- a/components/rx/trunk/rxdaterangeeditunit.pas
+++ b/components/rx/trunk/rxdaterangeeditunit.pas
@@ -147,7 +147,7 @@ type
   end;
 
 implementation
-uses dateutil, rxconst;
+uses rxdateutil, rxconst;
 
 { TRxCustomDateRangeEdit }
 
diff --git a/components/rx/trunk/dateutil.pas b/components/rx/trunk/rxdateutil.pas
similarity index 99%
rename from components/rx/trunk/dateutil.pas
rename to components/rx/trunk/rxdateutil.pas
index 0b658802c..cc11a0571 100644
--- a/components/rx/trunk/dateutil.pas
+++ b/components/rx/trunk/rxdateutil.pas
@@ -29,7 +29,7 @@
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
 
-unit dateutil;
+unit rxdateutil;
 
 {$I rx.inc}
 
diff --git a/components/rx/trunk/rxnew.lpk b/components/rx/trunk/rxnew.lpk
index 6a48820fd..9f98bf348 100644
--- a/components/rx/trunk/rxnew.lpk
+++ b/components/rx/trunk/rxnew.lpk
@@ -25,11 +25,11 @@ Copyright (c) 1998 Master-Bank
 translate to Lazarus by alexs in 2005 - 2016
 "/>
     <License Value="LGPL"/>
-    <Version Major="2" Minor="9" Release="3" Build="192"/>
+    <Version Major="2" Minor="9" Release="4" Build="200"/>
     <Files Count="70">
       <Item1>
-        <Filename Value="autopanel.pas"/>
-        <UnitName Value="AutoPanel"/>
+        <Filename Value="rxautopanel.pas"/>
+        <UnitName Value="rxautopanel"/>
       </Item1>
       <Item2>
         <Filename Value="boxprocs.pas"/>
@@ -68,8 +68,8 @@ translate to Lazarus by alexs in 2005 - 2016
         <UnitName Value="pagemngr"/>
       </Item10>
       <Item11>
-        <Filename Value="pickdate.pas"/>
-        <UnitName Value="pickdate"/>
+        <Filename Value="rxpickdate.pas"/>
+        <UnitName Value="rxpickdate"/>
       </Item11>
       <Item12>
         <Filename Value="registerrx.pas"/>
diff --git a/components/rx/trunk/rxnew.pas b/components/rx/trunk/rxnew.pas
index 9798a0882..b68b95f46 100644
--- a/components/rx/trunk/rxnew.pas
+++ b/components/rx/trunk/rxnew.pas
@@ -8,8 +8,8 @@ unit rxnew;
 interface
 
 uses
-  AutoPanel, boxprocs, curredit, dbcurredit, dbdateedit, dbutils, duallist, 
-  fduallst, folderlister, pagemngr, pickdate, registerrx, RegisterRxDB, 
+  RxAutoPanel, boxprocs, curredit, dbcurredit, dbdateedit, dbutils, duallist, 
+  fduallst, folderlister, pagemngr, rxpickdate, registerrx, RegisterRxDB, 
   RegisterRxTools, RxAboutDialog, rxAboutFormUnit, rxappicon, rxapputils, 
   rxclock, rxconst, rxctrls, RxDBColorBox, rxdbcomb, RxDBCtrls, rxdbgrid, 
   rxdbgrid_columsunit, rxdbgrid_findunit, RxDBSpinEdit, RxDBTimeEdit, 
diff --git a/components/rx/trunk/pickdate.pas b/components/rx/trunk/rxpickdate.pas
similarity index 99%
rename from components/rx/trunk/pickdate.pas
rename to components/rx/trunk/rxpickdate.pas
index 8d89e82bd..4b4409dc7 100644
--- a/components/rx/trunk/pickdate.pas
+++ b/components/rx/trunk/rxpickdate.pas
@@ -29,14 +29,14 @@ original conception from rx library for Delphi (c)
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 }
 
-unit pickdate;
+unit rxpickdate;
 
 {$I rx.inc}
 
 interface
 
 uses
-  LCLType, Classes, Controls, SysUtils, Graphics, DateUtil, Grids,
+  LCLType, Classes, Controls, SysUtils, Graphics, rxdateutil, Grids,
   LCLProc, LMessages, ExtCtrls, StdCtrls, Buttons, Forms, Menus;
 
 { TRxCalendar }
diff --git a/components/rx/trunk/rxtools.lpk b/components/rx/trunk/rxtools.lpk
index 8a2f3646c..1c71e1846 100644
--- a/components/rx/trunk/rxtools.lpk
+++ b/components/rx/trunk/rxtools.lpk
@@ -25,8 +25,8 @@
         <UnitName Value="rxstrutils"/>
       </Item2>
       <Item3>
-        <Filename Value="dateutil.pas"/>
-        <UnitName Value="dateutil"/>
+        <Filename Value="rxdateutil.pas"/>
+        <UnitName Value="rxdateutil"/>
       </Item3>
       <Item4>
         <Filename Value="rxfileutils.pas"/>
diff --git a/components/rx/trunk/rxtools.pas b/components/rx/trunk/rxtools.pas
index 3025a404c..3e89ffce1 100644
--- a/components/rx/trunk/rxtools.pas
+++ b/components/rx/trunk/rxtools.pas
@@ -8,7 +8,7 @@ unit rxtools;
 interface
 
 uses
-  rxConfigValues, rxstrutils, dateutil, rxFileUtils, LazarusPackageIntf;
+  rxConfigValues, rxstrutils, rxdateutil, rxFileUtils, LazarusPackageIntf;
 
 implementation
 
diff --git a/components/rx/trunk/tooledit.pas b/components/rx/trunk/tooledit.pas
index bacbfff0b..9b93320bb 100644
--- a/components/rx/trunk/tooledit.pas
+++ b/components/rx/trunk/tooledit.pas
@@ -37,7 +37,7 @@ interface
 
 uses
   Classes, SysUtils, LCLType, LMessages, Graphics, MaskEdit, Controls, EditBtn,
-  pickdate, dateutil;
+  rxpickdate, rxdateutil;
 
 type
   { TCustomDateEdit }