diff --git a/packages/cdrom/src/wincd.pp b/packages/cdrom/src/wincd.pp
index fafa98baec..005727823a 100644
--- a/packages/cdrom/src/wincd.pp
+++ b/packages/cdrom/src/wincd.pp
@@ -1,6 +1,6 @@
 {
 }
-unit wincd;
+unit WinCD;
 
 {$mode objfpc}
 {$h+}
diff --git a/packages/dblib/src/dblib.pp b/packages/dblib/src/dblib.pp
index 39f358dd1b..53f80f6ea0 100644
--- a/packages/dblib/src/dblib.pp
+++ b/packages/dblib/src/dblib.pp
@@ -25,7 +25,7 @@
                     7.4 - MS SQL Server 2012/2014
       tds version can be set using env.var. TDSVER or in freetds.conf or .freetds.conf
 }
-unit dblib;
+unit DBLib;
 
 {$IFDEF FPC}{$mode objfpc}{$ENDIF}{$H+}
 
diff --git a/packages/fcl-base/src/contnrs.pp b/packages/fcl-base/src/contnrs.pp
index ce233c43d3..80955100d4 100644
--- a/packages/fcl-base/src/contnrs.pp
+++ b/packages/fcl-base/src/contnrs.pp
@@ -16,7 +16,7 @@
 {$H+}
 {$ifdef CLASSESINLINE}{$inline on}{$endif}
 
-unit contnrs;
+unit Contnrs;
 
 interface
 
diff --git a/packages/fcl-base/src/fileinfo.pp b/packages/fcl-base/src/fileinfo.pp
index bada896940..2b582152d9 100644
--- a/packages/fcl-base/src/fileinfo.pp
+++ b/packages/fcl-base/src/fileinfo.pp
@@ -13,7 +13,7 @@
 
  **********************************************************************}
 
-unit fileinfo;
+unit FileInfo;
 
 {$mode objfpc}
 {$h+}
diff --git a/packages/fcl-base/src/maskutils.pp b/packages/fcl-base/src/maskutils.pp
index 52f4d09396..9c1ea7229e 100644
--- a/packages/fcl-base/src/maskutils.pp
+++ b/packages/fcl-base/src/maskutils.pp
@@ -19,7 +19,7 @@
 }
 
 
-unit maskutils;
+unit MaskUtils;
 
 {$mode objfpc}{$H+}
 {.$define debug_maskutils}
diff --git a/packages/fcl-base/src/rttiutils.pp b/packages/fcl-base/src/rttiutils.pp
index 0169a72982..21519c4440 100644
--- a/packages/fcl-base/src/rttiutils.pp
+++ b/packages/fcl-base/src/rttiutils.pp
@@ -29,7 +29,7 @@
 
 {$mode objfpc}
 {$H+}
-unit rttiutils;
+unit RttiUtils;
 
 interface
 
diff --git a/packages/fcl-db/src/base/db.pas b/packages/fcl-db/src/base/db.pas
index bd43435ca9..25918d25e2 100644
--- a/packages/fcl-db/src/base/db.pas
+++ b/packages/fcl-db/src/base/db.pas
@@ -14,7 +14,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit db;
+unit DB;
 
 {$mode objfpc}
 
diff --git a/packages/fcl-db/src/base/dbcoll.pp b/packages/fcl-db/src/base/dbcoll.pp
index 18b0fbb8da..14c9f5fbc8 100644
--- a/packages/fcl-db/src/base/dbcoll.pp
+++ b/packages/fcl-db/src/base/dbcoll.pp
@@ -1,4 +1,4 @@
-unit dbcoll;
+unit DBColl;
 
 interface
 
diff --git a/packages/fcl-db/src/base/dbconst.pas b/packages/fcl-db/src/base/dbconst.pas
index 383911e28c..552ebf72c0 100644
--- a/packages/fcl-db/src/base/dbconst.pas
+++ b/packages/fcl-db/src/base/dbconst.pas
@@ -14,7 +14,7 @@
 
  **********************************************************************}
 
-unit dbconst;
+unit DBConst;
 
 Interface
 
diff --git a/packages/fcl-db/src/base/sqlscript.pp b/packages/fcl-db/src/base/sqlscript.pp
index 098f4122e3..6f02cb9c85 100644
--- a/packages/fcl-db/src/base/sqlscript.pp
+++ b/packages/fcl-db/src/base/sqlscript.pp
@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit sqlscript;
+unit SQLScript;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/base/sqltypes.pp b/packages/fcl-db/src/base/sqltypes.pp
index 1e8b2d9d0a..f95e8cdc5e 100644
--- a/packages/fcl-db/src/base/sqltypes.pp
+++ b/packages/fcl-db/src/base/sqltypes.pp
@@ -1,4 +1,4 @@
-unit sqltypes;
+unit SQLTypes;
 
 interface
 
diff --git a/packages/fcl-db/src/codegen/fpddcodegen.pp b/packages/fcl-db/src/codegen/fpddcodegen.pp
index b1c124a3e8..5c8149047f 100644
--- a/packages/fcl-db/src/codegen/fpddcodegen.pp
+++ b/packages/fcl-db/src/codegen/fpddcodegen.pp
@@ -13,7 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit fpddcodegen;
+unit FPDDCodeGen;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/codegen/fpddpopcode.pp b/packages/fcl-db/src/codegen/fpddpopcode.pp
index 11e006dd18..cd9abf909a 100644
--- a/packages/fcl-db/src/codegen/fpddpopcode.pp
+++ b/packages/fcl-db/src/codegen/fpddpopcode.pp
@@ -1,4 +1,4 @@
-unit fpddpopcode;
+unit FPDDPopCode;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/datadict/fpdddbf.pp b/packages/fcl-db/src/datadict/fpdddbf.pp
index b67aa204ad..e211f0872c 100644
--- a/packages/fcl-db/src/datadict/fpdddbf.pp
+++ b/packages/fcl-db/src/datadict/fpdddbf.pp
@@ -13,7 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit fpddDbf;
+unit FPDDDBF;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/datadict/fpdddiff.pp b/packages/fcl-db/src/datadict/fpdddiff.pp
index 86e74a8357..12ef098440 100644
--- a/packages/fcl-db/src/datadict/fpdddiff.pp
+++ b/packages/fcl-db/src/datadict/fpdddiff.pp
@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
   **********************************************************************}
