diff --git a/CORE/Packages/Lazarus/Connectors/Indy/RestDatawareIndySockets.lpk b/CORE/Packages/Lazarus/Connectors/Indy/RestDatawareIndySockets.lpk
index 1bba37878..c85e38203 100644
--- a/CORE/Packages/Lazarus/Connectors/Indy/RestDatawareIndySockets.lpk
+++ b/CORE/Packages/Lazarus/Connectors/Indy/RestDatawareIndySockets.lpk
@@ -31,7 +31,7 @@
     </CompilerOptions>
     <Description Value="The proposal was fulfilled. REST DW was created to facilitate the creation of CRUDs in the same model that we created applications for Client / Server Database. Today, being able to write data to a bank via WebService is too complex for simple operations, making scheduling of simple screens time-consuming. With REST Dataware, you no longer have to worry about creating SQL Insertion, Deletion, Read, and Execution methods via Webservice; Simply add a RESTDataBase connection component and add a RESTClientSQL component that will already have your SQL solution fully functional as you did back in the day and with all the power of modern REST / JSON technology with data compression and everything the language can offer. Have fun."/>
     <License Value="GPL- 3.0"/>
-    <Version Major="2"/>
+    <Version Major="2" Release="3"/>
     <Files Count="84">
       <Item1>
         <Filename Value="RestDatawareIndySockets.lrs"/>
@@ -55,6 +55,7 @@
     <RequiredPkgs Count="5">
       <Item1>
         <PackageName Value="restdatawarecomponents"/>
+        <MinVersion Major="2" Valid="True"/>
       </Item1>
       <Item2>
         <PackageName Value="indylaz"/>
diff --git a/CORE/Packages/Lazarus/Drivers/zeos/restdwdriverzeos.lpk b/CORE/Packages/Lazarus/Drivers/zeos/restdwdriverzeos.lpk
index 2667f18d5..e10225d4a 100644
--- a/CORE/Packages/Lazarus/Drivers/zeos/restdwdriverzeos.lpk
+++ b/CORE/Packages/Lazarus/Drivers/zeos/restdwdriverzeos.lpk
@@ -12,7 +12,7 @@
         <IncludeFiles Value="..\..\..\..;..\..\..\..\Includes"/>
         <Libraries Value="..\..\..\..\static\$(TargetCPU)-$(TargetOS)"/>
         <OtherUnitFiles Value="..\..\libs;..\..;..\..\libs\JSON;..\..\..\..\Source\Database_Drivers"/>
-        <UnitOutputDirectory Value="..\..\..\..\compiledlaz"/>
+        <UnitOutputDirectory Value="..\..\..\..\Source\compiledlaz"/>
       </SearchPaths>
       <CodeGeneration>
         <Optimizations>
@@ -23,8 +23,8 @@
     <Description Value="The proposal was fulfilled. REST DW was created to facilitate the creation of CRUDs in the same model that we created applications for Client / Server Database. Today, being able to write data to a bank via WebService is too complex for simple operations, making scheduling of simple screens time-consuming. With REST Dataware, you no longer have to worry about creating SQL Insertion, Deletion, Read, and Execution methods via Webservice; Simply add a RESTDataBase connection component and add a RESTClientSQL component that will already have your SQL solution fully functional as you did back in the day and with all the power of modern REST / JSON technology with data compression and everything the language can offer. Have fun.
 "/>
     <License Value="GPL- 3.0"/>
-    <Version Major="2"/>
-    <Files Count="3">
+    <Version Major="2" Release="3"/>
+    <Files Count="2">
       <Item1>
         <Filename Value="restdwdriverzeos.lrs"/>
         <Type Value="LRS"/>
@@ -34,16 +34,12 @@
         <HasRegisterProc Value="True"/>
         <UnitName Value="uRESTDWDriverZEOS"/>
       </Item2>
-      <Item3>
-        <Filename Value="..\..\..\..\Source\Database_Drivers\uRESTDWDriverZEOSReg.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="uRESTDWDriverZEOSReg"/>
-      </Item3>
     </Files>
     <CompatibilityMode Value="True"/>
     <RequiredPkgs Count="4">
       <Item1>
         <PackageName Value="restdatawarecomponents"/>
+        <MinVersion Major="2" Valid="True"/>
       </Item1>
       <Item2>
         <PackageName Value="LR_ZeosDB"/>
