diff --git a/extra/installer_function_list_generator.php b/extra/update_pas_mysql_structures.php
similarity index 100%
rename from extra/installer_function_list_generator.php
rename to extra/update_pas_mysql_structures.php
diff --git a/packages/delphi10/heidisql.dpr b/packages/delphi10/heidisql.dpr
index a3af8251..f9ac8ebc 100644
--- a/packages/delphi10/heidisql.dpr
+++ b/packages/delphi10/heidisql.dpr
@@ -30,7 +30,7 @@ uses
   mysqlquery in '..\..\source\mysqlquery.pas',
   mysqlquerythread in '..\..\source\mysqlquerythread.pas',
   mysqlconn in '..\..\source\mysqlconn.pas',
-  mysql in '..\..\source\mysql.pas',
+  mysql_structures in '..\..\source\mysql_structures.pas',
   column_selection in '..\..\source\column_selection.pas' {ColumnSelectionForm},
   data_sorting in '..\..\source\data_sorting.pas' {DataSortingForm},
   runsqlfile in '..\..\source\runsqlfile.pas' {RunSQLFileForm},
diff --git a/packages/delphi11/heidisql.dpr b/packages/delphi11/heidisql.dpr
index a3af8251..f9ac8ebc 100644
--- a/packages/delphi11/heidisql.dpr
+++ b/packages/delphi11/heidisql.dpr
@@ -30,7 +30,7 @@ uses
   mysqlquery in '..\..\source\mysqlquery.pas',
   mysqlquerythread in '..\..\source\mysqlquerythread.pas',
   mysqlconn in '..\..\source\mysqlconn.pas',
-  mysql in '..\..\source\mysql.pas',
+  mysql_structures in '..\..\source\mysql_structures.pas',
   column_selection in '..\..\source\column_selection.pas' {ColumnSelectionForm},
   data_sorting in '..\..\source\data_sorting.pas' {DataSortingForm},
   runsqlfile in '..\..\source\runsqlfile.pas' {RunSQLFileForm},
diff --git a/packages/delphi11/heidisql.dproj b/packages/delphi11/heidisql.dproj
index 2389ace7..9016dd71 100644
--- a/packages/delphi11/heidisql.dproj
+++ b/packages/delphi11/heidisql.dproj
@@ -111,7 +111,7 @@
     <DCCReference Include="..\..\source\main.pas">
       <Form>MainForm</Form>
     </DCCReference>
-    <DCCReference Include="..\..\source\mysql.pas" />
+    <DCCReference Include="..\..\source\mysql_structures.pas" />
     <DCCReference Include="..\..\source\mysqlconn.pas" />
     <DCCReference Include="..\..\source\mysqlquery.pas" />
     <DCCReference Include="..\..\source\mysqlquerythread.pas" />
diff --git a/source/childwin.pas b/source/childwin.pas
index 9f815a43..5a746835 100644
--- a/source/childwin.pas
+++ b/source/childwin.pas
@@ -629,7 +629,7 @@ implementation
 uses
   Main, createtable, fieldeditor,
   optimizetables, copytable, sqlhelp, printlist,
-  column_selection, data_sorting, runsqlfile, mysql,
+  column_selection, data_sorting, runsqlfile, mysql_structures,
   Registry;
 
 
diff --git a/source/createtable.pas b/source/createtable.pas
index 5fb8e5d4..9a9e0504 100644
--- a/source/createtable.pas
+++ b/source/createtable.pas
@@ -100,7 +100,7 @@ type
 implementation
 
 uses
-  Main, Childwin, helpers, mysql;
+  Main, Childwin, helpers, mysql_structures;
 
 var
   fields : array of TMysqlField;
diff --git a/source/fieldeditor.pas b/source/fieldeditor.pas
index fd51f6bb..9fed0d81 100644
--- a/source/fieldeditor.pas
+++ b/source/fieldeditor.pas
@@ -95,7 +95,7 @@ type
 implementation
 
 uses
-  helpers, childwin, Main, mysql, db;
+  helpers, childwin, Main, mysql_structures, db;
 
 var
   klist : Array of TMysqlIndex;
diff --git a/source/main.pas b/source/main.pas
index f3e4a52e..59a751f1 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -253,7 +253,7 @@ uses
   insertfiles,
   Helpers,
   Threading,
-  mysql;
+  mysql_structures;
 
 {$R *.DFM}
 
diff --git a/source/mysql.pas b/source/mysql_structures.pas
similarity index 97%
rename from source/mysql.pas
rename to source/mysql_structures.pas
index 8eb4337d..0a05be42 100644
--- a/source/mysql.pas
+++ b/source/mysql_structures.pas
@@ -1,4 +1,4 @@
-unit mysql;
+unit mysql_structures;
 
 // -------------------------------------
 // MySQL Constants, Variables and Types