-unit fpdddiff;
+unit FPDDDiff;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/datadict/fpddfb.pp b/packages/fcl-db/src/datadict/fpddfb.pp
index a3f6649daa..627885c6dd 100644
--- a/packages/fcl-db/src/datadict/fpddfb.pp
+++ b/packages/fcl-db/src/datadict/fpddfb.pp
@@ -13,7 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit fpddfb;
+unit FPDDFB;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/datadict/fpddmssql.pp b/packages/fcl-db/src/datadict/fpddmssql.pp
index f22bd1ad3b..d2bb74e9e4 100644
--- a/packages/fcl-db/src/datadict/fpddmssql.pp
+++ b/packages/fcl-db/src/datadict/fpddmssql.pp
@@ -13,7 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit fpddmssql;
+unit FPDDMSSQL;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/datadict/fpddmysql40.pp b/packages/fcl-db/src/datadict/fpddmysql40.pp
index edd1786a78..8a41fb3936 100644
--- a/packages/fcl-db/src/datadict/fpddmysql40.pp
+++ b/packages/fcl-db/src/datadict/fpddmysql40.pp
@@ -13,7 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit fpddmysql40;
+unit FPDDMySQL40;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/datadict/fpddmysql41.pp b/packages/fcl-db/src/datadict/fpddmysql41.pp
index 9f30b198e8..b169341cc7 100644
--- a/packages/fcl-db/src/datadict/fpddmysql41.pp
+++ b/packages/fcl-db/src/datadict/fpddmysql41.pp
@@ -13,7 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit fpddmysql41;
+unit FPDDMySQL41;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/datadict/fpddmysql50.pp b/packages/fcl-db/src/datadict/fpddmysql50.pp
index 7bb79ccc36..6a1a6db9ad 100644
--- a/packages/fcl-db/src/datadict/fpddmysql50.pp
+++ b/packages/fcl-db/src/datadict/fpddmysql50.pp
@@ -13,7 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit fpddmysql50;
+unit FPDDMySQL50;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/datadict/fpddmysql51.pp b/packages/fcl-db/src/datadict/fpddmysql51.pp
index 23f6a14c6d..57b894c977 100644
--- a/packages/fcl-db/src/datadict/fpddmysql51.pp
+++ b/packages/fcl-db/src/datadict/fpddmysql51.pp
@@ -13,7 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit fpddmysql51;
+unit FPDDMySQL51;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/datadict/fpddmysql55.pp b/packages/fcl-db/src/datadict/fpddmysql55.pp
index c534ff880f..fe522c3f8d 100644
--- a/packages/fcl-db/src/datadict/fpddmysql55.pp
+++ b/packages/fcl-db/src/datadict/fpddmysql55.pp
@@ -13,7 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit fpddmysql55;
+unit FPDDMySQL55;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/datadict/fpddodbc.pp b/packages/fcl-db/src/datadict/fpddodbc.pp
index 149112047b..da348824b6 100644
--- a/packages/fcl-db/src/datadict/fpddodbc.pp
+++ b/packages/fcl-db/src/datadict/fpddodbc.pp
@@ -13,7 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit fpddodbc;
+unit FPDDODBC;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/datadict/fpddoracle.pp b/packages/fcl-db/src/datadict/fpddoracle.pp
index ec0367aef0..56b339c536 100644
--- a/packages/fcl-db/src/datadict/fpddoracle.pp
+++ b/packages/fcl-db/src/datadict/fpddoracle.pp
@@ -14,7 +14,7 @@
 
  **********************************************************************}
 
-unit fpddoracle;
+unit FPDDOracle;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/datadict/fpddpq.pp b/packages/fcl-db/src/datadict/fpddpq.pp
index 071963bb98..9601a30fe5 100644
--- a/packages/fcl-db/src/datadict/fpddpq.pp
+++ b/packages/fcl-db/src/datadict/fpddpq.pp
@@ -13,7 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit fpddpq;
+unit FPDDPQ;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/datadict/fpddregstd.pp b/packages/fcl-db/src/datadict/fpddregstd.pp
index aa3a34bffd..48f3beb890 100644
--- a/packages/fcl-db/src/datadict/fpddregstd.pp
+++ b/packages/fcl-db/src/datadict/fpddregstd.pp
@@ -25,7 +25,7 @@
   are registered.
 
 }
-unit fpddregstd;
+unit FPDDRegStd;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/datadict/fpddsqldb.pp b/packages/fcl-db/src/datadict/fpddsqldb.pp
index a13da2d99d..e139a62aca 100644
--- a/packages/fcl-db/src/datadict/fpddsqldb.pp
+++ b/packages/fcl-db/src/datadict/fpddsqldb.pp
@@ -13,7 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit fpddsqldb;
+unit FPDDSQLDB;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/datadict/fpddsqlite3.pp b/packages/fcl-db/src/datadict/fpddsqlite3.pp
index 1f8c930362..93231f05ee 100644
--- a/packages/fcl-db/src/datadict/fpddsqlite3.pp
+++ b/packages/fcl-db/src/datadict/fpddsqlite3.pp
@@ -13,7 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit fpddsqlite3;
+unit FPDDSQLite3;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/sqldb/mssql/mssqlconn.pp b/packages/fcl-db/src/sqldb/mssql/mssqlconn.pp
index aec3c61bca..7f5447eb9e 100644
--- a/packages/fcl-db/src/sqldb/mssql/mssqlconn.pp
+++ b/packages/fcl-db/src/sqldb/mssql/mssqlconn.pp
@@ -34,7 +34,7 @@
                "TextSize=16777216" - set maximum size of text/image data returned
                "ApplicationName=YourAppName" - Set the app name for the connection. MSSQL 2000 and higher only
 }
