From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 9 Jun 2024 14:26:54 +0000 (+0200)
Subject: chore: Rename source files to lowercase for consistency
X-Git-Tag: v4.11~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d805b66b0f1ffdfc7035537fbca677d7463d2782;p=thirdparty%2Fccache.git

chore: Rename source files to lowercase for consistency
---

diff --git a/src/ccache/CMakeLists.txt b/src/ccache/CMakeLists.txt
index a80f41ebf..ddaf0f5e5 100644
--- a/src/ccache/CMakeLists.txt
+++ b/src/ccache/CMakeLists.txt
@@ -1,26 +1,26 @@
 set(
   source_files
-  Args.cpp
-  Config.cpp
-  Context.cpp
-  Depfile.cpp
-  Hash.cpp
-  ProgressBar.cpp
   argprocessing.cpp
+  args.cpp
   ccache.cpp
   compopt.cpp
+  config.cpp
+  context.cpp
+  depfile.cpp
   execute.cpp
+  hash.cpp
   hashutil.cpp
   language.cpp
+  progressbar.cpp
   version.cpp
 )
 
 if(INODE_CACHE_SUPPORTED)
-  list(APPEND source_files InodeCache.cpp)
+  list(APPEND source_files inodecache.cpp)
 endif()
 
 if(NOT WIN32)
-  list(APPEND source_files SignalHandler.cpp)
+  list(APPEND source_files signalhandler.cpp)
 endif()
 
 file(GLOB headers *.hpp)
diff --git a/src/ccache/argprocessing.cpp b/src/ccache/argprocessing.cpp
index 8ecd6c541..c72dcd2f7 100644
--- a/src/ccache/argprocessing.cpp
+++ b/src/ccache/argprocessing.cpp
@@ -18,21 +18,21 @@
 
 #include "argprocessing.hpp"
 
-#include <ccache/Args.hpp>
-#include <ccache/ArgsInfo.hpp>
-#include <ccache/Context.hpp>
-#include <ccache/Depfile.hpp>
+#include <ccache/args.hpp>
+#include <ccache/argsinfo.hpp>
 #include <ccache/compopt.hpp>
+#include <ccache/context.hpp>
 #include <ccache/core/common.hpp>
+#include <ccache/depfile.hpp>
 #include <ccache/language.hpp>
-#include <ccache/util/DirEntry.hpp>
-#include <ccache/util/Tokenizer.hpp>
 #include <ccache/util/assertions.hpp>
+#include <ccache/util/direntry.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/logging.hpp>
 #include <ccache/util/path.hpp>
 #include <ccache/util/string.hpp>
+#include <ccache/util/tokenizer.hpp>
 #include <ccache/util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H
diff --git a/src/ccache/argprocessing.hpp b/src/ccache/argprocessing.hpp
index 506e6d249..61edd6907 100644
--- a/src/ccache/argprocessing.hpp
+++ b/src/ccache/argprocessing.hpp
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include <ccache/Args.hpp>
-#include <ccache/core/Statistic.hpp>
+#include <ccache/args.hpp>
+#include <ccache/core/statistic.hpp>
 
 #include <tl/expected.hpp>
 
diff --git a/src/ccache/Args.cpp b/src/ccache/args.cpp
similarity index 99%
rename from src/ccache/Args.cpp
rename to src/ccache/args.cpp
index 795dd6898..ff7704899 100644
--- a/src/ccache/Args.cpp
+++ b/src/ccache/args.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "Args.hpp"
+#include "args.hpp"
 
 #include <ccache/core/exceptions.hpp>
 #include <ccache/util/file.hpp>
diff --git a/src/ccache/Args.hpp b/src/ccache/args.hpp
similarity index 100%
rename from src/ccache/Args.hpp
rename to src/ccache/args.hpp
diff --git a/src/ccache/ArgsInfo.hpp b/src/ccache/argsinfo.hpp
similarity index 99%
rename from src/ccache/ArgsInfo.hpp
rename to src/ccache/argsinfo.hpp
index c733b2184..d71d66f80 100644
--- a/src/ccache/ArgsInfo.hpp
+++ b/src/ccache/argsinfo.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/Args.hpp>
+#include <ccache/args.hpp>
 
 #include <filesystem>
 #include <optional>
diff --git a/src/ccache/ccache.cpp b/src/ccache/ccache.cpp
index a250d4c46..f9ab687f0 100644
--- a/src/ccache/ccache.cpp
+++ b/src/ccache/ccache.cpp
@@ -19,53 +19,53 @@
 
 #include "ccache.hpp"
 
-#include <ccache/Args.hpp>
-#include <ccache/ArgsInfo.hpp>
-#include <ccache/Context.hpp>
-#include <ccache/Depfile.hpp>
-#include <ccache/Hash.hpp>
-#include <ccache/SignalHandler.hpp>
 #include <ccache/argprocessing.hpp>
+#include <ccache/args.hpp>
+#include <ccache/argsinfo.hpp>
 #include <ccache/compopt.hpp>
-#include <ccache/core/CacheEntry.hpp>
-#include <ccache/core/Manifest.hpp>
-#include <ccache/core/MsvcShowIncludesOutput.hpp>
-#include <ccache/core/Result.hpp>
-#include <ccache/core/ResultRetriever.hpp>
-#include <ccache/core/Sloppiness.hpp>
-#include <ccache/core/Statistic.hpp>
-#include <ccache/core/Statistics.hpp>
-#include <ccache/core/StatisticsCounters.hpp>
-#include <ccache/core/StatsLog.hpp>
+#include <ccache/context.hpp>
+#include <ccache/core/cacheentry.hpp>
 #include <ccache/core/common.hpp>
 #include <ccache/core/exceptions.hpp>
 #include <ccache/core/mainoptions.hpp>
+#include <ccache/core/manifest.hpp>
+#include <ccache/core/msvcshowincludesoutput.hpp>
+#include <ccache/core/result.hpp>
+#include <ccache/core/resultretriever.hpp>
+#include <ccache/core/sloppiness.hpp>
+#include <ccache/core/statistic.hpp>
+#include <ccache/core/statistics.hpp>
+#include <ccache/core/statisticscounters.hpp>
+#include <ccache/core/statslog.hpp>
 #include <ccache/core/types.hpp>
+#include <ccache/depfile.hpp>
 #include <ccache/execute.hpp>
+#include <ccache/hash.hpp>
 #include <ccache/hashutil.hpp>
-#include <ccache/storage/Storage.hpp>
-#include <ccache/util/Bytes.hpp>
-#include <ccache/util/DirEntry.hpp>
-#include <ccache/util/Duration.hpp>
-#include <ccache/util/Fd.hpp>
-#include <ccache/util/FileStream.hpp>
-#include <ccache/util/Finalizer.hpp>
-#include <ccache/util/TemporaryFile.hpp>
-#include <ccache/util/TimePoint.hpp>
-#include <ccache/util/Tokenizer.hpp>
-#include <ccache/util/UmaskScope.hpp>
+#include <ccache/signalhandler.hpp>
+#include <ccache/storage/storage.hpp>
 #include <ccache/util/assertions.hpp>
+#include <ccache/util/bytes.hpp>
 #include <ccache/util/conversion.hpp>
+#include <ccache/util/direntry.hpp>
+#include <ccache/util/duration.hpp>
 #include <ccache/util/environment.hpp>
 #include <ccache/util/expected.hpp>
+#include <ccache/util/fd.hpp>
 #include <ccache/util/file.hpp>
+#include <ccache/util/filestream.hpp>
 #include <ccache/util/filesystem.hpp>
+#include <ccache/util/finalizer.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/logging.hpp>
 #include <ccache/util/path.hpp>
 #include <ccache/util/process.hpp>
 #include <ccache/util/string.hpp>
+#include <ccache/util/temporaryfile.hpp>
 #include <ccache/util/time.hpp>
+#include <ccache/util/timepoint.hpp>
+#include <ccache/util/tokenizer.hpp>
+#include <ccache/util/umaskscope.hpp>
 #include <ccache/util/wincompat.hpp>
 
 #include <fcntl.h>
diff --git a/src/ccache/ccache.hpp b/src/ccache/ccache.hpp
index 2377b381f..bb23027ef 100644
--- a/src/ccache/ccache.hpp
+++ b/src/ccache/ccache.hpp
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <ccache/Args.hpp>
-#include <ccache/Config.hpp>
+#include <ccache/args.hpp>
+#include <ccache/config.hpp>
 
 #include <filesystem>
 #include <functional>
diff --git a/src/ccache/Config.cpp b/src/ccache/config.cpp
similarity index 99%
rename from src/ccache/Config.cpp
rename to src/ccache/config.cpp
index 9a34a6f83..e9e78dace 100644
--- a/src/ccache/Config.cpp
+++ b/src/ccache/config.cpp
@@ -16,16 +16,14 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "Config.hpp"
+#include "config.hpp"
 
-#include <ccache/core/AtomicFile.hpp>
-#include <ccache/core/Sloppiness.hpp>
+#include <ccache/core/atomicfile.hpp>
 #include <ccache/core/common.hpp>
 #include <ccache/core/exceptions.hpp>
-#include <ccache/util/DirEntry.hpp>
-#include <ccache/util/Tokenizer.hpp>
-#include <ccache/util/UmaskScope.hpp>
+#include <ccache/core/sloppiness.hpp>
 #include <ccache/util/assertions.hpp>
+#include <ccache/util/direntry.hpp>
 #include <ccache/util/environment.hpp>
 #include <ccache/util/expected.hpp>
 #include <ccache/util/file.hpp>
@@ -33,6 +31,8 @@
 #include <ccache/util/format.hpp>
 #include <ccache/util/path.hpp>
 #include <ccache/util/string.hpp>
+#include <ccache/util/tokenizer.hpp>
+#include <ccache/util/umaskscope.hpp>
 #include <ccache/util/wincompat.hpp>
 
 #ifdef HAVE_PWD_H
diff --git a/src/ccache/Config.hpp b/src/ccache/config.hpp
similarity index 99%
rename from src/ccache/Config.hpp
rename to src/ccache/config.hpp
index 84c529145..74d2b3ec0 100644
--- a/src/ccache/Config.hpp
+++ b/src/ccache/config.hpp
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include <ccache/core/Sloppiness.hpp>
-#include <ccache/util/NonCopyable.hpp>
+#include <ccache/core/sloppiness.hpp>
+#include <ccache/util/noncopyable.hpp>
 #include <ccache/util/string.hpp>
 
 #include <sys/types.h>
diff --git a/src/ccache/Context.cpp b/src/ccache/context.cpp
similarity index 97%
rename from src/ccache/Context.cpp
rename to src/ccache/context.cpp
index 4f23268df..b59cd95ee 100644
--- a/src/ccache/Context.cpp
+++ b/src/ccache/context.cpp
@@ -16,17 +16,17 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "Context.hpp"
+#include "context.hpp"
 
-#include <ccache/SignalHandler.hpp>
 #include <ccache/hashutil.hpp>
-#include <ccache/util/TimePoint.hpp>
+#include <ccache/signalhandler.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/logging.hpp>
 #include <ccache/util/path.hpp>
 #include <ccache/util/process.hpp>
 #include <ccache/util/string.hpp>
+#include <ccache/util/timepoint.hpp>
 #include <ccache/util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H
diff --git a/src/ccache/Context.hpp b/src/ccache/context.hpp
similarity index 91%
rename from src/ccache/Context.hpp
rename to src/ccache/context.hpp
index aad606b96..71fa71652 100644
--- a/src/ccache/Context.hpp
+++ b/src/ccache/context.hpp
@@ -18,19 +18,19 @@
 
 #pragma once
 
-#include <ccache/Args.hpp>
-#include <ccache/ArgsInfo.hpp>
-#include <ccache/Config.hpp>
-#include <ccache/Hash.hpp>
-#include <ccache/core/Manifest.hpp>
-#include <ccache/storage/Storage.hpp>
-#include <ccache/util/Bytes.hpp>
-#include <ccache/util/FileStream.hpp>
-#include <ccache/util/NonCopyable.hpp>
-#include <ccache/util/TimePoint.hpp>
+#include <ccache/args.hpp>
+#include <ccache/argsinfo.hpp>
+#include <ccache/config.hpp>
+#include <ccache/core/manifest.hpp>
+#include <ccache/hash.hpp>
+#include <ccache/storage/storage.hpp>
+#include <ccache/util/bytes.hpp>
+#include <ccache/util/filestream.hpp>
+#include <ccache/util/noncopyable.hpp>
+#include <ccache/util/timepoint.hpp>
 
 #ifdef INODE_CACHE_SUPPORTED
-#  include <ccache/InodeCache.hpp>
+#  include <ccache/inodecache.hpp>
 #endif
 
 #include <sys/types.h>