diff --git a/CORE/Packages/Lazarus/Drivers/zeos/restdwdriverzeos.pas b/CORE/Packages/Lazarus/Drivers/zeos/restdwdriverzeos.pas
index be6de7707..e9c184807 100644
--- a/CORE/Packages/Lazarus/Drivers/zeos/restdwdriverzeos.pas
+++ b/CORE/Packages/Lazarus/Drivers/zeos/restdwdriverzeos.pas
@@ -8,14 +8,13 @@
 interface
 
 uses
-  uRESTDWDriverZEOS, uRESTDWDriverZEOSReg, LazarusPackageIntf;
+  uRESTDWDriverZEOS, LazarusPackageIntf;
 
 implementation
 
 procedure Register;
 begin
   RegisterUnit('uRESTDWDriverZEOS', @uRESTDWDriverZEOS.Register);
-  RegisterUnit('uRESTDWDriverZEOSReg', @uRESTDWDriverZEOSReg.Register);
 end;
 
 initialization
diff --git a/CORE/Packages/Lazarus/ShellTools/restdatawareshellservices.lpk b/CORE/Packages/Lazarus/ShellTools/restdatawareshellservices.lpk
index 2aabc9bd2..7d02aa09c 100644
--- a/CORE/Packages/Lazarus/ShellTools/restdatawareshellservices.lpk
+++ b/CORE/Packages/Lazarus/ShellTools/restdatawareshellservices.lpk
@@ -14,7 +14,7 @@
       </SearchPaths>
     </CompilerOptions>
     <License Value="GPL - 3.0"/>
-    <Version Major="2"/>
+    <Version Major="2" Release="3"/>
     <Files>
       <Item>
         <Filename Value="RestDatawareShellservices.lrs"/>
@@ -22,16 +22,18 @@
       </Item>
       <Item>
         <Filename Value="..\..\..\Source\ShellTools\uRESTDWShellServicesLazarus.pas"/>
-        <UnitName Value="uRESTDWShellServices"/>
+        <UnitName Value="uRESTDWShellServicesLazarus"/>
       </Item>
       <Item>
         <Filename Value="..\..\..\Source\ShellTools\uRESTDWShellServicesRegLazarus.pas"/>
-        <UnitName Value="uRESTDWShellServicesReg"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="uRESTDWShellServicesRegLazarus"/>
       </Item>
     </Files>
     <RequiredPkgs>
       <Item>
         <PackageName Value="restdatawarecomponents"/>
+        <MinVersion Major="2" Valid="True"/>
       </Item>
       <Item>
         <PackageName Value="weblaz"/>
diff --git a/CORE/Packages/Lazarus/ShellTools/restdatawareshellservices.pas b/CORE/Packages/Lazarus/ShellTools/restdatawareshellservices.pas
index 96a4665c3..b6e31309d 100644
--- a/CORE/Packages/Lazarus/ShellTools/restdatawareshellservices.pas
+++ b/CORE/Packages/Lazarus/ShellTools/restdatawareshellservices.pas
@@ -8,13 +8,14 @@
 interface
 
 uses
-  uRESTDWShellServicesLazarus, uRESTDWShellServicesRegLazarus, 
-  LazarusPackageIntf;
+  uRESTDWShellServicesLazarus, uRESTDWShellServicesRegLazarus, LazarusPackageIntf;
 
 implementation
 
 procedure Register;
 begin
+  RegisterUnit('uRESTDWShellServicesRegLazarus', 
+    @uRESTDWShellServicesRegLazarus.Register);
 end;
 
 initialization
diff --git a/CORE/Packages/Lazarus/restdatawarecomponents.lpk b/CORE/Packages/Lazarus/restdatawarecomponents.lpk
index 11b9e20f3..fbeec28f7 100644
--- a/CORE/Packages/Lazarus/restdatawarecomponents.lpk
+++ b/CORE/Packages/Lazarus/restdatawarecomponents.lpk
@@ -31,7 +31,7 @@
     </CompilerOptions>
     <Description Value="The proposal was fulfilled. REST DW was created to facilitate the creation of CRUDs in the same model that we created applications for Client / Server Database. Today, being able to write data to a bank via WebService is too complex for simple operations, making scheduling of simple screens time-consuming. With REST Dataware, you no longer have to worry about creating SQL Insertion, Deletion, Read, and Execution methods via Webservice; Simply add a RESTDataBase connection component and add a RESTClientSQL component that will already have your SQL solution fully functional as you did back in the day and with all the power of modern REST / JSON technology with data compression and everything the language can offer. Have fun."/>
     <License Value="GPL- 3.0"/>
-    <Version Major="2"/>
+    <Version Major="2" Release="3"/>
     <Files Count="82">
       <Item1>
         <Filename Value="restdatawarecomponents.lrs"/>