-unit mssqlconn;
+unit MSSQLConn;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/sqldb/postgres/pqconnection.pp b/packages/fcl-db/src/sqldb/postgres/pqconnection.pp
index d0772e0609..f6ed2147f9 100644
--- a/packages/fcl-db/src/sqldb/postgres/pqconnection.pp
+++ b/packages/fcl-db/src/sqldb/postgres/pqconnection.pp
@@ -1,4 +1,4 @@
-unit pqconnection;
+unit PQConnection;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/sqldb/sqldb.pp b/packages/fcl-db/src/sqldb/sqldb.pp
index 2cfe593202..4040c8d666 100644
--- a/packages/fcl-db/src/sqldb/sqldb.pp
+++ b/packages/fcl-db/src/sqldb/sqldb.pp
@@ -12,7 +12,7 @@
 
  **********************************************************************}
 
-unit sqldb;
+unit SQLDB;
 
 {$mode objfpc}
 {$H+}
diff --git a/packages/fcl-db/src/sqldb/sqldblib.pp b/packages/fcl-db/src/sqldb/sqldblib.pp
index cb8bec7338..2b27f3de51 100644
--- a/packages/fcl-db/src/sqldb/sqldblib.pp
+++ b/packages/fcl-db/src/sqldb/sqldblib.pp
@@ -1,4 +1,4 @@
-unit sqldblib;
+unit SQLDBLib;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-db/src/sqldb/sqlite/sqlite3backup.pas b/packages/fcl-db/src/sqldb/sqlite/sqlite3backup.pas
index 1f690c1ff6..06310421f7 100644
--- a/packages/fcl-db/src/sqldb/sqlite/sqlite3backup.pas
+++ b/packages/fcl-db/src/sqldb/sqlite/sqlite3backup.pas
@@ -1,4 +1,4 @@
-unit sqlite3backup;
+unit SQLite3Backup;
 
 { SQLite3 backup class.
 
diff --git a/packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp b/packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
index aac992f6fb..8831e8a1a2 100644
--- a/packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
+++ b/packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
@@ -23,7 +23,7 @@
 
 } 
  
-unit sqlite3conn;
+unit SQLite3Conn;
 {$mode objfpc}
 {$h+}
 
diff --git a/packages/fcl-db/src/sqlite/customsqliteds.pas b/packages/fcl-db/src/sqlite/customsqliteds.pas
index 2e89da451a..43fd900b90 100644
--- a/packages/fcl-db/src/sqlite/customsqliteds.pas
+++ b/packages/fcl-db/src/sqlite/customsqliteds.pas
@@ -1,4 +1,4 @@
-unit CustomSqliteDS;
+unit CustomSQLiteDS;
 
 {
   This is TCustomSqliteDataset, a TDataset descendant class for use with fpc compiler
diff --git a/packages/fcl-db/src/sqlite/sqlite3ds.pas b/packages/fcl-db/src/sqlite/sqlite3ds.pas
index 31c1409030..01fa49cabc 100644
--- a/packages/fcl-db/src/sqlite/sqlite3ds.pas
+++ b/packages/fcl-db/src/sqlite/sqlite3ds.pas
@@ -1,4 +1,4 @@
-unit Sqlite3DS;
+unit SQLite3DS;
 
 {
   This is TSqlite3Dataset, a TDataset descendant class for use with fpc compiler
diff --git a/packages/fcl-db/src/sqlite/sqliteds.pas b/packages/fcl-db/src/sqlite/sqliteds.pas
index d0f90d7e84..00ec37e650 100644
--- a/packages/fcl-db/src/sqlite/sqliteds.pas
+++ b/packages/fcl-db/src/sqlite/sqliteds.pas
@@ -1,4 +1,4 @@
-unit SqliteDS;
+unit SQLiteDS;
 
 {
   This is TSqliteDataset, a TDataset descendant class for use with fpc compiler
diff --git a/packages/fcl-image/src/fpimage.pp b/packages/fcl-image/src/fpimage.pp
index 30993ef6ea..add6d2e4a1 100644
--- a/packages/fcl-image/src/fpimage.pp
+++ b/packages/fcl-image/src/fpimage.pp
@@ -2,7 +2,7 @@
     This file is part of the Free Pascal run time library.
     Copyright (c) 2003 by the Free Pascal development team
 
-    fpImage base definitions.
+    FPImage base definitions.
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -13,7 +13,7 @@
 
  **********************************************************************}
 {$mode objfpc}{$h+}
-unit FPimage;
+unit FPImage;
 
 interface
 
diff --git a/packages/fcl-image/src/fpimgbarcode.pp b/packages/fcl-image/src/fpimgbarcode.pp
index b55a69e144..96e7aeba89 100644
--- a/packages/fcl-image/src/fpimgbarcode.pp
+++ b/packages/fcl-image/src/fpimgbarcode.pp
@@ -13,7 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit fpimgbarcode;
+unit FPImgBarCode;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-image/src/fpimgqrcode.pp b/packages/fcl-image/src/fpimgqrcode.pp
index 8872a57c32..f67dc5fa50 100644
--- a/packages/fcl-image/src/fpimgqrcode.pp
+++ b/packages/fcl-image/src/fpimgqrcode.pp
@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit fpimgqrcode;
+unit FPImgQRCode;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fcl-image/src/fpqrcodegen.pp b/packages/fcl-image/src/fpqrcodegen.pp
index dbbfe22e46..d35e3d6dce 100644
--- a/packages/fcl-image/src/fpqrcodegen.pp
+++ b/packages/fcl-image/src/fpqrcodegen.pp
@@ -17,7 +17,7 @@
     https://www.nayuki.io/page/qr-code-generator-library
   **********************************************************************}
 {$mode objfpc}
-unit fpqrcodegen;
+unit FPQRCodeGen;
 
 interface
 
diff --git a/packages/fcl-image/src/pngcomn.pp b/packages/fcl-image/src/pngcomn.pp
index cd47cd92e3..4d6d69ce94 100644
--- a/packages/fcl-image/src/pngcomn.pp
+++ b/packages/fcl-image/src/pngcomn.pp
@@ -13,7 +13,7 @@
 
  **********************************************************************}
 {$mode objfpc}{$h+}
