diff --git a/components/fpspreadsheet/fpsmath.pas b/components/fpspreadsheet/fpsfunc.pas
similarity index 99%
rename from components/fpspreadsheet/fpsmath.pas
rename to components/fpspreadsheet/fpsfunc.pas
index f4b62bef1..fd069028a 100644
--- a/components/fpspreadsheet/fpsmath.pas
+++ b/components/fpspreadsheet/fpsfunc.pas
@@ -1,4 +1,4 @@
-unit fpsmath;
+unit fpsfunc;
 
 {$mode objfpc}
 
diff --git a/components/fpspreadsheet/fpspreadsheet.pas b/components/fpspreadsheet/fpspreadsheet.pas
index bcda50b29..4012677f9 100755
--- a/components/fpspreadsheet/fpspreadsheet.pas
+++ b/components/fpspreadsheet/fpspreadsheet.pas
@@ -992,7 +992,7 @@ procedure MakeLEPalette(APalette: PsPalette; APaletteSize: Integer);
 implementation
 
 uses
-  Math, StrUtils, TypInfo, fpsUtils, fpsNumFormatParser, fpsMath;
+  Math, StrUtils, TypInfo, fpsUtils, fpsNumFormatParser, fpsFunc;
 
 { Translatable strings }
 resourcestring
diff --git a/components/fpspreadsheet/laz_fpspreadsheet.lpk b/components/fpspreadsheet/laz_fpspreadsheet.lpk
index 35ec0d6f1..e91a7eef4 100644
--- a/components/fpspreadsheet/laz_fpspreadsheet.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheet.lpk
@@ -108,8 +108,8 @@ This package is all you need if you don't want graphical components (like grids
         <UnitName Value="fpsNumFormatParser"/>
       </Item20>
       <Item21>
-        <Filename Value="fpsmath.pas"/>
-        <UnitName Value="fpsmath"/>
+        <Filename Value="fpsfunc.pas"/>
+        <UnitName Value="fpsfunc"/>
       </Item21>
     </Files>
     <RequiredPkgs Count="2">
diff --git a/components/fpspreadsheet/laz_fpspreadsheet.pas b/components/fpspreadsheet/laz_fpspreadsheet.pas
index e10b5cc86..009ed7b7e 100644
--- a/components/fpspreadsheet/laz_fpspreadsheet.pas
+++ b/components/fpspreadsheet/laz_fpspreadsheet.pas
@@ -11,7 +11,7 @@ uses
   xlsbiff5, xlsbiff8, xlsxooxml, fpsutils, fpszipper, uvirtuallayer_types, 
   uvirtuallayer, uvirtuallayer_ole, uvirtuallayer_ole_helpers, 
   uvirtuallayer_ole_types, uvirtuallayer_stream, fpolebasic, xlscommon, 
-  wikitable, fpsNumFormatParser, fpsmath;
+  wikitable, fpsNumFormatParser, fpsfunc;
 
 implementation
 
diff --git a/components/fpspreadsheet/tests/formulatests.pas b/components/fpspreadsheet/tests/formulatests.pas
index ac49f3169..d21c8c317 100644
--- a/components/fpspreadsheet/tests/formulatests.pas
+++ b/components/fpspreadsheet/tests/formulatests.pas
@@ -13,7 +13,7 @@ uses
   // Not using Lazarus package as the user may be working with multiple versions
   // Instead, add .. to unit search path
   Classes, SysUtils, fpcunit, testutils, testregistry,
-  fpsallformats, fpspreadsheet, fpsmath,
+  fpsallformats, fpspreadsheet, fpsfunc,
   xlsbiff8 {and a project requirement for lclbase for utf8 handling},
   testsutility;