diff --git a/components/lazutils/lazutf16.pas b/components/lazutils/lazutf16.pas
index 0b3a034252..3fc1e8d90a 100644
--- a/components/lazutils/lazutf16.pas
+++ b/components/lazutils/lazutf16.pas
@@ -15,7 +15,7 @@
   Currently this unit includes only UTF8LowerCaseViaTables which is based on a
   UTF-16 table, but it might be extended to include various UTF-16 routines.
 }
-unit lazutf16;
+unit LazUTF16;
 
 {$mode objfpc}{$H+}
 
diff --git a/components/lazutils/lazutils.lpk b/components/lazutils/lazutils.lpk
index f3425c55a2..aadd777867 100644
--- a/components/lazutils/lazutils.lpk
+++ b/components/lazutils/lazutils.lpk
@@ -135,7 +135,7 @@
       </Item29>
       <Item30>
         <Filename Value="lazutf16.pas"/>
-        <UnitName Value="lazutf16"/>
+        <UnitName Value="lazUTF16"/>
       </Item30>
       <Item31>
         <Filename Value="lazutf8sysutils.pas"/>
diff --git a/components/lazutils/lazutils.pas b/components/lazutils/lazutils.pas
index 9db4f95ed2..b3b5f773f4 100644
--- a/components/lazutils/lazutils.pas
+++ b/components/lazutils/lazutils.pas
@@ -8,16 +8,16 @@ unit LazUtils;
 interface
 
 uses
-  Laz2_DOM, Laz2_XMLCfg, laz2_XMLRead, laz2_xmlutils, laz2_XMLWrite, Laz_DOM, 
-  Laz_XMLCfg, Laz_XMLRead, Laz_XMLStreaming, Laz_XMLWrite, LazFileUtils, 
-  LazFileCache, LazUTF8, LazDbgLog, PasWString, FileUtil, LazUTF8Classes, 
-  Masks, LazUtilsStrConsts, LConvEncoding, lazutf16, LazUTF8SysUtils, 
-  LazMethodList, AvgLvlTree, LazLogger, LazFreeType, TTCache, TTCalc, TTCMap, 
-  TTDebug, TTError, TTFile, TTGLoad, TTInterp, TTLoad, TTMemory, TTObjs, 
-  TTProfile, TTRASTER, TTTables, TTTypes, EasyLazFreeType, LazLoggerBase, 
-  LazLoggerDummy, LazClasses, LazFreeTypeFontCollection, LazConfigStorage, 
-  UTF8Process, laz2_xpath, LazLoggerProfiling, FPCAdds, LazUtilities, 
-  lazfglhash, lcsvutils, lazCollections, LazListClasses, 
+  Laz2_DOM, Laz2_XMLCfg, laz2_XMLRead, laz2_xmlutils, laz2_XMLWrite, Laz_DOM,
+  Laz_XMLCfg, Laz_XMLRead, Laz_XMLStreaming, Laz_XMLWrite, LazFileUtils,
+  LazFileCache, LazUTF8, LazDbgLog, PasWString, FileUtil, LazUTF8Classes,
+  Masks, LazUtilsStrConsts, LConvEncoding, LazUTF16, LazUTF8SysUtils,
+  LazMethodList, AvgLvlTree, LazLogger, LazFreeType, TTCache, TTCalc, TTCMap,
+  TTDebug, TTError, TTFile, TTGLoad, TTInterp, TTLoad, TTMemory, TTObjs,
+  TTProfile, TTRASTER, TTTables, TTTypes, EasyLazFreeType, LazLoggerBase,
+  LazLoggerDummy, LazClasses, LazFreeTypeFontCollection, LazConfigStorage,
+  UTF8Process, laz2_xpath, LazLoggerProfiling, FPCAdds, LazUtilities,
+  lazfglhash, lcsvutils, lazCollections, LazListClasses,
   LazFreeTypeFPImageDrawer, LookupStringList, LazarusPackageIntf;
 
 implementation
diff --git a/test/lazutils/testunicode.pas b/test/lazutils/testunicode.pas
index 7dfa0ffe1d..3d5ff0dafd 100644
--- a/test/lazutils/testunicode.pas
+++ b/test/lazutils/testunicode.pas
@@ -3,7 +3,7 @@ program TestUnicode;
 {$mode objfpc}{$H+}
 
 uses
-  sysutils, lazutf8, lazutf16;
+  sysutils, LazUTF8, LazUTF16;
 
 procedure WriteStringHex(Str: utf8string);
 var
diff --git a/test/lcltests/testunicode.pas b/test/lcltests/testunicode.pas
index 3611891592..00ab96467c 100644
--- a/test/lcltests/testunicode.pas
+++ b/test/lcltests/testunicode.pas
@@ -5,7 +5,7 @@ unit TestUnicode;
 interface
 
 uses
-  Classes, SysUtils, fpcunit, testglobals, LazUTF8, lazutf16, LazLogger;
+  Classes, SysUtils, fpcunit, testglobals, LazUTF8, LazUTF16, LazLogger;
 
 type