-unit PNGcomn;
+unit PNGComn;
 
 interface
 
diff --git a/packages/fcl-registry/src/registry.pp b/packages/fcl-registry/src/registry.pp
index cf4724e2eb..99191eb906 100644
--- a/packages/fcl-registry/src/registry.pp
+++ b/packages/fcl-registry/src/registry.pp
@@ -1,4 +1,4 @@
-Unit registry;
+Unit Registry;
 
 {$mode objfpc}
 {$H+}
diff --git a/packages/fcl-web/src/webdata/sqldbwebdata.pp b/packages/fcl-web/src/webdata/sqldbwebdata.pp
index 7de0143946..1e9b20ee15 100644
--- a/packages/fcl-web/src/webdata/sqldbwebdata.pp
+++ b/packages/fcl-web/src/webdata/sqldbwebdata.pp
@@ -1,4 +1,4 @@
-unit sqldbwebdata;
+unit SQLDBWebData;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fpindexer/src/dbindexer.pp b/packages/fpindexer/src/dbindexer.pp
index 618d3d733a..715b716cd7 100644
--- a/packages/fpindexer/src/dbindexer.pp
+++ b/packages/fpindexer/src/dbindexer.pp
@@ -13,7 +13,7 @@
 
  **********************************************************************}
  
-unit dbIndexer;
+unit DBIndexer;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fpindexer/src/fpindexer.pp b/packages/fpindexer/src/fpindexer.pp
index 09d5bc6abd..217a5088ae 100644
--- a/packages/fpindexer/src/fpindexer.pp
+++ b/packages/fpindexer/src/fpindexer.pp
@@ -13,7 +13,7 @@
 
  **********************************************************************}
  
-unit fpIndexer;
+unit FPIndexer;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fpindexer/src/fpmasks.pp b/packages/fpindexer/src/fpmasks.pp
index a6761e1d13..f90803a8d9 100644
--- a/packages/fpindexer/src/fpmasks.pp
+++ b/packages/fpindexer/src/fpmasks.pp
@@ -19,7 +19,7 @@
  *                                                                           *
  *****************************************************************************
 }
-unit fpmasks;
+unit FPMasks;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/fv/src/sysmsg.pas b/packages/fv/src/sysmsg.pas
index 82842d3801..6f1508f247 100644
--- a/packages/fv/src/sysmsg.pas
+++ b/packages/fv/src/sysmsg.pas
@@ -19,7 +19,7 @@
    MA 02110-1301, USA.
 
  ****************************************************************************}
-Unit sysmsg;
+Unit SysMsg;
 
 interface
 {$i platform.inc}
diff --git a/packages/graph/src/win32/wincrt.pp b/packages/graph/src/win32/wincrt.pp
index a920760781..8e86664913 100644
--- a/packages/graph/src/win32/wincrt.pp
+++ b/packages/graph/src/win32/wincrt.pp
@@ -14,7 +14,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit wincrt;
+unit WinCRT;
 
   interface
 
diff --git a/packages/graph/src/win32/winmouse.pp b/packages/graph/src/win32/winmouse.pp
index 107c5470f0..54f9796847 100644
--- a/packages/graph/src/win32/winmouse.pp
+++ b/packages/graph/src/win32/winmouse.pp
@@ -14,7 +14,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit winmouse;
+unit WinMouse;
 
   interface
     { initializes the mouse with the default values for the current screen mode }
diff --git a/packages/libpng/src/png.pp b/packages/libpng/src/png.pp
index 156d66b522..4be1eb6fed 100644
--- a/packages/libpng/src/png.pp
+++ b/packages/libpng/src/png.pp
@@ -1,7 +1,7 @@
 {$ifndef NO_SMART_LINK}
 {$smartlink on}
 {$endif}
-unit png;
+unit PNG;
 
 interface
 
diff --git a/packages/paszlib/src/paszlib.pas b/packages/paszlib/src/paszlib.pas
index d949e861fe..8775a1357c 100644
--- a/packages/paszlib/src/paszlib.pas
+++ b/packages/paszlib/src/paszlib.pas
@@ -1,4 +1,4 @@
-unit paszlib;
+unit PasZLib;
 
 {$inline on}
 
diff --git a/packages/paszlib/src/trees.pas b/packages/paszlib/src/trees.pas
index 023ea0bac8..d16198794a 100644
--- a/packages/paszlib/src/trees.pas
+++ b/packages/paszlib/src/trees.pas
@@ -1,4 +1,4 @@
-unit trees;
+unit Trees;
 
 {$T-}
 {$define ORG_DEBUG}
