8 files changed, 17 insertions, 16 deletions
diff --git a/extras/contributed/report_tool/demo/pdf_demo.lpi b/extras/contributed/report_tool/demo/pdf_demo.lpi
index 921ffd44..6ce6e8c6 100644
--- a/extras/contributed/report_tool/demo/pdf_demo.lpi
+++ b/extras/contributed/report_tool/demo/pdf_demo.lpi
@@ -36,7 +36,8 @@
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
-        <PackageName Value="impression"/>
+        <PackageName Value="fpg_report"/>
+        <MaxVersion Minor="1"/>
       </Item1>
       <Item2>
         <PackageName Value="fpgui_toolkit"/>
diff --git a/extras/contributed/report_tool/demo/u_demo.pas b/extras/contributed/report_tool/demo/u_demo.pas
index 98a707a7..675ee271 100644
--- a/extras/contributed/report_tool/demo/u_demo.pas
+++ b/extras/contributed/report_tool/demo/u_demo.pas
@@ -10,7 +10,7 @@ uses
   ShellApi,
   {$endif}
   fpg_main, fpg_base,
-  fpg_form, fpg_button, fpg_label, fpg_dialogs, fpg_utils, U_Imprime;
+  fpg_form, fpg_button, fpg_label, fpg_dialogs, fpg_utils, U_Report;
 
 type
   TF_Demo = class(TfpgForm)
@@ -108,7 +108,7 @@ var
 implementation
 
 uses
-  U_Commande, U_Pdf, U_ReportImages{, U_DemoImages};
+  U_Command, U_Pdf, U_ReportImages{, U_DemoImages};
 
 var
   ChartValues: array[0..18] of Integer;
diff --git a/extras/contributed/report_tool/reportengine/impression.lpk b/extras/contributed/report_tool/reportengine/fpg_report.lpk
index d1d899ba..d796c9fb 100644
--- a/extras/contributed/report_tool/reportengine/impression.lpk
+++ b/extras/contributed/report_tool/reportengine/fpg_report.lpk
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <CONFIG>
   <Package Version="4">
-    <Name Value="impression"/>
+    <Name Value="fpg_report"/>
     <Author Value="&quot;Jean-Marc Levecque&quot; &lt;jmarc.levecque@dbmail.com>"/>
     <CompilerOptions>
       <Version Value="11"/>
@@ -28,12 +28,12 @@
     <Version Minor="1"/>
     <Files Count="5">
       <Item1>
-        <Filename Value="u_commande.pas"/>
-        <UnitName Value="U_Commande"/>
+        <Filename Value="u_command.pas"/>
+        <UnitName Value="U_Command"/>
       </Item1>
       <Item2>
-        <Filename Value="u_imprime.pas"/>
-        <UnitName Value="U_Imprime"/>
+        <Filename Value="u_report.pas"/>
+        <UnitName Value="U_Report"/>
       </Item2>
       <Item3>
         <Filename Value="u_pdf.pas"/>
diff --git a/extras/contributed/report_tool/reportengine/impression.pas b/extras/contributed/report_tool/reportengine/fpg_report.pas
index 5ef47b47..9479e685 100644
--- a/extras/contributed/report_tool/reportengine/impression.pas
+++ b/extras/contributed/report_tool/reportengine/fpg_report.pas
@@ -2,12 +2,12 @@
   This source is only used to compile and install the package.
  }
 
-unit impression; 
+unit fpg_report; 
 
 interface
 
 uses
-  U_Commande, U_Imprime, U_Pdf, U_Visu, U_ReportImages;
+  U_Command, U_Report, U_Pdf, U_Visu, U_ReportImages;
 
 implementation
 
diff --git a/extras/contributed/report_tool/reportengine/u_commande.pas b/extras/contributed/report_tool/reportengine/u_command.pas
index dfcd7afd..fc35cf41 100644
--- a/extras/contributed/report_tool/reportengine/u_commande.pas
+++ b/extras/contributed/report_tool/reportengine/u_command.pas
@@ -14,7 +14,7 @@
       This unit builds the objects in memory to produce either the preview or pdf file
 }
 
-unit U_Commande;
+unit U_Command;
 
 {$mode objfpc}{$H+}
 
diff --git a/extras/contributed/report_tool/reportengine/u_pdf.pas b/extras/contributed/report_tool/reportengine/u_pdf.pas
index fba43d37..fab7e236 100644
--- a/extras/contributed/report_tool/reportengine/u_pdf.pas
+++ b/extras/contributed/report_tool/reportengine/u_pdf.pas
@@ -278,7 +278,7 @@ var
 implementation
 
 uses
-  U_Imprime, U_Commande;
+  U_Report, U_Command;
 
 var
   Trailer: TPdfDictionary;
diff --git a/extras/contributed/report_tool/reportengine/u_imprime.pas b/extras/contributed/report_tool/reportengine/u_report.pas
index 0847f7f6..67965fdf 100644
--- a/extras/contributed/report_tool/reportengine/u_imprime.pas
+++ b/extras/contributed/report_tool/reportengine/u_report.pas
@@ -14,7 +14,7 @@
       This unit interfaces with the user program
 }
 
-unit U_Imprime;
+unit U_Report;
 
 {$mode objfpc}{$H+}
 
@@ -24,7 +24,7 @@ uses
   Classes, SysUtils, StrUtils,
   fpg_base, fpg_main,
   fpg_panel,
-  U_Commande, U_Pdf;
+  U_Command, U_Pdf;
 
 type
   TTypePapier= (A4,Letter,Legal,Executive,Comm10,Monarch,DL,C5,B5);
diff --git a/extras/contributed/report_tool/reportengine/u_visu.pas b/extras/contributed/report_tool/reportengine/u_visu.pas
index 1e3c39fe..4d06db14 100644
--- a/extras/contributed/report_tool/reportengine/u_visu.pas
+++ b/extras/contributed/report_tool/reportengine/u_visu.pas
@@ -27,7 +27,7 @@ uses
   {$endif}
   fpg_base, fpg_main,
   fpg_form, fpg_panel, fpg_label, fpg_button, fpg_edit, fpg_dialogs, fpg_utils,
-  U_Imprime;
+  U_Report;
 
 type
   TF_Visu = class(TfpgForm)
@@ -88,7 +88,7 @@ var
 implementation
 
 uses
-  U_Commande, U_Pdf, U_ReportImages;
+  U_Command, U_Pdf, U_ReportImages;
 
 procedure TF_Visu.FormShow(Sender: TObject);
 begin