diff --git a/src/ccache/core/CMakeLists.txt b/src/ccache/core/CMakeLists.txt
index eadb9f92b..70c9ed9a1 100644
--- a/src/ccache/core/CMakeLists.txt
+++ b/src/ccache/core/CMakeLists.txt
@@ -1,19 +1,19 @@
 set(
   sources
-  AtomicFile.cpp
-  CacheEntry.cpp
-  FileRecompressor.cpp
-  Manifest.cpp
-  MsvcShowIncludesOutput.cpp
-  Result.cpp
-  ResultExtractor.cpp
-  ResultInspector.cpp
-  ResultRetriever.cpp
-  Statistics.cpp
-  StatisticsCounters.cpp
-  StatsLog.cpp
+  atomicfile.cpp
+  cacheentry.cpp
   common.cpp
+  filerecompressor.cpp
   mainoptions.cpp
+  manifest.cpp
+  msvcshowincludesoutput.cpp
+  result.cpp
+  resultextractor.cpp
+  resultinspector.cpp
+  resultretriever.cpp
+  statistics.cpp
+  statisticscounters.cpp
+  statslog.cpp
   types.cpp
 )
 
diff --git a/src/ccache/core/AtomicFile.cpp b/src/ccache/core/atomicfile.cpp
similarity index 97%
rename from src/ccache/core/AtomicFile.cpp
rename to src/ccache/core/atomicfile.cpp
index 5e22295bd..65e2918f8 100644
--- a/src/ccache/core/AtomicFile.cpp
+++ b/src/ccache/core/atomicfile.cpp
@@ -16,15 +16,15 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "AtomicFile.hpp"
+#include "atomicfile.hpp"
 
 #include <ccache/core/exceptions.hpp>
-#include <ccache/util/TemporaryFile.hpp>
 #include <ccache/util/assertions.hpp>
 #include <ccache/util/expected.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/format.hpp>
+#include <ccache/util/temporaryfile.hpp>
 
 namespace fs = util::filesystem;
 
diff --git a/src/ccache/core/AtomicFile.hpp b/src/ccache/core/atomicfile.hpp
similarity index 100%
rename from src/ccache/core/AtomicFile.hpp
rename to src/ccache/core/atomicfile.hpp
diff --git a/src/ccache/core/CacheEntry.cpp b/src/ccache/core/cacheentry.cpp
similarity index 97%
rename from src/ccache/core/CacheEntry.cpp
rename to src/ccache/core/cacheentry.cpp
index 335e05317..6b86aa32a 100644
--- a/src/ccache/core/CacheEntry.cpp
+++ b/src/ccache/core/cacheentry.cpp
@@ -16,21 +16,21 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "CacheEntry.hpp"
+#include "cacheentry.hpp"
 
 #include <ccache/ccache.hpp>
-#include <ccache/core/CacheEntryDataReader.hpp>
-#include <ccache/core/CacheEntryDataWriter.hpp>
-#include <ccache/core/Result.hpp>
+#include <ccache/core/cacheentrydatareader.hpp>
+#include <ccache/core/cacheentrydatawriter.hpp>
 #include <ccache/core/exceptions.hpp>
+#include <ccache/core/result.hpp>
 #include <ccache/core/types.hpp>
-#include <ccache/util/TimePoint.hpp>
-#include <ccache/util/XXH3_128.hpp>
 #include <ccache/util/expected.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/logging.hpp>
+#include <ccache/util/timepoint.hpp>
+#include <ccache/util/xxh3_128.hpp>
 #include <ccache/util/zstd.hpp>
 
 #include <cstring>
diff --git a/src/ccache/core/CacheEntry.hpp b/src/ccache/core/cacheentry.hpp
similarity index 98%
rename from src/ccache/core/CacheEntry.hpp
rename to src/ccache/core/cacheentry.hpp
index b57772966..e429cf0f4 100644
--- a/src/ccache/core/CacheEntry.hpp
+++ b/src/ccache/core/cacheentry.hpp
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <ccache/core/Serializer.hpp>
+#include <ccache/core/serializer.hpp>
 #include <ccache/core/types.hpp>
-#include <ccache/util/Bytes.hpp>
+#include <ccache/util/bytes.hpp>
 
 #include <nonstd/span.hpp>
 
diff --git a/src/ccache/core/CacheEntryDataReader.hpp b/src/ccache/core/cacheentrydatareader.hpp
similarity index 100%
rename from src/ccache/core/CacheEntryDataReader.hpp
rename to src/ccache/core/cacheentrydatareader.hpp
diff --git a/src/ccache/core/CacheEntryDataWriter.hpp b/src/ccache/core/cacheentrydatawriter.hpp
similarity index 100%
rename from src/ccache/core/CacheEntryDataWriter.hpp
rename to src/ccache/core/cacheentrydatawriter.hpp
diff --git a/src/ccache/core/common.cpp b/src/ccache/core/common.cpp
index eddb7866c..78c733e25 100644
--- a/src/ccache/core/common.cpp
+++ b/src/ccache/core/common.cpp
@@ -18,15 +18,15 @@
 
 #include "common.hpp"
 
-#include <ccache/Context.hpp>
+#include <ccache/context.hpp>
 #include <ccache/core/exceptions.hpp>
-#include <ccache/util/Finalizer.hpp>
-#include <ccache/util/Tokenizer.hpp>
 #include <ccache/util/expected.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
+#include <ccache/util/finalizer.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/path.hpp>
+#include <ccache/util/tokenizer.hpp>
 
 using IncludeDelimiter = util::Tokenizer::IncludeDelimiter;
 
diff --git a/src/ccache/core/FileRecompressor.cpp b/src/ccache/core/filerecompressor.cpp
similarity index 96%
rename from src/ccache/core/FileRecompressor.cpp
rename to src/ccache/core/filerecompressor.cpp
index cb3f6fea1..769d539d3 100644
--- a/src/ccache/core/FileRecompressor.cpp
+++ b/src/ccache/core/filerecompressor.cpp
@@ -16,10 +16,10 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "FileRecompressor.hpp"
+#include "filerecompressor.hpp"
 
-#include <ccache/core/AtomicFile.hpp>
-#include <ccache/core/CacheEntry.hpp>
+#include <ccache/core/atomicfile.hpp>
+#include <ccache/core/cacheentry.hpp>
 #include <ccache/core/exceptions.hpp>
 #include <ccache/util/expected.hpp>
 #include <ccache/util/file.hpp>
diff --git a/src/ccache/core/FileRecompressor.hpp b/src/ccache/core/filerecompressor.hpp
similarity index 97%
rename from src/ccache/core/FileRecompressor.hpp
rename to src/ccache/core/filerecompressor.hpp
index bf2d6d115..b19c2a255 100644
--- a/src/ccache/core/FileRecompressor.hpp
+++ b/src/ccache/core/filerecompressor.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/direntry.hpp>
 
 #include <atomic>
 #include <cstdint>
diff --git a/src/ccache/core/mainoptions.cpp b/src/ccache/core/mainoptions.cpp
index 7faaddd8d..f86e0b8c0 100644
--- a/src/ccache/core/mainoptions.cpp
+++ b/src/ccache/core/mainoptions.cpp
@@ -18,39 +18,39 @@
 
 #include "mainoptions.hpp"
 
-#include <ccache/Config.hpp>
-#include <ccache/Hash.hpp>
-#include <ccache/InodeCache.hpp>
-#include <ccache/ProgressBar.hpp>
 #include <ccache/ccache.hpp>
-#include <ccache/core/CacheEntry.hpp>
-#include <ccache/core/FileRecompressor.hpp>
-#include <ccache/core/Manifest.hpp>
-#include <ccache/core/Result.hpp>
-#include <ccache/core/ResultExtractor.hpp>
-#include <ccache/core/ResultInspector.hpp>
-#include <ccache/core/Statistics.hpp>
-#include <ccache/core/StatsLog.hpp>
+#include <ccache/config.hpp>
+#include <ccache/core/cacheentry.hpp>
 #include <ccache/core/exceptions.hpp>
-#include <ccache/storage/Storage.hpp>
-#include <ccache/storage/local/LocalStorage.hpp>
-#include <ccache/util/Fd.hpp>
-#include <ccache/util/FileStream.hpp>
-#include <ccache/util/TemporaryFile.hpp>
-#include <ccache/util/TextTable.hpp>
-#include <ccache/util/ThreadPool.hpp>
-#include <ccache/util/UmaskScope.hpp>
-#include <ccache/util/XXH3_128.hpp>
+#include <ccache/core/filerecompressor.hpp>
+#include <ccache/core/manifest.hpp>
+#include <ccache/core/result.hpp>
+#include <ccache/core/resultextractor.hpp>
+#include <ccache/core/resultinspector.hpp>
+#include <ccache/core/statistics.hpp>
+#include <ccache/core/statslog.hpp>
+#include <ccache/hash.hpp>
+#include <ccache/inodecache.hpp>
+#include <ccache/progressbar.hpp>
+#include <ccache/storage/local/localstorage.hpp>
+#include <ccache/storage/storage.hpp>
 #include <ccache/util/assertions.hpp>
 #include <ccache/util/cpu.hpp>
 #include <ccache/util/environment.hpp>
 #include <ccache/util/expected.hpp>
+#include <ccache/util/fd.hpp>
 #include <ccache/util/file.hpp>
+#include <ccache/util/filestream.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/logging.hpp>
 #include <ccache/util/path.hpp>
 #include <ccache/util/string.hpp>
+#include <ccache/util/temporaryfile.hpp>
+#include <ccache/util/texttable.hpp>
+#include <ccache/util/threadpool.hpp>
+#include <ccache/util/umaskscope.hpp>
+#include <ccache/util/xxh3_128.hpp>
 
 #include <fcntl.h>
 
diff --git a/src/ccache/core/Manifest.cpp b/src/ccache/core/manifest.cpp
similarity index 98%
rename from src/ccache/core/Manifest.cpp
rename to src/ccache/core/manifest.cpp
index e2b48d2d8..48a5d184c 100644
--- a/src/ccache/core/Manifest.cpp
+++ b/src/ccache/core/manifest.cpp
@@ -16,18 +16,18 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "Manifest.hpp"
+#include "manifest.hpp"
 
-#include <ccache/Context.hpp>
-#include <ccache/Hash.hpp>
-#include <ccache/core/CacheEntryDataReader.hpp>
-#include <ccache/core/CacheEntryDataWriter.hpp>
+#include <ccache/context.hpp>
+#include <ccache/core/cacheentrydatareader.hpp>
+#include <ccache/core/cacheentrydatawriter.hpp>
 #include <ccache/core/exceptions.hpp>
+#include <ccache/hash.hpp>
 #include <ccache/hashutil.hpp>
-#include <ccache/util/XXH3_64.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/logging.hpp>
 #include <ccache/util/string.hpp>
+#include <ccache/util/xxh3_64.hpp>
 
 // Manifest data format
 // ====================
diff --git a/src/ccache/core/Manifest.hpp b/src/ccache/core/manifest.hpp
similarity index 95%
rename from src/ccache/core/Manifest.hpp
rename to src/ccache/core/manifest.hpp
index a46982edd..eae79089a 100644
--- a/src/ccache/core/Manifest.hpp
+++ b/src/ccache/core/manifest.hpp
@@ -18,10 +18,10 @@
 
 #pragma once
 
-#include <ccache/Hash.hpp>
-#include <ccache/core/Serializer.hpp>
-#include <ccache/util/Bytes.hpp>
-#include <ccache/util/TimePoint.hpp>
+#include <ccache/core/serializer.hpp>
+#include <ccache/hash.hpp>
+#include <ccache/util/bytes.hpp>
+#include <ccache/util/timepoint.hpp>
 
 #include <nonstd/span.hpp>
 
diff --git a/src/ccache/core/MsvcShowIncludesOutput.cpp b/src/ccache/core/msvcshowincludesoutput.cpp
similarity index 97%
rename from src/ccache/core/MsvcShowIncludesOutput.cpp
rename to src/ccache/core/msvcshowincludesoutput.cpp
index 7170935b3..9ec01fe44 100644
--- a/src/ccache/core/MsvcShowIncludesOutput.cpp
+++ b/src/ccache/core/msvcshowincludesoutput.cpp
@@ -16,9 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "MsvcShowIncludesOutput.hpp"
+#include "msvcshowincludesoutput.hpp"
 