diff --git a/packages/paszlib/src/zbase.pas b/packages/paszlib/src/zbase.pas
index 1484f2b685..f9bf887c93 100644
--- a/packages/paszlib/src/zbase.pas
+++ b/packages/paszlib/src/zbase.pas
@@ -1,4 +1,4 @@
-unit zbase;
+unit ZBase;
 
 
 { Original:
diff --git a/packages/paszlib/src/zcompres.pas b/packages/paszlib/src/zcompres.pas
index f5867b13fa..990b8bf79a 100644
--- a/packages/paszlib/src/zcompres.pas
+++ b/packages/paszlib/src/zcompres.pas
@@ -1,4 +1,4 @@
-Unit zCompres;
+Unit ZCompres;
 
 { compress.c -- compress a memory buffer
   Copyright (C) 1995-1998 Jean-loup Gailly.
diff --git a/packages/paszlib/src/zdeflate.pas b/packages/paszlib/src/zdeflate.pas
index d6569134c3..66e3f978a2 100644
--- a/packages/paszlib/src/zdeflate.pas
+++ b/packages/paszlib/src/zdeflate.pas
@@ -1,4 +1,4 @@
-unit zdeflate;
+unit ZDeflate;
 
 {$goto on}
 
diff --git a/packages/paszlib/src/zinflate.pas b/packages/paszlib/src/zinflate.pas
index 092a861117..a1e609a7d7 100644
--- a/packages/paszlib/src/zinflate.pas
+++ b/packages/paszlib/src/zinflate.pas
@@ -1,4 +1,4 @@
-unit  zinflate;
+unit  ZInflate;
 
 {  inflate.c -- zlib interface to inflate modules
    Copyright (C) 1995-1998 Mark Adler
diff --git a/packages/paszlib/src/zip.pas b/packages/paszlib/src/zip.pas
index defe160d63..aa5c8c401d 100644
--- a/packages/paszlib/src/zip.pas
+++ b/packages/paszlib/src/zip.pas
@@ -1,4 +1,4 @@
-unit zip;
+unit Zip;
 
 { zip.c -- IO on .zip files using zlib
   zip.h -- IO for compress .zip files using zlib
diff --git a/packages/paszlib/src/zipper.pp b/packages/paszlib/src/zipper.pp
index 9f0b00519c..5c8d512a3b 100644
--- a/packages/paszlib/src/zipper.pp
+++ b/packages/paszlib/src/zipper.pp
@@ -13,7 +13,7 @@
  **********************************************************************}
 {$mode objfpc}
 {$h+}
-unit zipper;
+unit Zipper;
 
 Interface
 
diff --git a/packages/paszlib/src/ziputils.pas b/packages/paszlib/src/ziputils.pas
index 8e07f46b4d..75fb357924 100644
--- a/packages/paszlib/src/ziputils.pas
+++ b/packages/paszlib/src/ziputils.pas
@@ -1,4 +1,4 @@
-unit ziputils;
+unit ZipUtils;
 
 { ziputils.pas - IO on .zip files using zlib
   - definitions, declarations and routines used by both
diff --git a/packages/paszlib/src/zstream.pp b/packages/paszlib/src/zstream.pp
index b37bd70105..6ec3fd6865 100644
--- a/packages/paszlib/src/zstream.pp
+++ b/packages/paszlib/src/zstream.pp
@@ -1,4 +1,4 @@
-unit zstream;
+unit ZStream;
 
 {**********************************************************************
     This file is part of the Free Pascal free component library.
diff --git a/packages/paszlib/src/zuncompr.pas b/packages/paszlib/src/zuncompr.pas
index 18a608ff86..77988a6d95 100644
--- a/packages/paszlib/src/zuncompr.pas
+++ b/packages/paszlib/src/zuncompr.pas
@@ -1,4 +1,4 @@
-unit zuncompr;
+unit ZUncompr;
 
 { uncompr.c -- decompress a memory buffer
   Copyright (C) 1995-1998 Jean-loup Gailly.
diff --git a/packages/rtl-extra/src/win/winsock.pp b/packages/rtl-extra/src/win/winsock.pp
index 824b56ef9f..42fb038076 100644
--- a/packages/rtl-extra/src/win/winsock.pp
+++ b/packages/rtl-extra/src/win/winsock.pp
@@ -19,7 +19,7 @@
 {$endif}
 {$mode fpc}
 
-unit winsock;
+unit WinSock;
 
   interface
 
diff --git a/packages/rtl-objpas/src/inc/convutil.inc b/packages/rtl-objpas/src/inc/convutil.inc
index 7fdd604abe..8e6ca9112f 100644
--- a/packages/rtl-objpas/src/inc/convutil.inc
+++ b/packages/rtl-objpas/src/inc/convutil.inc
@@ -3,7 +3,7 @@
    Copyright (c) 2004 by Marco van de Voort
    member of the Free Pascal development team.
 
-   An implementation for unit convutils, which converts between
+   An implementation for unit ConvUtils, which converts between
    units and simple combinations of them.
 
    Based on a guessed interface derived from some programs on the web. (Like
@@ -18,7 +18,7 @@
 
 **********************************************************************}
 
-unit convutils;
+unit ConvUtils;
 
 interface
 
diff --git a/packages/rtl-objpas/src/inc/dateutil.inc b/packages/rtl-objpas/src/inc/dateutil.inc
index f31049043c..ff06400714 100644
--- a/packages/rtl-objpas/src/inc/dateutil.inc
+++ b/packages/rtl-objpas/src/inc/dateutil.inc
@@ -15,7 +15,7 @@
 
  **********************************************************************}
 
-unit dateutils;
+unit DateUtils;
 
 interface
 
diff --git a/packages/rtl-objpas/src/inc/stdconvs.pp b/packages/rtl-objpas/src/inc/stdconvs.pp
index 813030faeb..14477b5a39 100644
--- a/packages/rtl-objpas/src/inc/stdconvs.pp
+++ b/packages/rtl-objpas/src/inc/stdconvs.pp
@@ -15,7 +15,7 @@
 
 **********************************************************************}
 
-unit stdconvs;
+unit StdConvs;
 
 interface
 
diff --git a/packages/rtl-objpas/src/inc/strutils.pp b/packages/rtl-objpas/src/inc/strutils.pp
index e2571f3df4..5e19f24b3d 100644
--- a/packages/rtl-objpas/src/inc/strutils.pp
+++ b/packages/rtl-objpas/src/inc/strutils.pp
@@ -15,7 +15,7 @@
 {$mode objfpc}
 {$h+}
 {$inline on}
-unit strutils;
+unit StrUtils;
 
 interface
 
diff --git a/packages/rtl-objpas/src/inc/variants.pp b/packages/rtl-objpas/src/inc/variants.pp
index a02f01b981..153453cb29 100644
--- a/packages/rtl-objpas/src/inc/variants.pp
+++ b/packages/rtl-objpas/src/inc/variants.pp
@@ -23,7 +23,7 @@
 {$inline on}
 {$define VARIANTINLINE}
 
-unit variants;
+unit Variants;
 
 interface
 
diff --git a/packages/rtl-objpas/src/win/varutils.pp b/packages/rtl-objpas/src/win/varutils.pp
index 8cff79a8b7..732259ce49 100644
--- a/packages/rtl-objpas/src/win/varutils.pp
+++ b/packages/rtl-objpas/src/win/varutils.pp
@@ -19,7 +19,7 @@
 {$smartlink on}
 {$endif}
 
-Unit varutils;
+Unit VarUtils;
 
 Interface
 
diff --git a/packages/sqlite/src/sqlite.pp b/packages/sqlite/src/sqlite.pp
index 353025ceaa..611846d08d 100644
--- a/packages/sqlite/src/sqlite.pp
+++ b/packages/sqlite/src/sqlite.pp
@@ -4,7 +4,7 @@
   {$linklib c}
 {$endif}
 
-unit sqlite;
+unit SQLite;
 
 interface
 
diff --git a/packages/sqlite/src/sqlite3.pp b/packages/sqlite/src/sqlite3.pp
index 044542cf9e..6d2bd7defa 100644
--- a/packages/sqlite/src/sqlite3.pp
+++ b/packages/sqlite/src/sqlite3.pp
@@ -1,4 +1,4 @@
-unit sqlite3;
+unit SQLite3;
 
 {$i sqlite3.inc}
 
diff --git a/packages/sqlite/src/sqlite3db.pas b/packages/sqlite/src/sqlite3db.pas
index e23abef211..bf7cdde120 100644
--- a/packages/sqlite/src/sqlite3db.pas
+++ b/packages/sqlite/src/sqlite3db.pas
@@ -6,7 +6,7 @@ O. Rinaudo - 2005 - orinaudo@gmail.com
 G. Marcou  - 2007 - g.marcou@chimie.u-strasbg.fr
 *************************************************************}
 
-unit SQLite3db;
+unit SQLite3DB;
 
 interface
 
diff --git a/packages/sqlite/src/sqlite3dyn.pp b/packages/sqlite/src/sqlite3dyn.pp
index b720814741..53fee5fad7 100644
--- a/packages/sqlite/src/sqlite3dyn.pp
+++ b/packages/sqlite/src/sqlite3dyn.pp
@@ -1,4 +1,4 @@
-unit sqlite3dyn;
+unit SQLite3Dyn;
 
 {$DEFINE LOAD_DYNAMICALLY}
 
diff --git a/packages/sqlite/src/sqlitedb.pas b/packages/sqlite/src/sqlitedb.pas
index 939d84caf9..9da6f9d43b 100644
--- a/packages/sqlite/src/sqlitedb.pas
+++ b/packages/sqlite/src/sqlitedb.pas
@@ -1,7 +1,7 @@
 {$mode objfpc}
 {$h+}
 
-unit SQLitedb;
+unit SQLiteDB;
 
 interface
 
diff --git a/packages/unzip/src/ziptypes.pp b/packages/unzip/src/ziptypes.pp
index 37a3920c33..35a21b7c4b 100644
--- a/packages/unzip/src/ziptypes.pp
+++ b/packages/unzip/src/ziptypes.pp
@@ -1,6 +1,6 @@
 {
 }
-UNIT ziptypes;
+UNIT ZipTypes;
 {
 Type definitions for UNZIP
   * original version by Christian Ghisler
diff --git a/packages/winunits-base/src/comconst.pp b/packages/winunits-base/src/comconst.pp
index f7dc06c402..1a71a02ae0 100644
--- a/packages/winunits-base/src/comconst.pp
+++ b/packages/winunits-base/src/comconst.pp
@@ -14,7 +14,7 @@
 {$mode objfpc}
 {$H+}
 {$inline on}
-unit comconst;
+unit ComConst;
 
   interface
 
diff --git a/packages/winunits-base/src/commdlg.pp b/packages/winunits-base/src/commdlg.pp
index 9f0de5ad29..fa5d45bd2a 100644
--- a/packages/winunits-base/src/commdlg.pp
+++ b/packages/winunits-base/src/commdlg.pp
@@ -13,7 +13,7 @@
     Note these functions were in the windows unit in older versions
 
  **********************************************************************}
-unit commdlg;
+unit CommDlg;
 
 interface
 {$mode delphi} // interface
diff --git a/packages/winunits-base/src/comobj.pp b/packages/winunits-base/src/comobj.pp
index 3801459363..f48d42d5de 100644
--- a/packages/winunits-base/src/comobj.pp
+++ b/packages/winunits-base/src/comobj.pp
@@ -14,7 +14,7 @@
 {$mode objfpc}
 {$H+}
 {$inline on}
-unit comobj;
+unit ComObj;
 
   interface
 
diff --git a/packages/winunits-base/src/comserv.pp b/packages/winunits-base/src/comserv.pp
index 0ec9b7c074..164f713f3d 100644
--- a/packages/winunits-base/src/comserv.pp
+++ b/packages/winunits-base/src/comserv.pp
@@ -14,7 +14,7 @@
 {$mode objfpc}
 {$H+}
 {$inline on}
-unit comserv;
+unit ComServ;
 
 interface
 
diff --git a/packages/winunits-base/src/mmsystem.pp b/packages/winunits-base/src/mmsystem.pp
index 7c7e6ba1d3..00637dec71 100644
--- a/packages/winunits-base/src/mmsystem.pp
+++ b/packages/winunits-base/src/mmsystem.pp
@@ -6,7 +6,7 @@
 {*********************************} (*   LCC-win32 (c) Jacob Navia   *)
                                     (*********************************)
 
-Unit mmsystem;
+Unit MMSystem;
 {$ifndef NO_SMART_LINK}
   {$smartlink on}
 {$endif}
diff --git a/packages/winunits-base/src/ole2.pp b/packages/winunits-base/src/ole2.pp
index bf9ef75bbb..ba9f7dfca6 100644
--- a/packages/winunits-base/src/ole2.pp
+++ b/packages/winunits-base/src/ole2.pp
@@ -13,7 +13,7 @@
 
  **********************************************************************}
 {$MODE OBJFPC}
-unit ole2;
+unit Ole2;
 
   interface
 
diff --git a/packages/winunits-base/src/richedit.pp b/packages/winunits-base/src/richedit.pp
index ee8c19c819..0093109659 100644
--- a/packages/winunits-base/src/richedit.pp
+++ b/packages/winunits-base/src/richedit.pp
@@ -1,5 +1,5 @@
 { Converted by H2Pas from richedit.h }
-unit richedit;
+unit RichEdit;
 
 {$mode objfpc}
 {$calling stdcall}
diff --git a/packages/winunits-base/src/stdole2.pas b/packages/winunits-base/src/stdole2.pas
index a33cb428ec..e948f5083d 100644
--- a/packages/winunits-base/src/stdole2.pas
+++ b/packages/winunits-base/src/stdole2.pas
@@ -1,4 +1,4 @@
-Unit stdole2;
+Unit StdOle2;
 
 //  Imported on 24/12/2011 13:43:11 from C:\WINDOWS\system32\stdole2.tlb
 //  Modified by Ludo Brands to remove redeclarations
diff --git a/packages/winunits-base/src/winhttp.pp b/packages/winunits-base/src/winhttp.pp
index a994527300..fba5c41239 100644
--- a/packages/winunits-base/src/winhttp.pp
+++ b/packages/winunits-base/src/winhttp.pp
@@ -23,7 +23,7 @@ Abstract:
     Contains manifests, macros, types and prototypes for Windows HTTP Services
 
 }	
-unit winhttp;
+unit WinHTTP;
 interface
 
 uses windows;
diff --git a/packages/winunits-base/src/wininet.pp b/packages/winunits-base/src/wininet.pp
index 562c8f9ff3..379e7331b5 100644
--- a/packages/winunits-base/src/wininet.pp
+++ b/packages/winunits-base/src/wininet.pp
@@ -1,4 +1,4 @@
-unit wininet;
+unit WinINet;
 //+-------------------------------------------------------------------------
 //
 //  Microsoft Windows
diff --git a/packages/winunits-base/src/winspool.pp b/packages/winunits-base/src/winspool.pp
index 8173e267f9..e55aa3f3bf 100644
--- a/packages/winunits-base/src/winspool.pp
+++ b/packages/winunits-base/src/winspool.pp
@@ -1,4 +1,4 @@
-unit winspool;
+unit Winspool;
 
 interface
 
diff --git a/packages/winunits-base/src/winutils.pp b/packages/winunits-base/src/winutils.pp
index 14c6e94370..681d0b9b22 100644
--- a/packages/winunits-base/src/winutils.pp
+++ b/packages/winunits-base/src/winutils.pp
@@ -14,7 +14,7 @@
  **********************************************************************}
 
 {$mode objfpc}{$H+}
-unit winutils;
+unit WinUtils;
 
 Interface
 
diff --git a/packages/winunits-base/src/winver.pp b/packages/winunits-base/src/winver.pp
index 40a0bc4772..94999373d3 100644
--- a/packages/winunits-base/src/winver.pp
+++ b/packages/winunits-base/src/winver.pp
@@ -14,7 +14,7 @@
  **********************************************************************}
 
 {$mode objfpc}
-unit winver;
+unit WinVer;
 
 Interface
 
diff --git a/packages/zlib/src/zlib.pp b/packages/zlib/src/zlib.pp
index 1846dbf008..d8c570e73f 100644
--- a/packages/zlib/src/zlib.pp
+++ b/packages/zlib/src/zlib.pp
@@ -1,7 +1,7 @@
 {$ifndef NO_SMART_LINK}
 {$smartlink on}
 {$endif}
-unit zlib;
+unit ZLib;
 
 interface
 
diff --git a/rtl/inc/strings.pp b/rtl/inc/strings.pp
index caf4784c60..7d8feec374 100644
--- a/rtl/inc/strings.pp
+++ b/rtl/inc/strings.pp
@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit strings;
+unit Strings;
 {$S-}
 {$inline on}
 interface
diff --git a/rtl/inc/thread.inc b/rtl/inc/thread.inc
index e12eaa1322..05f95d5220 100644
--- a/rtl/inc/thread.inc
+++ b/rtl/inc/thread.inc
@@ -211,25 +211,25 @@ begin
   CurrentTM.InitCriticalSection(cs);
 end;
 