-#include <ccache/Context.hpp>
+#include <ccache/context.hpp>
 #include <ccache/util/string.hpp>
 
 namespace core::MsvcShowIncludesOutput {
diff --git a/src/ccache/core/MsvcShowIncludesOutput.hpp b/src/ccache/core/msvcshowincludesoutput.hpp
similarity index 97%
rename from src/ccache/core/MsvcShowIncludesOutput.hpp
rename to src/ccache/core/msvcshowincludesoutput.hpp
index ac1cc8a6f..0b7bc08f6 100644
--- a/src/ccache/core/MsvcShowIncludesOutput.hpp
+++ b/src/ccache/core/msvcshowincludesoutput.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/util/Bytes.hpp>
+#include <ccache/util/bytes.hpp>
 
 #include <string_view>
 #include <vector>
diff --git a/src/ccache/core/Result.cpp b/src/ccache/core/result.cpp
similarity index 96%
rename from src/ccache/core/Result.cpp
rename to src/ccache/core/result.cpp
index 7bcb44a59..701c92203 100644
--- a/src/ccache/core/Result.cpp
+++ b/src/ccache/core/result.cpp
@@ -16,20 +16,20 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "Result.hpp"
+#include "result.hpp"
 
-#include <ccache/Config.hpp>
-#include <ccache/Context.hpp>
 #include <ccache/ccache.hpp>
-#include <ccache/core/CacheEntryDataReader.hpp>
-#include <ccache/core/CacheEntryDataWriter.hpp>
-#include <ccache/core/Statistic.hpp>
+#include <ccache/config.hpp>
+#include <ccache/context.hpp>
+#include <ccache/core/cacheentrydatareader.hpp>
+#include <ccache/core/cacheentrydatawriter.hpp>
 #include <ccache/core/exceptions.hpp>
-#include <ccache/util/Bytes.hpp>
-#include <ccache/util/DirEntry.hpp>
-#include <ccache/util/FileStream.hpp>
+#include <ccache/core/statistic.hpp>
+#include <ccache/util/bytes.hpp>
+#include <ccache/util/direntry.hpp>
 #include <ccache/util/expected.hpp>
 #include <ccache/util/file.hpp>
+#include <ccache/util/filestream.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/logging.hpp>
diff --git a/src/ccache/core/Result.hpp b/src/ccache/core/result.hpp
similarity index 98%
rename from src/ccache/core/Result.hpp
rename to src/ccache/core/result.hpp
index 9edc5ec51..6645feb69 100644
--- a/src/ccache/core/Result.hpp
+++ b/src/ccache/core/result.hpp
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include <ccache/core/Serializer.hpp>
-#include <ccache/util/Bytes.hpp>
+#include <ccache/core/serializer.hpp>
+#include <ccache/util/bytes.hpp>
 
 #include <nonstd/span.hpp>
 
diff --git a/src/ccache/core/ResultExtractor.cpp b/src/ccache/core/resultextractor.cpp
similarity index 96%
rename from src/ccache/core/ResultExtractor.cpp
rename to src/ccache/core/resultextractor.cpp
index 18c58d700..339df2190 100644
--- a/src/ccache/core/ResultExtractor.cpp
+++ b/src/ccache/core/resultextractor.cpp
@@ -16,11 +16,11 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "ResultExtractor.hpp"
+#include "resultextractor.hpp"
 
 #include <ccache/core/exceptions.hpp>
-#include <ccache/util/Bytes.hpp>
-#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/bytes.hpp>
+#include <ccache/util/direntry.hpp>
 #include <ccache/util/expected.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/format.hpp>
diff --git a/src/ccache/core/ResultExtractor.hpp b/src/ccache/core/resultextractor.hpp
similarity index 98%
rename from src/ccache/core/ResultExtractor.hpp
rename to src/ccache/core/resultextractor.hpp
index b840ba81e..50af8b9e3 100644
--- a/src/ccache/core/ResultExtractor.hpp
+++ b/src/ccache/core/resultextractor.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/core/Result.hpp>
+#include <ccache/core/result.hpp>
 
 #include <nonstd/span.hpp>
 
diff --git a/src/ccache/core/ResultInspector.cpp b/src/ccache/core/resultinspector.cpp
similarity index 96%
rename from src/ccache/core/ResultInspector.cpp
rename to src/ccache/core/resultinspector.cpp
index aaa816563..62fc6259a 100644
--- a/src/ccache/core/ResultInspector.cpp
+++ b/src/ccache/core/resultinspector.cpp
@@ -16,9 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "ResultInspector.hpp"
+#include "resultinspector.hpp"
 
-#include <ccache/Context.hpp>
+#include <ccache/context.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/logging.hpp>
 
diff --git a/src/ccache/core/ResultInspector.hpp b/src/ccache/core/resultinspector.hpp
similarity index 97%
rename from src/ccache/core/ResultInspector.hpp
rename to src/ccache/core/resultinspector.hpp
index a1b132bcf..49b3368bc 100644
--- a/src/ccache/core/ResultInspector.hpp
+++ b/src/ccache/core/resultinspector.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/core/Result.hpp>
+#include <ccache/core/result.hpp>
 
 #include <nonstd/span.hpp>
 
diff --git a/src/ccache/core/ResultRetriever.cpp b/src/ccache/core/resultretriever.cpp
similarity index 97%
rename from src/ccache/core/ResultRetriever.cpp
rename to src/ccache/core/resultretriever.cpp
index a4954e9fc..9547109c4 100644
--- a/src/ccache/core/ResultRetriever.cpp
+++ b/src/ccache/core/resultretriever.cpp
@@ -16,16 +16,16 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "ResultRetriever.hpp"
+#include "resultretriever.hpp"
 
-#include <ccache/Context.hpp>
-#include <ccache/Depfile.hpp>
-#include <ccache/core/MsvcShowIncludesOutput.hpp>
+#include <ccache/context.hpp>
 #include <ccache/core/common.hpp>
 #include <ccache/core/exceptions.hpp>
-#include <ccache/util/DirEntry.hpp>
-#include <ccache/util/Fd.hpp>
+#include <ccache/core/msvcshowincludesoutput.hpp>
+#include <ccache/depfile.hpp>
+#include <ccache/util/direntry.hpp>
 #include <ccache/util/expected.hpp>
+#include <ccache/util/fd.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/format.hpp>
diff --git a/src/ccache/core/ResultRetriever.hpp b/src/ccache/core/resultretriever.hpp
similarity index 97%
rename from src/ccache/core/ResultRetriever.hpp
rename to src/ccache/core/resultretriever.hpp
index 704ac574e..ab8ee0fbd 100644
--- a/src/ccache/core/ResultRetriever.hpp
+++ b/src/ccache/core/resultretriever.hpp
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <ccache/Hash.hpp>
-#include <ccache/core/Result.hpp>
 #include <ccache/core/exceptions.hpp>
+#include <ccache/core/result.hpp>
+#include <ccache/hash.hpp>
 
 #include <nonstd/span.hpp>
 
diff --git a/src/ccache/core/Serializer.hpp b/src/ccache/core/serializer.hpp
similarity index 97%
rename from src/ccache/core/Serializer.hpp
rename to src/ccache/core/serializer.hpp
index 01b3860d4..d324fdfc5 100644
--- a/src/ccache/core/Serializer.hpp
+++ b/src/ccache/core/serializer.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/util/Bytes.hpp>
+#include <ccache/util/bytes.hpp>
 
 #include <nonstd/span.hpp>
 
diff --git a/src/ccache/core/Sloppiness.hpp b/src/ccache/core/sloppiness.hpp
similarity index 98%
rename from src/ccache/core/Sloppiness.hpp
rename to src/ccache/core/sloppiness.hpp
index 98f0fe4be..b16113786 100644
--- a/src/ccache/core/Sloppiness.hpp
+++ b/src/ccache/core/sloppiness.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/util/BitSet.hpp>
+#include <ccache/util/bitset.hpp>
 
 #include <cstdint>
 #include <string>
diff --git a/src/ccache/core/Statistic.hpp b/src/ccache/core/statistic.hpp
similarity index 100%
rename from src/ccache/core/Statistic.hpp
rename to src/ccache/core/statistic.hpp
diff --git a/src/ccache/core/Statistics.cpp b/src/ccache/core/statistics.cpp
similarity index 99%
rename from src/ccache/core/Statistics.cpp
rename to src/ccache/core/statistics.cpp
index 417d7184d..61951d13c 100644
--- a/src/ccache/core/Statistics.cpp
+++ b/src/ccache/core/statistics.cpp
@@ -16,14 +16,14 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "Statistics.hpp"
+#include "statistics.hpp"
 
-#include <ccache/Config.hpp>
-#include <ccache/util/TextTable.hpp>
+#include <ccache/config.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/logging.hpp>
 #include <ccache/util/path.hpp>
 #include <ccache/util/string.hpp>
+#include <ccache/util/texttable.hpp>
 #include <ccache/util/time.hpp>
 
 #include <algorithm>
diff --git a/src/ccache/core/Statistics.hpp b/src/ccache/core/statistics.hpp
similarity index 95%
rename from src/ccache/core/Statistics.hpp
rename to src/ccache/core/statistics.hpp
index 27d4b3537..33747d085 100644
--- a/src/ccache/core/Statistics.hpp
+++ b/src/ccache/core/statistics.hpp
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <ccache/core/Statistic.hpp>
-#include <ccache/core/StatisticsCounters.hpp>
-#include <ccache/util/TimePoint.hpp>
+#include <ccache/core/statistic.hpp>
+#include <ccache/core/statisticscounters.hpp>
+#include <ccache/util/timepoint.hpp>
 
 #include <cstdint>
 #include <string>
diff --git a/src/ccache/core/StatisticsCounters.cpp b/src/ccache/core/statisticscounters.cpp
similarity index 99%
rename from src/ccache/core/StatisticsCounters.cpp
rename to src/ccache/core/statisticscounters.cpp
index 147efade7..6c49996ae 100644
--- a/src/ccache/core/StatisticsCounters.cpp
+++ b/src/ccache/core/statisticscounters.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "StatisticsCounters.hpp"
+#include "statisticscounters.hpp"
 
 #include <ccache/util/assertions.hpp>
 
diff --git a/src/ccache/core/StatisticsCounters.hpp b/src/ccache/core/statisticscounters.hpp
similarity index 95%
rename from src/ccache/core/StatisticsCounters.hpp
rename to src/ccache/core/statisticscounters.hpp
index d886073e7..8e6e90dfc 100644
--- a/src/ccache/core/StatisticsCounters.hpp
+++ b/src/ccache/core/statisticscounters.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2010-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "Statistic.hpp"
+#include <ccache/core/statistic.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/src/ccache/core/StatsLog.cpp b/src/ccache/core/statslog.cpp
similarity index 95%
rename from src/ccache/core/StatsLog.cpp
rename to src/ccache/core/statslog.cpp
index 31862155b..6661bc9ae 100644
--- a/src/ccache/core/StatsLog.cpp
+++ b/src/ccache/core/statslog.cpp
@@ -16,10 +16,10 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "StatsLog.hpp"
+#include "statslog.hpp"
 
-#include <ccache/core/Statistics.hpp>
-#include <ccache/util/FileStream.hpp>
+#include <ccache/core/statistics.hpp>
+#include <ccache/util/filestream.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/logging.hpp>
diff --git a/src/ccache/core/StatsLog.hpp b/src/ccache/core/statslog.hpp
similarity index 96%
rename from src/ccache/core/StatsLog.hpp
rename to src/ccache/core/statslog.hpp
index f85652e67..7d849f255 100644
--- a/src/ccache/core/StatsLog.hpp
+++ b/src/ccache/core/statslog.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "StatisticsCounters.hpp"
+#include <ccache/core/statisticscounters.hpp>
 
 #include <filesystem>
 #include <string>
diff --git a/src/ccache/core/types.cpp b/src/ccache/core/types.cpp
index 3a49b3f7c..3333a7958 100644
--- a/src/ccache/core/types.cpp
+++ b/src/ccache/core/types.cpp
@@ -18,7 +18,7 @@
 
 #include "types.hpp"
 
-#include <ccache/Config.hpp>
+#include <ccache/config.hpp>
 #include <ccache/core/exceptions.hpp>
 #include <ccache/util/assertions.hpp>
 #include <ccache/util/format.hpp>
diff --git a/src/ccache/Depfile.cpp b/src/ccache/depfile.cpp
similarity index 98%
rename from src/ccache/Depfile.cpp
rename to src/ccache/depfile.cpp
index 6018bdc00..5ebf23228 100644
--- a/src/ccache/Depfile.cpp
+++ b/src/ccache/depfile.cpp
@@ -16,13 +16,12 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "Depfile.hpp"
+#include "depfile.hpp"
 
-#include <ccache/Context.hpp>
-#include <ccache/Hash.hpp>
+#include <ccache/context.hpp>
 #include <ccache/core/common.hpp>
 #include <ccache/core/exceptions.hpp>
-#include <ccache/util/Tokenizer.hpp>
+#include <ccache/hash.hpp>
 #include <ccache/util/assertions.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
@@ -30,6 +29,7 @@
 #include <ccache/util/logging.hpp>
 #include <ccache/util/path.hpp>
 #include <ccache/util/string.hpp>
+#include <ccache/util/tokenizer.hpp>
 
 #include <algorithm>
 
diff --git a/src/ccache/Depfile.hpp b/src/ccache/depfile.hpp
similarity index 100%
rename from src/ccache/Depfile.hpp
rename to src/ccache/depfile.hpp
diff --git a/src/ccache/execute.cpp b/src/ccache/execute.cpp
index cb4d2cc71..aadf4e232 100644
--- a/src/ccache/execute.cpp
+++ b/src/ccache/execute.cpp
@@ -19,23 +19,23 @@
 
 #include "execute.hpp"
 
-#include <ccache/Config.hpp>
-#include <ccache/Context.hpp>
-#include <ccache/SignalHandler.hpp>
 #include <ccache/ccache.hpp>
+#include <ccache/config.hpp>
+#include <ccache/context.hpp>
 #include <ccache/core/exceptions.hpp>
-#include <ccache/util/DirEntry.hpp>
-#include <ccache/util/Fd.hpp>
-#include <ccache/util/Finalizer.hpp>
-#include <ccache/util/TemporaryFile.hpp>
+#include <ccache/signalhandler.hpp>
+#include <ccache/util/direntry.hpp>
 #include <ccache/util/error.hpp>
 #include <ccache/util/expected.hpp>
+#include <ccache/util/fd.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
+#include <ccache/util/finalizer.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/logging.hpp>
 #include <ccache/util/path.hpp>
 #include <ccache/util/string.hpp>
+#include <ccache/util/temporaryfile.hpp>
 #include <ccache/util/wincompat.hpp>
 
 #include <vector>
diff --git a/src/ccache/execute.hpp b/src/ccache/execute.hpp
index 7d184c8a7..a3ef9c59c 100644
--- a/src/ccache/execute.hpp
+++ b/src/ccache/execute.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/util/Fd.hpp>
+#include <ccache/util/fd.hpp>
 
 #include <filesystem>
 #include <optional>
diff --git a/src/ccache/Hash.cpp b/src/ccache/hash.cpp
similarity index 98%
rename from src/ccache/Hash.cpp
rename to src/ccache/hash.cpp
index 45320d1c1..6aac5d3d5 100644
--- a/src/ccache/Hash.cpp
+++ b/src/ccache/hash.cpp
@@ -16,9 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "Hash.hpp"
+#include "hash.hpp"
 
-#include <ccache/util/Fd.hpp>
+#include <ccache/util/fd.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/logging.hpp>
diff --git a/src/ccache/Hash.hpp b/src/ccache/hash.hpp
similarity index 100%
rename from src/ccache/Hash.hpp
rename to src/ccache/hash.hpp
diff --git a/src/ccache/hashutil.cpp b/src/ccache/hashutil.cpp
index 8878031f8..ead335be6 100644
--- a/src/ccache/hashutil.cpp
+++ b/src/ccache/hashutil.cpp
@@ -18,14 +18,14 @@
 
 #include "hashutil.hpp"
 
-#include <ccache/Args.hpp>
-#include <ccache/Config.hpp>
-#include <ccache/Context.hpp>
+#include <ccache/args.hpp>
+#include <ccache/config.hpp>
+#include <ccache/context.hpp>
 #include <ccache/core/exceptions.hpp>
 #include <ccache/execute.hpp>
 #include <ccache/macroskip.hpp>
-#include <ccache/util/DirEntry.hpp>
 #include <ccache/util/cpu.hpp>
+#include <ccache/util/direntry.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/format.hpp>
@@ -36,7 +36,7 @@
 #include <ccache/util/wincompat.hpp>
 
 #ifdef INODE_CACHE_SUPPORTED
-#  include "InodeCache.hpp"
+#  include <ccache/inodecache.hpp>
 #endif
 
 #ifdef HAVE_SPAWN_H
diff --git a/src/ccache/hashutil.hpp b/src/ccache/hashutil.hpp
index 127760cc4..c59652ea3 100644
--- a/src/ccache/hashutil.hpp
+++ b/src/ccache/hashutil.hpp
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include <ccache/Hash.hpp>
-#include <ccache/util/BitSet.hpp>
+#include <ccache/hash.hpp>
+#include <ccache/util/bitset.hpp>
 
 #include <cstddef>
 #include <filesystem>
diff --git a/src/ccache/InodeCache.cpp b/src/ccache/inodecache.cpp
similarity index 98%
rename from src/ccache/InodeCache.cpp
rename to src/ccache/inodecache.cpp
index 159fcdf6d..21c925752 100644
--- a/src/ccache/InodeCache.cpp
+++ b/src/ccache/inodecache.cpp
@@ -16,20 +16,20 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "InodeCache.hpp"
-
-#include <ccache/Config.hpp>
-#include <ccache/Hash.hpp>
-#include <ccache/util/DirEntry.hpp>
-#include <ccache/util/Fd.hpp>
-#include <ccache/util/Finalizer.hpp>
-#include <ccache/util/TemporaryFile.hpp>
+#include "inodecache.hpp"
+
+#include <ccache/config.hpp>
+#include <ccache/hash.hpp>
 #include <ccache/util/conversion.hpp>
+#include <ccache/util/direntry.hpp>
+#include <ccache/util/fd.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
+#include <ccache/util/finalizer.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/logging.hpp>
 #include <ccache/util/path.hpp>
+#include <ccache/util/temporaryfile.hpp>
 
 #include <fcntl.h>
 
diff --git a/src/ccache/InodeCache.hpp b/src/ccache/inodecache.hpp
similarity index 96%
rename from src/ccache/InodeCache.hpp
rename to src/ccache/inodecache.hpp
index c4478b735..d2a05b721 100644
--- a/src/ccache/InodeCache.hpp
+++ b/src/ccache/inodecache.hpp
@@ -18,12 +18,12 @@
 
 #pragma once
 
-#include <ccache/Hash.hpp>
+#include <ccache/hash.hpp>
 #include <ccache/hashutil.hpp>
-#include <ccache/util/Duration.hpp>
-#include <ccache/util/Fd.hpp>
-#include <ccache/util/MemoryMap.hpp>
-#include <ccache/util/TimePoint.hpp>
+#include <ccache/util/duration.hpp>
+#include <ccache/util/fd.hpp>
+#include <ccache/util/memorymap.hpp>
+#include <ccache/util/timepoint.hpp>
 
 #include <sys/types.h>
 
diff --git a/src/ccache/language.hpp b/src/ccache/language.hpp
index c58f1aa2f..ec9f4d3cc 100644
--- a/src/ccache/language.hpp
+++ b/src/ccache/language.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/Config.hpp>
+#include <ccache/config.hpp>
 
 #include <filesystem>
 #include <string>
diff --git a/src/ccache/ProgressBar.cpp b/src/ccache/progressbar.cpp
similarity index 99%
rename from src/ccache/ProgressBar.cpp
rename to src/ccache/progressbar.cpp
index 428275cf8..8e65f21e9 100644
--- a/src/ccache/ProgressBar.cpp
+++ b/src/ccache/progressbar.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "ProgressBar.hpp"
+#include "progressbar.hpp"
 
 #include <ccache/util/assertions.hpp>
 #include <ccache/util/format.hpp>
diff --git a/src/ccache/ProgressBar.hpp b/src/ccache/progressbar.hpp
similarity index 100%
rename from src/ccache/ProgressBar.hpp
rename to src/ccache/progressbar.hpp
diff --git a/src/ccache/SignalHandler.cpp b/src/ccache/signalhandler.cpp
similarity index 98%
rename from src/ccache/SignalHandler.cpp
rename to src/ccache/signalhandler.cpp
index 37c966777..acb405796 100644
--- a/src/ccache/SignalHandler.cpp
+++ b/src/ccache/signalhandler.cpp
@@ -16,9 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "SignalHandler.hpp"
+#include "signalhandler.hpp"
 
-#include <ccache/Context.hpp>
+#include <ccache/context.hpp>
 #include <ccache/util/assertions.hpp>
 
 #include <signal.h> // NOLINT: sigaddset et al are defined in signal.h
diff --git a/src/ccache/SignalHandler.hpp b/src/ccache/signalhandler.hpp
similarity index 100%
rename from src/ccache/SignalHandler.hpp
rename to src/ccache/signalhandler.hpp
diff --git a/src/ccache/storage/CMakeLists.txt b/src/ccache/storage/CMakeLists.txt
index 907d16fdc..ba9e07593 100644
--- a/src/ccache/storage/CMakeLists.txt
+++ b/src/ccache/storage/CMakeLists.txt
@@ -3,7 +3,7 @@ add_subdirectory(remote)
 
 set(
   sources
-  Storage.cpp
+  storage.cpp
 )
 
 file(GLOB headers *.hpp)
diff --git a/src/ccache/storage/local/CMakeLists.txt b/src/ccache/storage/local/CMakeLists.txt
index 01e008602..1f4a8d1fe 100644
--- a/src/ccache/storage/local/CMakeLists.txt
+++ b/src/ccache/storage/local/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(
   sources
-  LocalStorage.cpp
-  StatsFile.cpp
+  localstorage.cpp
+  statsfile.cpp
   util.cpp
 )
 
diff --git a/src/ccache/storage/local/LocalStorage.cpp b/src/ccache/storage/local/localstorage.cpp
similarity index 98%
rename from src/ccache/storage/local/LocalStorage.cpp
rename to src/ccache/storage/local/localstorage.cpp
index b84499e4e..039fd115a 100644
--- a/src/ccache/storage/local/LocalStorage.cpp
+++ b/src/ccache/storage/local/localstorage.cpp
@@ -16,36 +16,36 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "LocalStorage.hpp"
-
-#include <ccache/Config.hpp>
-#include <ccache/Context.hpp>
-#include <ccache/core/AtomicFile.hpp>
-#include <ccache/core/CacheEntry.hpp>
-#include <ccache/core/FileRecompressor.hpp>
-#include <ccache/core/Manifest.hpp>
-#include <ccache/core/Statistics.hpp>
+#include "localstorage.hpp"
+
+#include <ccache/config.hpp>
+#include <ccache/context.hpp>
+#include <ccache/core/atomicfile.hpp>
+#include <ccache/core/cacheentry.hpp>
 #include <ccache/core/common.hpp>
 #include <ccache/core/exceptions.hpp>
-#include <ccache/util/Duration.hpp>
-#include <ccache/util/FileStream.hpp>
-#include <ccache/util/PathString.hpp>
-#include <ccache/util/TemporaryFile.hpp>
-#include <ccache/util/TextTable.hpp>
-#include <ccache/util/ThreadPool.hpp>
+#include <ccache/core/filerecompressor.hpp>
+#include <ccache/core/manifest.hpp>
+#include <ccache/core/statistics.hpp>
 #include <ccache/util/assertions.hpp>
+#include <ccache/util/duration.hpp>
 #include <ccache/util/expected.hpp>
 #include <ccache/util/file.hpp>
+#include <ccache/util/filestream.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/logging.hpp>
 #include <ccache/util/path.hpp>
+#include <ccache/util/pathstring.hpp>
 #include <ccache/util/process.hpp>
 #include <ccache/util/string.hpp>
+#include <ccache/util/temporaryfile.hpp>
+#include <ccache/util/texttable.hpp>
+#include <ccache/util/threadpool.hpp>
 #include <ccache/util/wincompat.hpp>
 
 #ifdef INODE_CACHE_SUPPORTED
-#  include <ccache/InodeCache.hpp>
+#  include <ccache/inodecache.hpp>
 #endif
 
 #include <fcntl.h>
diff --git a/src/ccache/storage/local/LocalStorage.hpp b/src/ccache/storage/local/localstorage.hpp
similarity index 95%
rename from src/ccache/storage/local/LocalStorage.hpp
rename to src/ccache/storage/local/localstorage.hpp
index 03677076e..71b17912e 100644
--- a/src/ccache/storage/local/LocalStorage.hpp
+++ b/src/ccache/storage/local/localstorage.hpp
@@ -18,18 +18,18 @@
 
 #pragma once
 
-#include <ccache/Hash.hpp>
-#include <ccache/core/Result.hpp>
-#include <ccache/core/Statistic.hpp>
-#include <ccache/core/StatisticsCounters.hpp>
+#include <ccache/core/result.hpp>
+#include <ccache/core/statistic.hpp>
+#include <ccache/core/statisticscounters.hpp>
 #include <ccache/core/types.hpp>
-#include <ccache/storage/local/StatsFile.hpp>
+#include <ccache/hash.hpp>
+#include <ccache/storage/local/statsfile.hpp>
 #include <ccache/storage/local/util.hpp>
-#include <ccache/util/Bytes.hpp>
-#include <ccache/util/DirEntry.hpp>
-#include <ccache/util/LockFile.hpp>
-#include <ccache/util/LongLivedLockFileManager.hpp>
-#include <ccache/util/TimePoint.hpp>
+#include <ccache/util/bytes.hpp>
+#include <ccache/util/direntry.hpp>
+#include <ccache/util/lockfile.hpp>
+#include <ccache/util/longlivedlockfilemanager.hpp>
+#include <ccache/util/timepoint.hpp>
 
 #include <nonstd/span.hpp>
 
diff --git a/src/ccache/storage/local/StatsFile.cpp b/src/ccache/storage/local/statsfile.cpp
similarity index 96%
rename from src/ccache/storage/local/StatsFile.cpp
rename to src/ccache/storage/local/statsfile.cpp
index 9b5f54e04..c60869df8 100644
--- a/src/ccache/storage/local/StatsFile.cpp
+++ b/src/ccache/storage/local/statsfile.cpp
@@ -16,13 +16,13 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "StatsFile.hpp"
+#include "statsfile.hpp"
 
-#include <ccache/core/AtomicFile.hpp>
+#include <ccache/core/atomicfile.hpp>
 #include <ccache/core/exceptions.hpp>
-#include <ccache/util/LockFile.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/format.hpp>
+#include <ccache/util/lockfile.hpp>
 #include <ccache/util/logging.hpp>
 
 namespace storage::local {
diff --git a/src/ccache/storage/local/StatsFile.hpp b/src/ccache/storage/local/statsfile.hpp
similarity index 97%
rename from src/ccache/storage/local/StatsFile.hpp
rename to src/ccache/storage/local/statsfile.hpp
index c9d392226..36df4b841 100644
--- a/src/ccache/storage/local/StatsFile.hpp
+++ b/src/ccache/storage/local/statsfile.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/core/StatisticsCounters.hpp>
+#include <ccache/core/statisticscounters.hpp>
 
 #include <functional>
 #include <optional>
diff --git a/src/ccache/storage/local/util.hpp b/src/ccache/storage/local/util.hpp
index 71e432d3b..317c7be15 100644
--- a/src/ccache/storage/local/util.hpp
+++ b/src/ccache/storage/local/util.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/direntry.hpp>
 
 #include <functional>
 #include <string>
diff --git a/src/ccache/storage/remote/CMakeLists.txt b/src/ccache/storage/remote/CMakeLists.txt
index 96dbebb0b..68c9f12de 100644
--- a/src/ccache/storage/remote/CMakeLists.txt
+++ b/src/ccache/storage/remote/CMakeLists.txt
@@ -1,12 +1,12 @@
 set(
   sources
-  FileStorage.cpp
-  HttpStorage.cpp
-  RemoteStorage.cpp
+  filestorage.cpp
+  httpstorage.cpp
+  remotestorage.cpp
 )
 
 if(REDIS_STORAGE_BACKEND)
-  list(APPEND sources RedisStorage.cpp)
+  list(APPEND sources redisstorage.cpp)
 endif()
 
 file(GLOB headers *.hpp)
diff --git a/src/ccache/storage/remote/FileStorage.cpp b/src/ccache/storage/remote/filestorage.cpp
similarity index 97%
rename from src/ccache/storage/remote/FileStorage.cpp
rename to src/ccache/storage/remote/filestorage.cpp
index b7a6375f5..643e718be 100644
--- a/src/ccache/storage/remote/FileStorage.cpp
+++ b/src/ccache/storage/remote/filestorage.cpp
@@ -16,20 +16,20 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "FileStorage.hpp"
+#include "filestorage.hpp"
 
-#include <ccache/core/AtomicFile.hpp>
+#include <ccache/core/atomicfile.hpp>
 #include <ccache/core/exceptions.hpp>
-#include <ccache/util/Bytes.hpp>
-#include <ccache/util/DirEntry.hpp>
-#include <ccache/util/UmaskScope.hpp>
 #include <ccache/util/assertions.hpp>
+#include <ccache/util/bytes.hpp>
+#include <ccache/util/direntry.hpp>
 #include <ccache/util/expected.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/logging.hpp>
 #include <ccache/util/string.hpp>
+#include <ccache/util/umaskscope.hpp>
 
 #include <sys/stat.h> // for mode_t
 
diff --git a/src/ccache/storage/remote/FileStorage.hpp b/src/ccache/storage/remote/filestorage.hpp
similarity index 95%
rename from src/ccache/storage/remote/FileStorage.hpp
rename to src/ccache/storage/remote/filestorage.hpp
index a5d067f21..1c94c0a43 100644
--- a/src/ccache/storage/remote/FileStorage.hpp
+++ b/src/ccache/storage/remote/filestorage.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/storage/remote/RemoteStorage.hpp>
+#include <ccache/storage/remote/remotestorage.hpp>
 
 #include <cxxurl/url.hpp>
 
diff --git a/src/ccache/storage/remote/HttpStorage.cpp b/src/ccache/storage/remote/httpstorage.cpp
similarity index 99%
rename from src/ccache/storage/remote/HttpStorage.cpp
rename to src/ccache/storage/remote/httpstorage.cpp
index 37221dec9..d71cf5cf1 100644
--- a/src/ccache/storage/remote/HttpStorage.cpp
+++ b/src/ccache/storage/remote/httpstorage.cpp
@@ -16,12 +16,12 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "HttpStorage.hpp"
+#include "httpstorage.hpp"
 
-#include <ccache/Hash.hpp>
 #include <ccache/ccache.hpp>
 #include <ccache/core/exceptions.hpp>
-#include <ccache/storage/Storage.hpp>
+#include <ccache/hash.hpp>
+#include <ccache/storage/storage.hpp>
 #include <ccache/util/assertions.hpp>
 #include <ccache/util/expected.hpp>
 #include <ccache/util/format.hpp>
diff --git a/src/ccache/storage/remote/HttpStorage.hpp b/src/ccache/storage/remote/httpstorage.hpp
similarity index 96%
rename from src/ccache/storage/remote/HttpStorage.hpp
rename to src/ccache/storage/remote/httpstorage.hpp
index f7213b09d..e0bb78886 100644
--- a/src/ccache/storage/remote/HttpStorage.hpp
+++ b/src/ccache/storage/remote/httpstorage.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/storage/remote/RemoteStorage.hpp>
+#include <ccache/storage/remote/remotestorage.hpp>
 
 #include <cxxurl/url.hpp>
 
diff --git a/src/ccache/storage/remote/RedisStorage.cpp b/src/ccache/storage/remote/redisstorage.cpp
similarity index 99%
rename from src/ccache/storage/remote/RedisStorage.cpp
rename to src/ccache/storage/remote/redisstorage.cpp
index 11870277b..a199a26b2 100644
--- a/src/ccache/storage/remote/RedisStorage.cpp
+++ b/src/ccache/storage/remote/redisstorage.cpp
@@ -16,11 +16,11 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "RedisStorage.hpp"
+#include "redisstorage.hpp"
 
-#include <ccache/Hash.hpp>
 #include <ccache/core/exceptions.hpp>
-#include <ccache/storage/Storage.hpp>
+#include <ccache/hash.hpp>
+#include <ccache/storage/storage.hpp>
 #include <ccache/util/assertions.hpp>
 #include <ccache/util/expected.hpp>
 #include <ccache/util/format.hpp>
diff --git a/src/ccache/storage/remote/RedisStorage.hpp b/src/ccache/storage/remote/redisstorage.hpp
similarity index 95%
rename from src/ccache/storage/remote/RedisStorage.hpp
rename to src/ccache/storage/remote/redisstorage.hpp
index 9c16bcfd2..e8d3a8b52 100644
--- a/src/ccache/storage/remote/RedisStorage.hpp
+++ b/src/ccache/storage/remote/redisstorage.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/storage/remote/RemoteStorage.hpp>
+#include <ccache/storage/remote/remotestorage.hpp>
 
 #include <cxxurl/url.hpp>
 
diff --git a/src/ccache/storage/remote/RemoteStorage.cpp b/src/ccache/storage/remote/remotestorage.cpp
similarity index 97%
rename from src/ccache/storage/remote/RemoteStorage.cpp
rename to src/ccache/storage/remote/remotestorage.cpp
index ca0703fa8..8da178785 100644
--- a/src/ccache/storage/remote/RemoteStorage.cpp
+++ b/src/ccache/storage/remote/remotestorage.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "RemoteStorage.hpp"
+#include "remotestorage.hpp"
 
 #include <ccache/util/expected.hpp>
 #include <ccache/util/string.hpp>
diff --git a/src/ccache/storage/remote/RemoteStorage.hpp b/src/ccache/storage/remote/remotestorage.hpp
similarity index 98%
rename from src/ccache/storage/remote/RemoteStorage.hpp
rename to src/ccache/storage/remote/remotestorage.hpp
index afa8f96b4..c47cb53c8 100644
--- a/src/ccache/storage/remote/RemoteStorage.hpp
+++ b/src/ccache/storage/remote/remotestorage.hpp
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include <ccache/Hash.hpp>
-#include <ccache/util/Bytes.hpp>
+#include <ccache/hash.hpp>
+#include <ccache/util/bytes.hpp>
 
 #include <cxxurl/url.hpp>
 #include <nonstd/span.hpp>
diff --git a/src/ccache/storage/Storage.cpp b/src/ccache/storage/storage.cpp
similarity index 97%
rename from src/ccache/storage/Storage.cpp
rename to src/ccache/storage/storage.cpp
index dc8cf00c7..f4fecc459 100644
--- a/src/ccache/storage/Storage.cpp
+++ b/src/ccache/storage/storage.cpp
@@ -16,27 +16,27 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "Storage.hpp"
+#include "storage.hpp"
 
-#include <ccache/Config.hpp>
-#include <ccache/core/CacheEntry.hpp>
-#include <ccache/core/Statistic.hpp>
+#include <ccache/config.hpp>
+#include <ccache/core/cacheentry.hpp>
 #include <ccache/core/exceptions.hpp>
-#include <ccache/storage/remote/FileStorage.hpp>
-#include <ccache/storage/remote/HttpStorage.hpp>
+#include <ccache/core/statistic.hpp>
+#include <ccache/storage/remote/filestorage.hpp>
+#include <ccache/storage/remote/httpstorage.hpp>
 #ifdef HAVE_REDIS_STORAGE_BACKEND
-#  include <ccache/storage/remote/RedisStorage.hpp>
+#  include <ccache/storage/remote/redisstorage.hpp>
 #endif
-#include <ccache/util/Bytes.hpp>
-#include <ccache/util/Timer.hpp>
-#include <ccache/util/Tokenizer.hpp>
-#include <ccache/util/XXH3_64.hpp>
 #include <ccache/util/assertions.hpp>
+#include <ccache/util/bytes.hpp>
 #include <ccache/util/expected.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/logging.hpp>
 #include <ccache/util/string.hpp>
+#include <ccache/util/timer.hpp>
+#include <ccache/util/tokenizer.hpp>
+#include <ccache/util/xxh3_64.hpp>
 
 #include <cxxurl/url.hpp>
 
diff --git a/src/ccache/storage/Storage.hpp b/src/ccache/storage/storage.hpp
similarity index 94%
rename from src/ccache/storage/Storage.hpp
rename to src/ccache/storage/storage.hpp
index 49733e990..a0c5a9712 100644
--- a/src/ccache/storage/Storage.hpp
+++ b/src/ccache/storage/storage.hpp
@@ -18,11 +18,11 @@
 
 #pragma once
 
-#include <ccache/Hash.hpp>
 #include <ccache/core/types.hpp>
-#include <ccache/storage/local/LocalStorage.hpp>
-#include <ccache/storage/remote/RemoteStorage.hpp>
-#include <ccache/util/Bytes.hpp>
+#include <ccache/hash.hpp>
+#include <ccache/storage/local/localstorage.hpp>
+#include <ccache/storage/remote/remotestorage.hpp>
+#include <ccache/util/bytes.hpp>
 
 #include <nonstd/span.hpp>
 
diff --git a/src/ccache/test_lockfile.cpp b/src/ccache/test_lockfile.cpp
index ee7941939..904ba0113 100644
--- a/src/ccache/test_lockfile.cpp
+++ b/src/ccache/test_lockfile.cpp
@@ -16,11 +16,11 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <ccache/Config.hpp>
-#include <ccache/util/LockFile.hpp>
-#include <ccache/util/LongLivedLockFileManager.hpp>
+#include <ccache/config.hpp>
 #include <ccache/util/format.hpp>
+#include <ccache/util/lockfile.hpp>
 #include <ccache/util/logging.hpp>
+#include <ccache/util/longlivedlockfilemanager.hpp>
 #include <ccache/util/string.hpp>
 
 #include <memory>
diff --git a/src/ccache/util/CMakeLists.txt b/src/ccache/util/CMakeLists.txt
index 085494910..4983bedcd 100644
--- a/src/ccache/util/CMakeLists.txt
+++ b/src/ccache/util/CMakeLists.txt
@@ -1,27 +1,27 @@
 set(
   sources
-  Bytes.cpp
-  DirEntry.cpp
-  LockFile.cpp
-  LongLivedLockFileManager.cpp
-  MemoryMap.cpp
-  TemporaryFile.cpp
-  TextTable.cpp
-  ThreadPool.cpp
-  TimePoint.cpp
-  Tokenizer.cpp
-  UmaskScope.cpp
   assertions.cpp
+  bytes.cpp
   cpu.cpp
+  direntry.cpp
   environment.cpp
   error.cpp
   file.cpp
   filesystem.cpp
+  lockfile.cpp
   logging.cpp
+  longlivedlockfilemanager.cpp
+  memorymap.cpp
   path.cpp
   process.cpp
   string.cpp
+  temporaryfile.cpp
+  texttable.cpp
+  threadpool.cpp
   time.cpp
+  timepoint.cpp
+  tokenizer.cpp
+  umaskscope.cpp
   zstd.cpp
 )
 
diff --git a/src/ccache/util/BitSet.hpp b/src/ccache/util/bitset.hpp
similarity index 100%
rename from src/ccache/util/BitSet.hpp
rename to src/ccache/util/bitset.hpp
diff --git a/src/ccache/util/Bytes.cpp b/src/ccache/util/bytes.cpp
similarity index 99%
rename from src/ccache/util/Bytes.cpp
rename to src/ccache/util/bytes.cpp
index aedf9ce1b..795bd2fa0 100644
--- a/src/ccache/util/Bytes.cpp
+++ b/src/ccache/util/bytes.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "Bytes.hpp"
+#include "bytes.hpp"
 
 #include <ccache/util/assertions.hpp>
 
diff --git a/src/ccache/util/Bytes.hpp b/src/ccache/util/bytes.hpp
similarity index 100%
rename from src/ccache/util/Bytes.hpp
rename to src/ccache/util/bytes.hpp
diff --git a/src/ccache/util/conversion.hpp b/src/ccache/util/conversion.hpp
index e755cc466..276f36e80 100644
--- a/src/ccache/util/conversion.hpp
+++ b/src/ccache/util/conversion.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/util/Bytes.hpp>
+#include <ccache/util/bytes.hpp>
 
 #include <nonstd/span.hpp>
 
diff --git a/src/ccache/util/DirEntry.cpp b/src/ccache/util/direntry.cpp
similarity index 98%
rename from src/ccache/util/DirEntry.cpp
rename to src/ccache/util/direntry.cpp
index 873a5e022..ed11c64c5 100644
--- a/src/ccache/util/DirEntry.cpp
+++ b/src/ccache/util/direntry.cpp
@@ -16,13 +16,13 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "DirEntry.hpp"
+#include "direntry.hpp"
 
-#include <ccache/util/Finalizer.hpp>
-#include <ccache/util/PathString.hpp>
 #include <ccache/util/file.hpp>
+#include <ccache/util/finalizer.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/logging.hpp>
+#include <ccache/util/pathstring.hpp>
 #include <ccache/util/wincompat.hpp>
 
 #ifdef _WIN32
diff --git a/src/ccache/util/DirEntry.hpp b/src/ccache/util/direntry.hpp
similarity index 99%
rename from src/ccache/util/DirEntry.hpp
rename to src/ccache/util/direntry.hpp
index 5f43cb1e0..62a7fffa0 100644
--- a/src/ccache/util/DirEntry.hpp
+++ b/src/ccache/util/direntry.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/util/TimePoint.hpp>
+#include <ccache/util/timepoint.hpp>
 #include <ccache/util/wincompat.hpp>
 
 #include <sys/stat.h>
diff --git a/src/ccache/util/Duration.hpp b/src/ccache/util/duration.hpp
similarity index 100%
rename from src/ccache/util/Duration.hpp
rename to src/ccache/util/duration.hpp
diff --git a/src/ccache/util/Fd.hpp b/src/ccache/util/fd.hpp
similarity index 98%
rename from src/ccache/util/Fd.hpp
rename to src/ccache/util/fd.hpp
index 9859f243d..b7a3b3e99 100644
--- a/src/ccache/util/Fd.hpp
+++ b/src/ccache/util/fd.hpp
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include <ccache/util/NonCopyable.hpp>
 #include <ccache/util/assertions.hpp>
+#include <ccache/util/noncopyable.hpp>
 #include <ccache/util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H
diff --git a/src/ccache/util/file.cpp b/src/ccache/util/file.cpp
index 90aa54cb7..ab5617d6b 100644
--- a/src/ccache/util/file.cpp
+++ b/src/ccache/util/file.cpp
@@ -18,19 +18,19 @@
 
 #include "file.hpp"
 
-#include <ccache/util/Bytes.hpp>
-#include <ccache/util/DirEntry.hpp>
-#include <ccache/util/Fd.hpp>
-#include <ccache/util/Finalizer.hpp>
-#include <ccache/util/PathString.hpp>
-#include <ccache/util/TemporaryFile.hpp>
+#include <ccache/util/bytes.hpp>
+#include <ccache/util/direntry.hpp>
 #include <ccache/util/error.hpp>
 #include <ccache/util/expected.hpp>
+#include <ccache/util/fd.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
+#include <ccache/util/finalizer.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/logging.hpp>
 #include <ccache/util/path.hpp>
+#include <ccache/util/pathstring.hpp>
+#include <ccache/util/temporaryfile.hpp>
 
 #ifdef __APPLE__
 #  include <copyfile.h>
diff --git a/src/ccache/util/file.hpp b/src/ccache/util/file.hpp
index 4707f4f58..40c4031d7 100644
--- a/src/ccache/util/file.hpp
+++ b/src/ccache/util/file.hpp
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <ccache/util/Bytes.hpp>
-#include <ccache/util/DirEntry.hpp>
-#include <ccache/util/TimePoint.hpp>
+#include <ccache/util/bytes.hpp>
+#include <ccache/util/direntry.hpp>
+#include <ccache/util/timepoint.hpp>
 #include <ccache/util/types.hpp>
 
 #include <nonstd/span.hpp>
diff --git a/src/ccache/util/FileStream.hpp b/src/ccache/util/filestream.hpp
similarity index 98%
rename from src/ccache/util/FileStream.hpp
rename to src/ccache/util/filestream.hpp
index 8045472f2..cddf0ccd1 100644
--- a/src/ccache/util/FileStream.hpp
+++ b/src/ccache/util/filestream.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/util/NonCopyable.hpp>
+#include <ccache/util/noncopyable.hpp>
 #include <ccache/util/path.hpp>
 
 #include <cstdio>
diff --git a/src/ccache/util/Finalizer.hpp b/src/ccache/util/finalizer.hpp
similarity index 100%
rename from src/ccache/util/Finalizer.hpp
rename to src/ccache/util/finalizer.hpp
diff --git a/src/ccache/util/LockFile.cpp b/src/ccache/util/lockfile.cpp
similarity index 99%
rename from src/ccache/util/LockFile.cpp
rename to src/ccache/util/lockfile.cpp
index 6d7e297d3..37afa1565 100644
--- a/src/ccache/util/LockFile.cpp
+++ b/src/ccache/util/lockfile.cpp
@@ -16,10 +16,10 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "LockFile.hpp"
+#include "lockfile.hpp"
 
-#include <ccache/util/DirEntry.hpp>
 #include <ccache/util/assertions.hpp>
+#include <ccache/util/direntry.hpp>
 #include <ccache/util/error.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
diff --git a/src/ccache/util/LockFile.hpp b/src/ccache/util/lockfile.hpp
similarity index 94%
rename from src/ccache/util/LockFile.hpp
rename to src/ccache/util/lockfile.hpp
index 95b984054..243b18b91 100644
--- a/src/ccache/util/LockFile.hpp
+++ b/src/ccache/util/lockfile.hpp
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <ccache/util/LongLivedLockFileManager.hpp>
-#include <ccache/util/NonCopyable.hpp>
-#include <ccache/util/TimePoint.hpp>
+#include <ccache/util/longlivedlockfilemanager.hpp>
+#include <ccache/util/noncopyable.hpp>
+#include <ccache/util/timepoint.hpp>
 
 #include <filesystem>
 #include <optional>
diff --git a/src/ccache/util/logging.cpp b/src/ccache/util/logging.cpp
index d032d831f..2115dfea0 100644
--- a/src/ccache/util/logging.cpp
+++ b/src/ccache/util/logging.cpp
@@ -17,9 +17,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <ccache/Config.hpp>
-#include <ccache/util/FileStream.hpp>
+#include <ccache/config.hpp>
 #include <ccache/util/file.hpp>
+#include <ccache/util/filestream.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/logging.hpp>
diff --git a/src/ccache/util/LongLivedLockFileManager.cpp b/src/ccache/util/longlivedlockfilemanager.cpp
similarity index 98%
rename from src/ccache/util/LongLivedLockFileManager.cpp
rename to src/ccache/util/longlivedlockfilemanager.cpp
index e0122eb60..73bba56a4 100644
--- a/src/ccache/util/LongLivedLockFileManager.cpp
+++ b/src/ccache/util/longlivedlockfilemanager.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "LongLivedLockFileManager.hpp"
+#include "longlivedlockfilemanager.hpp"
 
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
diff --git a/src/ccache/util/LongLivedLockFileManager.hpp b/src/ccache/util/longlivedlockfilemanager.hpp
similarity index 97%
rename from src/ccache/util/LongLivedLockFileManager.hpp
rename to src/ccache/util/longlivedlockfilemanager.hpp
index 5156097f7..9a04357c0 100644
--- a/src/ccache/util/LongLivedLockFileManager.hpp
+++ b/src/ccache/util/longlivedlockfilemanager.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/util/NonCopyable.hpp>
+#include <ccache/util/noncopyable.hpp>
 
 #include <condition_variable>
 #include <filesystem>
diff --git a/src/ccache/util/MemoryMap.cpp b/src/ccache/util/memorymap.cpp
similarity index 99%
rename from src/ccache/util/MemoryMap.cpp
rename to src/ccache/util/memorymap.cpp
index 439bb0e38..0b85a2860 100644
--- a/src/ccache/util/MemoryMap.cpp
+++ b/src/ccache/util/memorymap.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "MemoryMap.hpp"
+#include "memorymap.hpp"
 
 #include <ccache/util/format.hpp>
 #include <ccache/util/wincompat.hpp>
diff --git a/src/ccache/util/MemoryMap.hpp b/src/ccache/util/memorymap.hpp
similarity index 97%
rename from src/ccache/util/MemoryMap.hpp
rename to src/ccache/util/memorymap.hpp
index f4d27d92e..fd7eb110f 100644
--- a/src/ccache/util/MemoryMap.hpp
+++ b/src/ccache/util/memorymap.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/util/NonCopyable.hpp>
+#include <ccache/util/noncopyable.hpp>
 
 #include <tl/expected.hpp>
 
diff --git a/src/ccache/util/NonCopyable.hpp b/src/ccache/util/noncopyable.hpp
similarity index 100%
rename from src/ccache/util/NonCopyable.hpp
rename to src/ccache/util/noncopyable.hpp
diff --git a/src/ccache/util/path.cpp b/src/ccache/util/path.cpp
index 0e8969824..a6fe01285 100644
--- a/src/ccache/util/path.cpp
+++ b/src/ccache/util/path.cpp
@@ -18,7 +18,7 @@
 
 #include "path.hpp"
 
-#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/direntry.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/string.hpp>
diff --git a/src/ccache/util/path.hpp b/src/ccache/util/path.hpp
index 3ce20d535..aa09172cf 100644
--- a/src/ccache/util/path.hpp
+++ b/src/ccache/util/path.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/util/PathString.hpp>
+#include <ccache/util/pathstring.hpp>
 
 #include <filesystem>
 #include <string>
diff --git a/src/ccache/util/PathString.hpp b/src/ccache/util/pathstring.hpp
similarity index 100%
rename from src/ccache/util/PathString.hpp
rename to src/ccache/util/pathstring.hpp
diff --git a/src/ccache/util/string.hpp b/src/ccache/util/string.hpp
index 07f791f2b..b1c3ae261 100644
--- a/src/ccache/util/string.hpp
+++ b/src/ccache/util/string.hpp
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include <ccache/util/Tokenizer.hpp>
 #include <ccache/util/conversion.hpp>
+#include <ccache/util/tokenizer.hpp>
 
 #include <nonstd/span.hpp>
 #include <tl/expected.hpp>
diff --git a/src/ccache/util/TemporaryFile.cpp b/src/ccache/util/temporaryfile.cpp
similarity index 98%
rename from src/ccache/util/TemporaryFile.cpp
rename to src/ccache/util/temporaryfile.cpp
index 00d978153..390cfe76a 100644
--- a/src/ccache/util/TemporaryFile.cpp
+++ b/src/ccache/util/temporaryfile.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TemporaryFile.hpp"
+#include "temporaryfile.hpp"
 
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
diff --git a/src/ccache/util/TemporaryFile.hpp b/src/ccache/util/temporaryfile.hpp
similarity index 98%
rename from src/ccache/util/TemporaryFile.hpp
rename to src/ccache/util/temporaryfile.hpp
index e92a8e9df..b3cb01762 100644
--- a/src/ccache/util/TemporaryFile.hpp
+++ b/src/ccache/util/temporaryfile.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/util/Fd.hpp>
+#include <ccache/util/fd.hpp>
 
 #include <tl/expected.hpp>
 
diff --git a/src/ccache/util/TextTable.cpp b/src/ccache/util/texttable.cpp
similarity index 99%
rename from src/ccache/util/TextTable.cpp
rename to src/ccache/util/texttable.cpp
index 9afd324d7..55cd37eec 100644
--- a/src/ccache/util/TextTable.cpp
+++ b/src/ccache/util/texttable.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TextTable.hpp"
+#include "texttable.hpp"
 
 #include <ccache/util/assertions.hpp>
 #include <ccache/util/format.hpp>
diff --git a/src/ccache/util/TextTable.hpp b/src/ccache/util/texttable.hpp
similarity index 100%
rename from src/ccache/util/TextTable.hpp
rename to src/ccache/util/texttable.hpp
diff --git a/src/ccache/util/ThreadPool.cpp b/src/ccache/util/threadpool.cpp
similarity index 96%
rename from src/ccache/util/ThreadPool.cpp
rename to src/ccache/util/threadpool.cpp
index 1c62e5d72..0bc6542b6 100644
--- a/src/ccache/util/ThreadPool.cpp
+++ b/src/ccache/util/threadpool.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2019-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "ThreadPool.hpp"
+#include "threadpool.hpp"
 
 namespace util {
 
diff --git a/src/ccache/util/ThreadPool.hpp b/src/ccache/util/threadpool.hpp
similarity index 100%
rename from src/ccache/util/ThreadPool.hpp
rename to src/ccache/util/threadpool.hpp
diff --git a/src/ccache/util/time.hpp b/src/ccache/util/time.hpp
index df7928d82..938b691af 100644
--- a/src/ccache/util/time.hpp
+++ b/src/ccache/util/time.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/util/TimePoint.hpp>
+#include <ccache/util/timepoint.hpp>
 
 #include <ctime>
 #include <optional>
diff --git a/src/ccache/util/TimePoint.cpp b/src/ccache/util/timepoint.cpp
similarity index 92%
rename from src/ccache/util/TimePoint.cpp
rename to src/ccache/util/timepoint.cpp
index db6016971..122bf18d9 100644
--- a/src/ccache/util/TimePoint.cpp
+++ b/src/ccache/util/timepoint.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Joel Rosdahl and other contributors
+// Copyright (C) 2022-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TimePoint.hpp"
+#include "timepoint.hpp"
 
 #include <chrono>
 
diff --git a/src/ccache/util/TimePoint.hpp b/src/ccache/util/timepoint.hpp
similarity index 99%
rename from src/ccache/util/TimePoint.hpp
rename to src/ccache/util/timepoint.hpp
index a12aa1965..a9b53cec1 100644
--- a/src/ccache/util/TimePoint.hpp
+++ b/src/ccache/util/timepoint.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/util/Duration.hpp>
+#include <ccache/util/duration.hpp>
 
 #include <cstdint>
 #include <ctime>
diff --git a/src/ccache/util/Timer.hpp b/src/ccache/util/timer.hpp
similarity index 100%
rename from src/ccache/util/Timer.hpp
rename to src/ccache/util/timer.hpp
diff --git a/src/ccache/util/Tokenizer.cpp b/src/ccache/util/tokenizer.cpp
similarity index 95%
rename from src/ccache/util/Tokenizer.cpp
rename to src/ccache/util/tokenizer.cpp
index a379c4f29..cf5167476 100644
--- a/src/ccache/util/Tokenizer.cpp
+++ b/src/ccache/util/tokenizer.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2022 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "Tokenizer.hpp"
+#include "tokenizer.hpp"
 
 namespace util {
 
diff --git a/src/ccache/util/Tokenizer.hpp b/src/ccache/util/tokenizer.hpp
similarity index 100%
rename from src/ccache/util/Tokenizer.hpp
rename to src/ccache/util/tokenizer.hpp
diff --git a/src/ccache/util/UmaskScope.cpp b/src/ccache/util/umaskscope.cpp
similarity index 98%
rename from src/ccache/util/UmaskScope.cpp
rename to src/ccache/util/umaskscope.cpp
index 049167482..24830274f 100644
--- a/src/ccache/util/UmaskScope.cpp
+++ b/src/ccache/util/umaskscope.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "UmaskScope.hpp"
+#include "umaskscope.hpp"
 
 #include <ccache/util/process.hpp>
 
diff --git a/src/ccache/util/UmaskScope.hpp b/src/ccache/util/umaskscope.hpp
similarity index 100%
rename from src/ccache/util/UmaskScope.hpp
rename to src/ccache/util/umaskscope.hpp
diff --git a/src/ccache/util/XXH3_128.hpp b/src/ccache/util/xxh3_128.hpp
similarity index 98%
rename from src/ccache/util/XXH3_128.hpp
rename to src/ccache/util/xxh3_128.hpp
index 02ea1080c..0215dc35f 100644
--- a/src/ccache/util/XXH3_128.hpp
+++ b/src/ccache/util/xxh3_128.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/util/Bytes.hpp>
+#include <ccache/util/bytes.hpp>
 #include <ccache/util/conversion.hpp>
 
 #include <nonstd/span.hpp>
diff --git a/src/ccache/util/XXH3_64.hpp b/src/ccache/util/xxh3_64.hpp
similarity index 100%
rename from src/ccache/util/XXH3_64.hpp
rename to src/ccache/util/xxh3_64.hpp
diff --git a/src/ccache/util/zstd.hpp b/src/ccache/util/zstd.hpp
index 557d9cbc6..9811cd12f 100644
--- a/src/ccache/util/zstd.hpp
+++ b/src/ccache/util/zstd.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <ccache/util/Bytes.hpp>
+#include <ccache/util/bytes.hpp>
 
 #include <nonstd/span.hpp>
 #include <tl/expected.hpp>
diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
index 3fee27fb9..9540f86df 100644
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -1,45 +1,45 @@
 set(
   source_files
-  TestUtil.cpp
   main.cpp
-  test_Args.cpp
-  test_Config.cpp
-  test_Depfile.cpp
-  test_Hash.cpp
   test_argprocessing.cpp
+  test_args.cpp
   test_ccache.cpp
   test_compopt.cpp
   test_compression_types.cpp
-  test_core_AtomicFile.cpp
-  test_core_MsvcShowIncludesOutput.cpp
-  test_core_Statistics.cpp
-  test_core_StatisticsCounters.cpp
-  test_core_StatsLog.cpp
+  test_config.cpp
+  test_core_atomicfile.cpp
   test_core_common.cpp
+  test_core_msvcshowincludesoutput.cpp
+  test_core_statistics.cpp
+  test_core_statisticscounters.cpp
+  test_core_statslog.cpp
+  test_depfile.cpp
+  test_hash.cpp
   test_hashutil.cpp
-  test_storage_local_StatsFile.cpp
+  test_storage_local_statsfile.cpp
   test_storage_local_util.cpp
-  test_util_BitSet.cpp
-  test_util_Bytes.cpp
-  test_util_DirEntry.cpp
-  test_util_Duration.cpp
-  test_util_LockFile.cpp
-  test_util_TextTable.cpp
-  test_util_TimePoint.cpp
-  test_util_Tokenizer.cpp
-  test_util_XXH3_128.cpp
-  test_util_XXH3_64.cpp
+  test_util_bitset.cpp
+  test_util_bytes.cpp
   test_util_conversion.cpp
+  test_util_direntry.cpp
+  test_util_duration.cpp
   test_util_environment.cpp
   test_util_expected.cpp
   test_util_file.cpp
+  test_util_lockfile.cpp
   test_util_path.cpp
   test_util_string.cpp
+  test_util_texttable.cpp
+  test_util_timepoint.cpp
+  test_util_tokenizer.cpp
+  test_util_xxh3_128.cpp
+  test_util_xxh3_64.cpp
   test_util_zstd.cpp
+  testutil.cpp
 )
 
 if(INODE_CACHE_SUPPORTED)
-  list(APPEND source_files test_InodeCache.cpp)
+  list(APPEND source_files test_inodecache.cpp)
 endif()
 
 if(WIN32)
diff --git a/unittest/test_argprocessing.cpp b/unittest/test_argprocessing.cpp
index 670a25121..187024ded 100644
--- a/unittest/test_argprocessing.cpp
+++ b/unittest/test_argprocessing.cpp
@@ -16,13 +16,13 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
-#include <ccache/Args.hpp>
-#include <ccache/Config.hpp>
-#include <ccache/Context.hpp>
 #include <ccache/argprocessing.hpp>
-#include <ccache/core/Statistic.hpp>
+#include <ccache/args.hpp>
+#include <ccache/config.hpp>
+#include <ccache/context.hpp>
+#include <ccache/core/statistic.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/format.hpp>
diff --git a/unittest/test_Args.cpp b/unittest/test_args.cpp
similarity index 99%
rename from unittest/test_Args.cpp
rename to unittest/test_args.cpp
index 9560e7136..b1bb6f634 100644
--- a/unittest/test_Args.cpp
+++ b/unittest/test_args.cpp
@@ -16,9 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
-#include <ccache/Args.hpp>
+#include <ccache/args.hpp>
 #include <ccache/util/file.hpp>
 
 #include <doctest/doctest.h>
diff --git a/unittest/test_bsdmkstemp.cpp b/unittest/test_bsdmkstemp.cpp
index 22a60cc22..c3324722f 100644
--- a/unittest/test_bsdmkstemp.cpp
+++ b/unittest/test_bsdmkstemp.cpp
@@ -16,10 +16,10 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
-#include <ccache/util/Fd.hpp>
-#include <ccache/util/Finalizer.hpp>
+#include <ccache/util/fd.hpp>
+#include <ccache/util/finalizer.hpp>
 #include <ccache/util/wincompat.hpp>
 
 #include <doctest/doctest.h>
diff --git a/unittest/test_ccache.cpp b/unittest/test_ccache.cpp
index ecf21635a..c8e1346e6 100644
--- a/unittest/test_ccache.cpp
+++ b/unittest/test_ccache.cpp
@@ -16,10 +16,10 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
-#include <ccache/Context.hpp>
 #include <ccache/ccache.hpp>
+#include <ccache/context.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/format.hpp>
diff --git a/unittest/test_compression_types.cpp b/unittest/test_compression_types.cpp
index 1e7cae7d7..c712a429c 100644
--- a/unittest/test_compression_types.cpp
+++ b/unittest/test_compression_types.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <ccache/Config.hpp>
+#include <ccache/config.hpp>
 #include <ccache/core/types.hpp>
 
 #include <doctest/doctest.h>
diff --git a/unittest/test_Config.cpp b/unittest/test_config.cpp
similarity index 99%
rename from unittest/test_Config.cpp
rename to unittest/test_config.cpp
index a6cfddcd1..9ccd4b41d 100644
--- a/unittest/test_Config.cpp
+++ b/unittest/test_config.cpp
@@ -16,9 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
-#include <ccache/Config.hpp>
+#include <ccache/config.hpp>
 #include <ccache/core/exceptions.hpp>
 #include <ccache/util/environment.hpp>
 #include <ccache/util/file.hpp>
diff --git a/unittest/test_core_AtomicFile.cpp b/unittest/test_core_atomicfile.cpp
similarity index 94%
rename from unittest/test_core_AtomicFile.cpp
rename to unittest/test_core_atomicfile.cpp
index 42655a716..e1075d40d 100644
--- a/unittest/test_core_AtomicFile.cpp
+++ b/unittest/test_core_atomicfile.cpp
@@ -16,10 +16,10 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
-#include <ccache/core/AtomicFile.hpp>
-#include <ccache/util/DirEntry.hpp>
+#include <ccache/core/atomicfile.hpp>
+#include <ccache/util/direntry.hpp>
 #include <ccache/util/file.hpp>
 
 #include <doctest/doctest.h>
diff --git a/unittest/test_core_common.cpp b/unittest/test_core_common.cpp
index a3c2c34ab..74a37ffb7 100644
--- a/unittest/test_core_common.cpp
+++ b/unittest/test_core_common.cpp
@@ -16,11 +16,11 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
 #include <ccache/core/common.hpp>
 #include <ccache/core/exceptions.hpp>
-#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/direntry.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/format.hpp>
diff --git a/unittest/test_core_MsvcShowIncludesOutput.cpp b/unittest/test_core_msvcshowincludesoutput.cpp
similarity index 98%
rename from unittest/test_core_MsvcShowIncludesOutput.cpp
rename to unittest/test_core_msvcshowincludesoutput.cpp
index 633407004..14ace84d6 100644
--- a/unittest/test_core_MsvcShowIncludesOutput.cpp
+++ b/unittest/test_core_msvcshowincludesoutput.cpp
@@ -16,10 +16,10 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
-#include <ccache/Context.hpp>
-#include <ccache/core/MsvcShowIncludesOutput.hpp>
+#include <ccache/context.hpp>
+#include <ccache/core/msvcshowincludesoutput.hpp>
 #include <ccache/util/string.hpp>
 
 #include <doctest/doctest.h>
diff --git a/unittest/test_core_Statistics.cpp b/unittest/test_core_statistics.cpp
similarity index 94%
rename from unittest/test_core_Statistics.cpp
rename to unittest/test_core_statistics.cpp
index ad96fcd72..755c36594 100644
--- a/unittest/test_core_Statistics.cpp
+++ b/unittest/test_core_statistics.cpp
@@ -16,10 +16,10 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
-#include <ccache/core/Statistic.hpp>
-#include <ccache/core/Statistics.hpp>
+#include <ccache/core/statistic.hpp>
+#include <ccache/core/statistics.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/unittest/test_core_StatisticsCounters.cpp b/unittest/test_core_statisticscounters.cpp
similarity index 96%
rename from unittest/test_core_StatisticsCounters.cpp
rename to unittest/test_core_statisticscounters.cpp
index fd0dcd34b..341aa5d0c 100644
--- a/unittest/test_core_StatisticsCounters.cpp
+++ b/unittest/test_core_statisticscounters.cpp
@@ -16,10 +16,10 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
-#include <ccache/core/Statistic.hpp>
-#include <ccache/core/StatisticsCounters.hpp>
+#include <ccache/core/statistic.hpp>
+#include <ccache/core/statisticscounters.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/unittest/test_core_StatsLog.cpp b/unittest/test_core_statslog.cpp
similarity index 96%
rename from unittest/test_core_StatsLog.cpp
rename to unittest/test_core_statslog.cpp
index db262d0fd..43942831f 100644
--- a/unittest/test_core_StatsLog.cpp
+++ b/unittest/test_core_statslog.cpp
@@ -16,9 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
-#include <ccache/core/StatsLog.hpp>
+#include <ccache/core/statslog.hpp>
 #include <ccache/util/file.hpp>
 
 #include <doctest/doctest.h>
diff --git a/unittest/test_Depfile.cpp b/unittest/test_depfile.cpp
similarity index 99%
rename from unittest/test_Depfile.cpp
rename to unittest/test_depfile.cpp
index 27ebec8e7..f5c8b2126 100644
--- a/unittest/test_Depfile.cpp
+++ b/unittest/test_depfile.cpp
@@ -16,10 +16,10 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
-#include <ccache/Context.hpp>
-#include <ccache/Depfile.hpp>
+#include <ccache/context.hpp>
+#include <ccache/depfile.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/format.hpp>
 #include <ccache/util/path.hpp>
diff --git a/unittest/test_Hash.cpp b/unittest/test_hash.cpp
similarity index 98%
rename from unittest/test_Hash.cpp
rename to unittest/test_hash.cpp
index c42821425..92def441e 100644
--- a/unittest/test_Hash.cpp
+++ b/unittest/test_hash.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <ccache/Hash.hpp>
+#include <ccache/hash.hpp>
 #include <ccache/util/string.hpp>
 
 #include <doctest/doctest.h>
diff --git a/unittest/test_hashutil.cpp b/unittest/test_hashutil.cpp
index d05fde6b9..7416c8f72 100644
--- a/unittest/test_hashutil.cpp
+++ b/unittest/test_hashutil.cpp
@@ -16,9 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
-#include <ccache/Hash.hpp>
+#include <ccache/hash.hpp>
 #include <ccache/hashutil.hpp>
 #include <ccache/util/file.hpp>
 
diff --git a/unittest/test_InodeCache.cpp b/unittest/test_inodecache.cpp
similarity index 96%
rename from unittest/test_InodeCache.cpp
rename to unittest/test_inodecache.cpp
index feec4e34f..878f083ea 100644
--- a/unittest/test_InodeCache.cpp
+++ b/unittest/test_inodecache.cpp
@@ -16,17 +16,17 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
-
-#include <ccache/Config.hpp>
-#include <ccache/Context.hpp>
-#include <ccache/Hash.hpp>
-#include <ccache/InodeCache.hpp>
-#include <ccache/util/Fd.hpp>
-#include <ccache/util/TemporaryFile.hpp>
+#include "testutil.hpp"
+
+#include <ccache/config.hpp>
+#include <ccache/context.hpp>
+#include <ccache/hash.hpp>
+#include <ccache/inodecache.hpp>
+#include <ccache/util/fd.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/path.hpp>
+#include <ccache/util/temporaryfile.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/unittest/test_storage_local_StatsFile.cpp b/unittest/test_storage_local_statsfile.cpp
similarity index 96%
rename from unittest/test_storage_local_StatsFile.cpp
rename to unittest/test_storage_local_statsfile.cpp
index ae0721b16..1bbd794a2 100644
--- a/unittest/test_storage_local_StatsFile.cpp
+++ b/unittest/test_storage_local_statsfile.cpp
@@ -16,10 +16,10 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
-#include <ccache/core/Statistic.hpp>
-#include <ccache/storage/local/StatsFile.hpp>
+#include <ccache/core/statistic.hpp>
+#include <ccache/storage/local/statsfile.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/format.hpp>
 
diff --git a/unittest/test_storage_local_util.cpp b/unittest/test_storage_local_util.cpp
index 200d7797e..c6766677c 100644
--- a/unittest/test_storage_local_util.cpp
+++ b/unittest/test_storage_local_util.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
 #include <ccache/storage/local/util.hpp>
 #include <ccache/util/file.hpp>
diff --git a/unittest/test_util_BitSet.cpp b/unittest/test_util_bitset.cpp
similarity index 97%
rename from unittest/test_util_BitSet.cpp
rename to unittest/test_util_bitset.cpp
index 745527eb6..d77fa6ecd 100644
--- a/unittest/test_util_BitSet.cpp
+++ b/unittest/test_util_bitset.cpp
@@ -16,9 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
-#include <ccache/util/BitSet.hpp>
+#include <ccache/util/bitset.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/unittest/test_util_Bytes.cpp b/unittest/test_util_bytes.cpp
similarity index 99%
rename from unittest/test_util_Bytes.cpp
rename to unittest/test_util_bytes.cpp
index 5deb7ac06..3d7394570 100644
--- a/unittest/test_util_Bytes.cpp
+++ b/unittest/test_util_bytes.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <ccache/util/Bytes.hpp>
+#include <ccache/util/bytes.hpp>
 
 #include <doctest/doctest.h>
 #include <nonstd/span.hpp>
diff --git a/unittest/test_util_DirEntry.cpp b/unittest/test_util_direntry.cpp
similarity index 99%
rename from unittest/test_util_DirEntry.cpp
rename to unittest/test_util_direntry.cpp
index 3de2a1c0c..0bf490748 100644
--- a/unittest/test_util_DirEntry.cpp
+++ b/unittest/test_util_direntry.cpp
@@ -16,14 +16,14 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
-#include <ccache/util/DirEntry.hpp>
-#include <ccache/util/Fd.hpp>
-#include <ccache/util/Finalizer.hpp>
+#include <ccache/util/direntry.hpp>
 #include <ccache/util/environment.hpp>
+#include <ccache/util/fd.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
+#include <ccache/util/finalizer.hpp>
 #include <ccache/util/wincompat.hpp>
 
 #include <doctest/doctest.h>
diff --git a/unittest/test_util_Duration.cpp b/unittest/test_util_duration.cpp
similarity index 98%
rename from unittest/test_util_Duration.cpp
rename to unittest/test_util_duration.cpp
index a0a745e2f..0ebcce77a 100644
--- a/unittest/test_util_Duration.cpp
+++ b/unittest/test_util_duration.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <ccache/util/Duration.hpp>
+#include <ccache/util/duration.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/unittest/test_util_file.cpp b/unittest/test_util_file.cpp
index 9f1c1a031..728df7765 100644
--- a/unittest/test_util_file.cpp
+++ b/unittest/test_util_file.cpp
@@ -16,11 +16,11 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
-#include <ccache/util/Bytes.hpp>
-#include <ccache/util/DirEntry.hpp>
-#include <ccache/util/Fd.hpp>
+#include <ccache/util/bytes.hpp>
+#include <ccache/util/direntry.hpp>
+#include <ccache/util/fd.hpp>
 #include <ccache/util/file.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/format.hpp>
diff --git a/unittest/test_util_LockFile.cpp b/unittest/test_util_lockfile.cpp
similarity index 97%
rename from unittest/test_util_LockFile.cpp
rename to unittest/test_util_lockfile.cpp
index efdec653d..857051474 100644
--- a/unittest/test_util_LockFile.cpp
+++ b/unittest/test_util_lockfile.cpp
@@ -16,11 +16,11 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
-#include <ccache/util/DirEntry.hpp>
-#include <ccache/util/LockFile.hpp>
+#include <ccache/util/direntry.hpp>
 #include <ccache/util/file.hpp>
+#include <ccache/util/lockfile.hpp>
 #include <ccache/util/wincompat.hpp>
 
 #include <doctest/doctest.h>
diff --git a/unittest/test_util_path.cpp b/unittest/test_util_path.cpp
index b29199182..a3cbbaf13 100644
--- a/unittest/test_util_path.cpp
+++ b/unittest/test_util_path.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
 #include <ccache/util/environment.hpp>
 #include <ccache/util/filesystem.hpp>
diff --git a/unittest/test_util_TextTable.cpp b/unittest/test_util_texttable.cpp
similarity index 98%
rename from unittest/test_util_TextTable.cpp
rename to unittest/test_util_texttable.cpp
index aa85b3695..036dd4831 100644
--- a/unittest/test_util_TextTable.cpp
+++ b/unittest/test_util_texttable.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <ccache/util/TextTable.hpp>
+#include <ccache/util/texttable.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/unittest/test_util_TimePoint.cpp b/unittest/test_util_timepoint.cpp
similarity index 98%
rename from unittest/test_util_TimePoint.cpp
rename to unittest/test_util_timepoint.cpp
index 8d7f63272..0c120e606 100644
--- a/unittest/test_util_TimePoint.cpp
+++ b/unittest/test_util_timepoint.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <ccache/util/TimePoint.hpp>
+#include <ccache/util/timepoint.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/unittest/test_util_Tokenizer.cpp b/unittest/test_util_tokenizer.cpp
similarity index 100%
rename from unittest/test_util_Tokenizer.cpp
rename to unittest/test_util_tokenizer.cpp
diff --git a/unittest/test_util_XXH3_128.cpp b/unittest/test_util_xxh3_128.cpp
similarity index 97%
rename from unittest/test_util_XXH3_128.cpp
rename to unittest/test_util_xxh3_128.cpp
index a8bce4931..b9cfa7f7f 100644
--- a/unittest/test_util_XXH3_128.cpp
+++ b/unittest/test_util_xxh3_128.cpp
@@ -16,8 +16,8 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <ccache/util/XXH3_128.hpp>
 #include <ccache/util/string.hpp>
+#include <ccache/util/xxh3_128.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/unittest/test_util_XXH3_64.cpp b/unittest/test_util_xxh3_64.cpp
similarity index 97%
rename from unittest/test_util_XXH3_64.cpp
rename to unittest/test_util_xxh3_64.cpp
index 61bb133d8..705f1db83 100644
--- a/unittest/test_util_XXH3_64.cpp
+++ b/unittest/test_util_xxh3_64.cpp
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <ccache/util/XXH3_64.hpp>
+#include <ccache/util/xxh3_64.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/unittest/test_util_zstd.cpp b/unittest/test_util_zstd.cpp
index 59e5550ce..4b411af88 100644
--- a/unittest/test_util_zstd.cpp
+++ b/unittest/test_util_zstd.cpp
@@ -16,9 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
-#include <ccache/util/Bytes.hpp>
+#include <ccache/util/bytes.hpp>
 #include <ccache/util/zstd.hpp>
 
 #include <doctest/doctest.h>
diff --git a/unittest/TestUtil.cpp b/unittest/testutil.cpp
similarity index 95%
rename from unittest/TestUtil.cpp
rename to unittest/testutil.cpp
index 95e9ed1db..d5ae90ec7 100644
--- a/unittest/TestUtil.cpp
+++ b/unittest/testutil.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,7 +16,7 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "TestUtil.hpp"
+#include "testutil.hpp"
 
 #include <ccache/core/exceptions.hpp>
 #include <ccache/util/expected.hpp>
diff --git a/unittest/TestUtil.hpp b/unittest/testutil.hpp
similarity index 100%
rename from unittest/TestUtil.hpp
rename to unittest/testutil.hpp