-procedure DoneCriticalsection(var cs : TRTLCriticalSection);
+procedure DoneCriticalSection(var cs : TRTLCriticalSection);
 
 begin
   CurrentTM.DoneCriticalSection(cs);
 end;
 
-procedure EnterCriticalsection(var cs : TRTLCriticalSection);
+procedure EnterCriticalSection(var cs : TRTLCriticalSection);
 
 begin
   CurrentTM.EnterCriticalSection(cs);
 end;
 
-function TryEnterCriticalsection(var cs : TRTLCriticalSection):longint;
+function TryEnterCriticalSection(var cs : TRTLCriticalSection):longint;
 
 begin
   result:=CurrentTM.TryEnterCriticalSection(cs);
 end;
 
-procedure LeaveCriticalsection(var cs : TRTLCriticalSection);
+procedure LeaveCriticalSection(var cs : TRTLCriticalSection);
 
 begin
   CurrentTM.LeaveCriticalSection(cs);
diff --git a/rtl/inc/threadh.inc b/rtl/inc/threadh.inc
index 34b6edd7b6..3dc04c6aa3 100644
--- a/rtl/inc/threadh.inc
+++ b/rtl/inc/threadh.inc
@@ -153,10 +153,10 @@ function  GetCurrentThreadId : TThreadID;
 { it is also used to make the heap management      }
 { thread safe                                      }
 procedure InitCriticalSection(var cs : TRTLCriticalSection);
-procedure DoneCriticalsection(var cs : TRTLCriticalSection);
-procedure EnterCriticalsection(var cs : TRTLCriticalSection);
-procedure LeaveCriticalsection(var cs : TRTLCriticalSection);
-function  TryEnterCriticalsection(var cs : TRTLCriticalSection):longint;
+procedure DoneCriticalSection(var cs : TRTLCriticalSection);
+procedure EnterCriticalSection(var cs : TRTLCriticalSection);
+procedure LeaveCriticalSection(var cs : TRTLCriticalSection);
+function  TryEnterCriticalSection(var cs : TRTLCriticalSection):longint;
 function  BasicEventCreate(EventAttributes : Pointer; AManualReset,InitialState : Boolean;const Name : ansistring):pEventState;
 procedure basiceventdestroy(state:peventstate);
 procedure basiceventResetEvent(state:peventstate);
diff --git a/rtl/inc/typshrdh.inc b/rtl/inc/typshrdh.inc
index 07edfc7a6c..e62be937ae 100644
--- a/rtl/inc/typshrdh.inc
+++ b/rtl/inc/typshrdh.inc
@@ -64,7 +64,7 @@
    packed
   {$endif FPC_REQUIRES_PROPER_ALIGNMENT}
   record
-       x : Longint; y : Longint;
+       X : Longint; Y : Longint;
      public
        {$ifdef VER3}
        constructor Create(ax,ay:Longint); overload;
diff --git a/rtl/objpas/character.pas b/rtl/objpas/character.pas
index 6fbbd450bf..76ab7689d6 100644
--- a/rtl/objpas/character.pas
+++ b/rtl/objpas/character.pas
@@ -17,7 +17,7 @@
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. }
-unit character;
+unit Character;
 
 interface
 {$ifndef VER2_4}
diff --git a/rtl/objpas/math.pp b/rtl/objpas/math.pp
index c5f0a99ed8..88c438dc59 100644
--- a/rtl/objpas/math.pp
+++ b/rtl/objpas/math.pp
@@ -36,7 +36,7 @@
  3. This notice may not be removed or altered from any source distribution.
 ----------------------------------------------------------------------------}
 {
-  This unit is an equivalent to the Delphi math unit
+  This unit is an equivalent to the Delphi Math unit
   (with some improvements)
 
   What's to do:
@@ -47,7 +47,7 @@
 {$MODE objfpc}
 {$inline on }
 {$GOTO on}
-unit math;
+unit Math;
 interface
 
 
diff --git a/rtl/objpas/sysconst.pp b/rtl/objpas/sysconst.pp
index 86cfe076a5..908572516b 100644
--- a/rtl/objpas/sysconst.pp
+++ b/rtl/objpas/sysconst.pp
@@ -12,7 +12,7 @@
 
  **********************************************************************}
 {$mode objfpc}
-unit sysconst;
+unit SysConst;
 
 interface
 
diff --git a/rtl/objpas/typinfo.pp b/rtl/objpas/typinfo.pp
index 0a72d7a996..62def0292f 100644
--- a/rtl/objpas/typinfo.pp
+++ b/rtl/objpas/typinfo.pp
@@ -16,7 +16,7 @@
 { This unit provides the same Functionality as the TypInfo Unit }
 { of Delphi                                                     }
 
-unit typinfo;
+unit TypInfo;
 
   interface
 
diff --git a/rtl/win/messages.pp b/rtl/win/messages.pp
index db44c2dc29..77b2ad3176 100644
--- a/rtl/win/messages.pp
+++ b/rtl/win/messages.pp
@@ -1,4 +1,4 @@
-unit messages;
+unit Messages;
 
 
 interface
diff --git a/rtl/win/sysutils.pp b/rtl/win/sysutils.pp
index 78cc0d8a06..0fe4c1b32f 100644
--- a/rtl/win/sysutils.pp
+++ b/rtl/win/sysutils.pp
@@ -4,7 +4,7 @@
     Copyright (c) 1999-2000 by Florian Klaempfl
     member of the Free Pascal development team
 
-    Sysutils unit for win32
+    SysUtils unit for win32
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -14,7 +14,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit sysutils;
+unit SysUtils;
 interface
 
 {$MODE objfpc}
diff --git a/rtl/win/windirs.pp b/rtl/win/windirs.pp
index 65a8d98f9f..123a8f0808 100644
--- a/rtl/win/windirs.pp
+++ b/rtl/win/windirs.pp
@@ -1,4 +1,4 @@
-unit windirs;
+unit WinDirs;
 
 {*******************************************************************************
 
diff --git a/rtl/win32/sysinitcyg.pp b/rtl/win32/sysinitcyg.pp
index 80d7d0fa91..172e7e9107 100644
--- a/rtl/win32/sysinitcyg.pp
+++ b/rtl/win32/sysinitcyg.pp
@@ -14,7 +14,7 @@
 
  **********************************************************************}
 {$asmmode att}
-unit sysinitcyg;
+unit SysInitCyg;
 
   interface
 
diff --git a/rtl/win32/sysinitgprof.pp b/rtl/win32/sysinitgprof.pp
index 4079dd110d..dd6478a9c0 100644
--- a/rtl/win32/sysinitgprof.pp
+++ b/rtl/win32/sysinitgprof.pp
@@ -14,7 +14,7 @@
 
  **********************************************************************}
 {$asmmode att}
-unit sysinitgprof;
+unit SysInitGProf;
 
   interface
 
diff --git a/rtl/win32/sysinitpas.pp b/rtl/win32/sysinitpas.pp
index 16d595044a..b21da0006a 100644
--- a/rtl/win32/sysinitpas.pp
+++ b/rtl/win32/sysinitpas.pp
@@ -13,7 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit sysinitpas;
+unit SysInitPas;
 
   interface
 
diff --git a/rtl/win32/windows.pp b/rtl/win32/windows.pp
index ff98b3ae42..9bf2deb0e9 100644
--- a/rtl/win32/windows.pp
+++ b/rtl/win32/windows.pp
@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit windows;
+unit Windows;
 
 {$PACKSET 1}
 
diff --git a/rtl/win32/winsysut.pp b/rtl/win32/winsysut.pp
index 39f3e26405..f389a13f6b 100644
--- a/rtl/win32/winsysut.pp
+++ b/rtl/win32/winsysut.pp
@@ -13,7 +13,7 @@
 
  **********************************************************************}
 {$mode objfpc}
-unit winsysut;
+unit WinSysUt;
 
 Interface