diff --git a/src/common/apple/smc_temps.c b/src/common/apple/smc_temps.c
index a71f94a5d..6669c3125 100644
--- a/src/common/apple/smc_temps.c
+++ b/src/common/apple/smc_temps.c
@@ -1,6 +1,6 @@
 #include "smc_temps.h"
 #include "common/apple/cf_helpers.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <stdint.h>
 #include <IOKit/IOKitLib.h>
diff --git a/src/common/apple/version.m b/src/common/apple/version.m
index 6ab4e950b..133ec5b19 100644
--- a/src/common/apple/version.m
+++ b/src/common/apple/version.m
@@ -1,5 +1,5 @@
 #include "common/apple/version.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #import <Foundation/Foundation.h>
 
diff --git a/src/common/impl/FFPlatform.c b/src/common/impl/FFPlatform.c
index 4366bc10e..ff4c45cd2 100644
--- a/src/common/impl/FFPlatform.c
+++ b/src/common/impl/FFPlatform.c
@@ -1,5 +1,5 @@
 #include "FFPlatform_private.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/io.h"
 #include "detection/version/version.h"
 
diff --git a/src/common/impl/FFPlatform_unix.c b/src/common/impl/FFPlatform_unix.c
index 76afb3597..d722366f2 100644
--- a/src/common/impl/FFPlatform_unix.c
+++ b/src/common/impl/FFPlatform_unix.c
@@ -1,7 +1,7 @@
 #include "FFPlatform_private.h"
 #include "common/FFstrbuf.h"
 #include "common/arrayUtils.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/io.h"
 #include "fastfetch_config.h"
 
diff --git a/src/common/impl/FFPlatform_windows.c b/src/common/impl/FFPlatform_windows.c
index e483071e0..083d20aa0 100644
--- a/src/common/impl/FFPlatform_windows.c
+++ b/src/common/impl/FFPlatform_windows.c
@@ -1,7 +1,7 @@
 #include "FFPlatform_private.h"
 #include "common/io.h"
 #include "common/library.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/windows/unicode.h"
 #include "common/windows/registry.h"
 #include "common/windows/nt.h"
diff --git a/src/common/impl/FFstrbuf.c b/src/common/impl/FFstrbuf.c
index 8005753df..a349e08df 100644
--- a/src/common/impl/FFstrbuf.c
+++ b/src/common/impl/FFstrbuf.c
@@ -1,6 +1,6 @@
 #include "common/FFstrbuf.h"
 #include "common/mallocHelper.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <ctype.h>
 #include <inttypes.h>
diff --git a/src/common/impl/binary_apple.c b/src/common/impl/binary_apple.c
index de2c87638..84781693a 100644
--- a/src/common/impl/binary_apple.c
+++ b/src/common/impl/binary_apple.c
@@ -1,6 +1,6 @@
 #include "common/binary.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <string.h>
 #include <fcntl.h>
diff --git a/src/common/impl/binary_linux.c b/src/common/impl/binary_linux.c
index ac04bf71b..9a2421732 100644
--- a/src/common/impl/binary_linux.c
+++ b/src/common/impl/binary_linux.c
@@ -4,7 +4,7 @@
 
     #include "common/io.h"
     #include "common/library.h"
-    #include "common/stringUtils.h"
+    #include "common/strutil.h"
 
     #include <libelf.h> // #1254
     #include <fcntl.h>
diff --git a/src/common/impl/binary_windows.c b/src/common/impl/binary_windows.c
index 4bf2f4644..918cad531 100644
--- a/src/common/impl/binary_windows.c
+++ b/src/common/impl/binary_windows.c
@@ -1,6 +1,6 @@
 #include "common/binary.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/windows/nt.h"
 
 #include <windows.h>
diff --git a/src/common/impl/commandoption.c b/src/common/impl/commandoption.c
index c36f5f7e3..05cb1fd9d 100644
--- a/src/common/impl/commandoption.c
+++ b/src/common/impl/commandoption.c
@@ -3,7 +3,7 @@
 #include "common/printing.h"
 #include "common/time.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "fastfetch_datatext.h"
 #include "modules/modules.h"
 
diff --git a/src/common/impl/dbus.c b/src/common/impl/dbus.c
index 5b7ae7389..473af2d20 100644
--- a/src/common/impl/dbus.c
+++ b/src/common/impl/dbus.c
@@ -3,7 +3,7 @@
 #ifdef FF_HAVE_DBUS
 
     #include "common/thread.h"
-    #include "common/stringUtils.h"
+    #include "common/strutil.h"
 
 static bool loadLibSymbols(FFDBusLibrary* lib) {
     FF_LIBRARY_LOAD(dbus, false, "libdbus-1" FF_LIBRARY_EXTENSION, 4);
diff --git a/src/common/impl/font.c b/src/common/impl/font.c
index 3bd19d452..93feff15c 100644
--- a/src/common/impl/font.c
+++ b/src/common/impl/font.c
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
 #include "common/FFlist.h"
 #include "common/FFstrbuf.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/font.h"
 
 #include <string.h>
diff --git a/src/common/impl/format.c b/src/common/impl/format.c
index 13bf7f5f8..510aa7612 100644
--- a/src/common/impl/format.c
+++ b/src/common/impl/format.c
@@ -2,7 +2,7 @@
 #include "common/format.h"
 #include "common/parsing.h"
 #include "common/textModifier.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/library.h"
 
 #include <inttypes.h>
diff --git a/src/common/impl/io_unix.c b/src/common/impl/io_unix.c
index c760861ef..e60318611 100644
--- a/src/common/impl/io_unix.c
+++ b/src/common/impl/io_unix.c
@@ -1,6 +1,6 @@
 #include "common/io.h"
 #include "fastfetch.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/time.h"
 
 #include <fcntl.h>
diff --git a/src/common/impl/io_windows.c b/src/common/impl/io_windows.c
index cfac99e8e..24b8d05d1 100644
--- a/src/common/impl/io_windows.c
+++ b/src/common/impl/io_windows.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/windows/nt.h"
 #include "common/windows/unicode.h"
 
diff --git a/src/common/impl/jsonconfig.c b/src/common/impl/jsonconfig.c
index 07e9b39d6..b9d7a70ef 100644
--- a/src/common/impl/jsonconfig.c
+++ b/src/common/impl/jsonconfig.c
@@ -4,7 +4,7 @@
 #include "common/printing.h"
 #include "common/io.h"
 #include "common/time.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/version/version.h"
 #include "modules/modules.h"
 
diff --git a/src/common/impl/kmod_nbsd.c b/src/common/impl/kmod_nbsd.c
index 06149eab1..f1b450a9b 100644
--- a/src/common/impl/kmod_nbsd.c
+++ b/src/common/impl/kmod_nbsd.c
@@ -1,5 +1,5 @@
 #include "common/kmod.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <sys/module.h>
 #include <sys/param.h>
diff --git a/src/common/impl/kmod_sunos.c b/src/common/impl/kmod_sunos.c
index de0020670..da392e26b 100644
--- a/src/common/impl/kmod_sunos.c
+++ b/src/common/impl/kmod_sunos.c
@@ -1,5 +1,5 @@
 #include "common/kmod.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <sys/modctl.h>
 #include <errno.h>
diff --git a/src/common/impl/kmod_windows.c b/src/common/impl/kmod_windows.c
index b8db05210..081e5a788 100644
--- a/src/common/impl/kmod_windows.c
+++ b/src/common/impl/kmod_windows.c
@@ -1,7 +1,7 @@
 #include "common/kmod.h"
 #include "common/windows/nt.h"
 #include "common/mallocHelper.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 bool ffKmodLoaded(const char* modName) {
     ULONG bufferSize = 0;
diff --git a/src/common/impl/networking_common.c b/src/common/impl/networking_common.c
index c716195ae..e63979bf2 100644
--- a/src/common/impl/networking_common.c
+++ b/src/common/impl/networking_common.c
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
 #include "common/library.h"
 #include "common/networking.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/debug.h"
 
 #ifdef FF_HAVE_ZLIB
diff --git a/src/common/impl/networking_linux.c b/src/common/impl/networking_linux.c
index 0db8d8829..e253451fe 100644
--- a/src/common/impl/networking_linux.c
+++ b/src/common/impl/networking_linux.c
@@ -2,7 +2,7 @@
 #include "common/networking.h"
 #include "common/time.h"
 #include "common/library.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/mallocHelper.h"
 #include "common/debug.h"
 
diff --git a/src/common/impl/networking_windows.c b/src/common/impl/networking_windows.c
index dd90948dc..d3a775228 100644
--- a/src/common/impl/networking_windows.c
+++ b/src/common/impl/networking_windows.c
@@ -4,7 +4,7 @@
 // Must be included after <mswsock.h>
 #include "fastfetch.h"
 #include "common/networking.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/debug.h"
 
 static LPFN_CONNECTEX ConnectEx;
diff --git a/src/common/impl/option.c b/src/common/impl/option.c
index 7390f7b66..3d592d0ec 100644
--- a/src/common/impl/option.c
+++ b/src/common/impl/option.c
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
 #include "common/option.h"
 #include "common/color.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <limits.h>
 
diff --git a/src/common/impl/percent.c b/src/common/impl/percent.c
index f19fbacb7..266588cb6 100644
--- a/src/common/impl/percent.c
+++ b/src/common/impl/percent.c
@@ -4,7 +4,7 @@
 #include "common/option.h"
 #include "common/jsonconfig.h"
 #include "common/textModifier.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 static void appendOutputColor(FFstrbuf* buffer, const FFModuleArgs* module) {
     if (module->outputColor.length) {
diff --git a/src/common/impl/processing_linux.c b/src/common/impl/processing_linux.c
index 6fda83ce6..2b87c3b79 100644
--- a/src/common/impl/processing_linux.c
+++ b/src/common/impl/processing_linux.c
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
 #include "common/processing.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/mallocHelper.h"
 
 #include <stdlib.h>
diff --git a/src/common/impl/temps.c b/src/common/impl/temps.c
index ae51e65b3..652f3fbb2 100644
--- a/src/common/impl/temps.c
+++ b/src/common/impl/temps.c
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
 #include "common/temps.h"
 #include "common/textModifier.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 void ffTempsAppendNum(double celsius, FFstrbuf* buffer, FFColorRangeConfig config, const FFModuleArgs* module) {
     if (celsius == -DBL_MAX) { // ignores invalid value
diff --git a/src/common/path.h b/src/common/path.h
index 79d181df2..705b1c094 100644
--- a/src/common/path.h
+++ b/src/common/path.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "common/FFstrbuf.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 const char* ffFindExecutableInPath(const char* name, FFstrbuf* result);
 static inline bool ffIsAbsolutePath(const char* path) {
diff --git a/src/common/stringUtils.h b/src/common/strutil.h
similarity index 100%
rename from src/common/stringUtils.h
rename to src/common/strutil.h
diff --git a/src/detection/battery/battery_android.c b/src/detection/battery/battery_android.c
index 4c52d3a77..d76c4adaa 100644
--- a/src/detection/battery/battery_android.c
+++ b/src/detection/battery/battery_android.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "battery.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/processing.h"
 #include "common/properties.h"
 
diff --git a/src/detection/battery/battery_linux.c b/src/detection/battery/battery_linux.c
index 13fc4d05c..6c1f71125 100644
--- a/src/detection/battery/battery_linux.c
+++ b/src/detection/battery/battery_linux.c
@@ -1,6 +1,6 @@
 #include "battery.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/debug.h"
 
 #include <dirent.h>
diff --git a/src/detection/battery/battery_nbsd.c b/src/detection/battery/battery_nbsd.c
index f24907c5e..2e8b42680 100644
--- a/src/detection/battery/battery_nbsd.c
+++ b/src/detection/battery/battery_nbsd.c
@@ -1,7 +1,7 @@
 #include "battery.h"
 #include "common/io.h"
 #include "common/FFstrbuf.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <prop/prop_array.h>
 #include <prop/prop_bool.h>
diff --git a/src/detection/bluetooth/bluetooth_linux.c b/src/detection/bluetooth/bluetooth_linux.c
index 8d0212755..fb4e42242 100644
--- a/src/detection/bluetooth/bluetooth_linux.c
+++ b/src/detection/bluetooth/bluetooth_linux.c
@@ -1,5 +1,5 @@
 #include "bluetooth.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #ifdef FF_HAVE_DBUS
     #include "common/dbus.h"
diff --git a/src/detection/bluetoothradio/bluetoothradio_linux.c b/src/detection/bluetoothradio/bluetoothradio_linux.c
index 5f5554a35..a7d92a483 100644
--- a/src/detection/bluetoothradio/bluetoothradio_linux.c
+++ b/src/detection/bluetoothradio/bluetoothradio_linux.c
@@ -1,5 +1,5 @@
 #include "bluetoothradio.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #ifdef FF_HAVE_DBUS
     #include "common/dbus.h"
diff --git a/src/detection/brightness/brightness_linux.c b/src/detection/brightness/brightness_linux.c
index 95cde9fa9..e7125f8fc 100644
--- a/src/detection/brightness/brightness_linux.c
+++ b/src/detection/brightness/brightness_linux.c
@@ -1,7 +1,7 @@
 #include "brightness.h"
 #include "common/io.h"
 #include "common/edidHelper.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <dirent.h>
 #include <limits.h>
diff --git a/src/detection/cpu/cpu_apple.c b/src/detection/cpu/cpu_apple.c
index 30b71568a..f078b0c1f 100644
--- a/src/detection/cpu/cpu_apple.c
+++ b/src/detection/cpu/cpu_apple.c
@@ -1,7 +1,7 @@
 #include "cpu.h"
 #include "common/sysctl.h"
 #include "common/apple/smc_temps.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 static double detectCpuTemp(const FFCPUOptions* options, const FFstrbuf* cpuName) {
     double result = 0;
diff --git a/src/detection/cpu/cpu_bsd.c b/src/detection/cpu/cpu_bsd.c
index 838e95dd7..4cca30e73 100644
--- a/src/detection/cpu/cpu_bsd.c
+++ b/src/detection/cpu/cpu_bsd.c
@@ -1,6 +1,6 @@
 #include "cpu.h"
 #include "common/sysctl.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <sys/param.h>
 #if __has_include(<sys/cpuset.h>)
diff --git a/src/detection/cpu/cpu_linux.c b/src/detection/cpu/cpu_linux.c
index da73a207c..1870055bc 100644
--- a/src/detection/cpu/cpu_linux.c
+++ b/src/detection/cpu/cpu_linux.c
@@ -3,7 +3,7 @@
 #include "common/processing.h"
 #include "common/properties.h"
 #include "common/mallocHelper.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/path.h"
 
 #include <sys/sysinfo.h>
diff --git a/src/detection/cpu/cpu_obsd.c b/src/detection/cpu/cpu_obsd.c
index 47e6bfb9e..e5b8d2fdf 100644
--- a/src/detection/cpu/cpu_obsd.c
+++ b/src/detection/cpu/cpu_obsd.c
@@ -1,6 +1,6 @@
 #include "cpu.h"
 #include "common/sysctl.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <errno.h>
 #include <sys/time.h>
diff --git a/src/detection/cpu/cpu_sunos.c b/src/detection/cpu/cpu_sunos.c
index 7d93dd49c..9b1cab503 100644
--- a/src/detection/cpu/cpu_sunos.c
+++ b/src/detection/cpu/cpu_sunos.c
@@ -1,6 +1,6 @@
 #include "cpu.h"
 #include "common/processing.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include <kstat.h>
 
 static const char* detectCPUTempByKstat(const FFCPUOptions* options, kstat_ctl_t* kc, FFCPUResult* cpu) {
diff --git a/src/detection/cpucache/cpucache_apple.c b/src/detection/cpucache/cpucache_apple.c
index 61afcd750..3d1562cef 100644
--- a/src/detection/cpucache/cpucache_apple.c
+++ b/src/detection/cpucache/cpucache_apple.c
@@ -1,6 +1,6 @@
 #include "cpucache.h"
 #include "common/sysctl.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 const char* ffDetectCPUCache(FFCPUCacheResult* result) {
     // https://developer.apple.com/documentation/kernel/1387446-sysctlbyname/determining_system_capabilities#3901385
diff --git a/src/detection/cpucache/cpucache_linux.c b/src/detection/cpucache/cpucache_linux.c
index 8f435d8ea..0657c84ae 100644
--- a/src/detection/cpucache/cpucache_linux.c
+++ b/src/detection/cpucache/cpucache_linux.c
@@ -1,6 +1,6 @@
 #include "cpucache.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 static const char* parseCpuCacheIndex(FFstrbuf* path, FFCPUCacheResult* result, FFstrbuf* buffer, FFstrbuf* added) {
     uint32_t baseLen = path->length;
diff --git a/src/detection/cpucache/cpucache_shared.c b/src/detection/cpucache/cpucache_shared.c
index ece9d6866..c13e35168 100644
--- a/src/detection/cpucache/cpucache_shared.c
+++ b/src/detection/cpucache/cpucache_shared.c
@@ -1,6 +1,6 @@
 #include "cpucache.h"
 #include "common/smbios.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 typedef struct FFSmbiosCacheInfo {
     FFSmbiosHeader Header;
diff --git a/src/detection/cursor/cursor_linux.c b/src/detection/cursor/cursor_linux.c
index 11e341ea6..89dabbc37 100644
--- a/src/detection/cursor/cursor_linux.c
+++ b/src/detection/cursor/cursor_linux.c
@@ -5,7 +5,7 @@
 #include "common/properties.h"
 #include "common/parsing.h"
 #include "common/settings.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <stdlib.h>
 
diff --git a/src/detection/disk/disk_bsd.c b/src/detection/disk/disk_bsd.c
index 6e0475f84..9156d79ef 100644
--- a/src/detection/disk/disk_bsd.c
+++ b/src/detection/disk/disk_bsd.c
@@ -1,6 +1,6 @@
 #include "disk.h"
 #include "common/mallocHelper.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <stdalign.h>
 #include <sys/mount.h>
diff --git a/src/detection/disk/disk_haiku.cpp b/src/detection/disk/disk_haiku.cpp
index 094d8c045..098789710 100644
--- a/src/detection/disk/disk_haiku.cpp
+++ b/src/detection/disk/disk_haiku.cpp
@@ -1,6 +1,6 @@
 extern "C" {
 #include "disk.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 }
 #include <fs_info.h>
 #include <Directory.h>
diff --git a/src/detection/disk/disk_linux.c b/src/detection/disk/disk_linux.c
index a14a7561c..720531731 100644
--- a/src/detection/disk/disk_linux.c
+++ b/src/detection/disk/disk_linux.c
@@ -1,7 +1,7 @@
 #include "disk.h"
 
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <limits.h>
 #include <ctype.h>
diff --git a/src/detection/disk/disk_sunos.c b/src/detection/disk/disk_sunos.c
index e2382f4fb..3d811e03e 100644
--- a/src/detection/disk/disk_sunos.c
+++ b/src/detection/disk/disk_sunos.c
@@ -1,6 +1,6 @@
 #include "disk.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <sys/mntent.h>
 #include <sys/stat.h>
diff --git a/src/detection/diskio/diskio_bsd.c b/src/detection/diskio/diskio_bsd.c
index b945b6114..f5eb4b8b8 100644
--- a/src/detection/diskio/diskio_bsd.c
+++ b/src/detection/diskio/diskio_bsd.c
@@ -2,7 +2,7 @@
 
 #if __has_include(<libgeom.h>)
 
-    #include "common/stringUtils.h"
+    #include "common/strutil.h"
 
     #include <devstat.h>
     #include <memory.h>
diff --git a/src/detection/diskio/diskio_linux.c b/src/detection/diskio/diskio_linux.c
index a0ee44e99..c7ddc55ea 100644
--- a/src/detection/diskio/diskio_linux.c
+++ b/src/detection/diskio/diskio_linux.c
@@ -1,7 +1,7 @@
 #include "diskio.h"
 #include "common/io.h"
 #include "common/properties.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/src/detection/diskio/diskio_nbsd.c b/src/detection/diskio/diskio_nbsd.c
index 71f0bfa08..9ca9578a8 100644
--- a/src/detection/diskio/diskio_nbsd.c
+++ b/src/detection/diskio/diskio_nbsd.c
@@ -1,6 +1,6 @@
 #include "diskio.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/mallocHelper.h"
 
 #include <sys/iostat.h>
diff --git a/src/detection/diskio/diskio_obsd.c b/src/detection/diskio/diskio_obsd.c
index cab0abe05..8dbc67ebd 100644
--- a/src/detection/diskio/diskio_obsd.c
+++ b/src/detection/diskio/diskio_obsd.c
@@ -1,5 +1,5 @@
 #include "diskio.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/mallocHelper.h"
 
 #include <sys/disk.h>
diff --git a/src/detection/diskio/diskio_sunos.c b/src/detection/diskio/diskio_sunos.c
index 0a1db093c..7cda42081 100644
--- a/src/detection/diskio/diskio_sunos.c
+++ b/src/detection/diskio/diskio_sunos.c
@@ -1,5 +1,5 @@
 #include "diskio.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include <kstat.h>
 
 static inline void kstatFreeWrap(kstat_ctl_t** pkc) {
diff --git a/src/detection/displayserver/displayserver_apple.c b/src/detection/displayserver/displayserver_apple.c
index a4cb809aa..39ba604b3 100644
--- a/src/detection/displayserver/displayserver_apple.c
+++ b/src/detection/displayserver/displayserver_apple.c
@@ -1,6 +1,6 @@
 #include "displayserver.h"
 #include "common/apple/cf_helpers.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/edidHelper.h"
 #include "detection/os/os.h"
 
diff --git a/src/detection/displayserver/linux/common.c b/src/detection/displayserver/linux/common.c
index cb33b80cd..305766dd7 100644
--- a/src/detection/displayserver/linux/common.c
+++ b/src/detection/displayserver/linux/common.c
@@ -1,5 +1,5 @@
 #include "displayserver_linux.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 FFDisplayType ffdsGetDisplayType(const char* name) {
     if (ffStrStartsWith(name, "eDP-") || ffStrStartsWith(name, "LVDS-")) {
diff --git a/src/detection/displayserver/linux/displayserver_linux.c b/src/detection/displayserver/linux/displayserver_linux.c
index 174aeb37c..70d2d4001 100644
--- a/src/detection/displayserver/linux/displayserver_linux.c
+++ b/src/detection/displayserver/linux/displayserver_linux.c
@@ -1,6 +1,6 @@
 #include "displayserver_linux.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #ifdef __FreeBSD__
     #include "common/settings.h"
diff --git a/src/detection/displayserver/linux/drm.c b/src/detection/displayserver/linux/drm.c
index 8d970bee2..43c6afcf4 100644
--- a/src/detection/displayserver/linux/drm.c
+++ b/src/detection/displayserver/linux/drm.c
@@ -1,7 +1,7 @@
 #include "displayserver_linux.h"
 #include "common/io.h"
 #include "common/edidHelper.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #ifdef __linux__
     #include <dirent.h>
diff --git a/src/detection/displayserver/linux/wayland/global-output.c b/src/detection/displayserver/linux/wayland/global-output.c
index 7627682d5..51fb42561 100644
--- a/src/detection/displayserver/linux/wayland/global-output.c
+++ b/src/detection/displayserver/linux/wayland/global-output.c
@@ -1,7 +1,7 @@
 #ifdef FF_HAVE_WAYLAND
 
     #include "wayland.h"
-    #include "common/stringUtils.h"
+    #include "common/strutil.h"
     #include "xdg-output-unstable-v1-client-protocol.h"
 
 static void waylandOutputModeListener(void* data, FF_A_UNUSED struct wl_output* output, uint32_t flags, int32_t width, int32_t height, int32_t refreshRate) {
diff --git a/src/detection/displayserver/linux/wayland/wayland.c b/src/detection/displayserver/linux/wayland/wayland.c
index 91b7d4069..064c23907 100644
--- a/src/detection/displayserver/linux/wayland/wayland.c
+++ b/src/detection/displayserver/linux/wayland/wayland.c
@@ -1,7 +1,7 @@
 #include "../displayserver_linux.h"
 #include "common/io.h"
 #include "common/edidHelper.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/detection/displayserver/linux/wayland/wayland.h b/src/detection/displayserver/linux/wayland/wayland.h
index 141b3964d..b103ab934 100644
--- a/src/detection/displayserver/linux/wayland/wayland.h
+++ b/src/detection/displayserver/linux/wayland/wayland.h
@@ -3,7 +3,7 @@
 #ifdef FF_HAVE_WAYLAND
 
     #include "common/library.h"
-    #include "common/stringUtils.h"
+    #include "common/strutil.h"
 
     #include <wayland-client.h>
 
diff --git a/src/detection/displayserver/linux/wmde.c b/src/detection/displayserver/linux/wmde.c
index 135eb1c9d..f0321c8ad 100644
--- a/src/detection/displayserver/linux/wmde.c
+++ b/src/detection/displayserver/linux/wmde.c
@@ -1,7 +1,7 @@
 #include "displayserver_linux.h"
 #include "common/io.h"
 #include "common/properties.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/mallocHelper.h"
 
 #include <stdlib.h>
diff --git a/src/detection/displayserver/linux/xcb.c b/src/detection/displayserver/linux/xcb.c
index e6b5cd07c..8620d7150 100644
--- a/src/detection/displayserver/linux/xcb.c
+++ b/src/detection/displayserver/linux/xcb.c
@@ -6,7 +6,7 @@
     #include "common/properties.h"
     #include "common/edidHelper.h"
     #include "common/mallocHelper.h"
-    #include "common/stringUtils.h"
+    #include "common/strutil.h"
 
     #include <stdlib.h>
     #include <string.h>
diff --git a/src/detection/displayserver/linux/xlib.c b/src/detection/displayserver/linux/xlib.c
index c97308fe8..2beffccab 100644
--- a/src/detection/displayserver/linux/xlib.c
+++ b/src/detection/displayserver/linux/xlib.c
@@ -5,7 +5,7 @@
     #include "common/library.h"
     #include "common/properties.h"
     #include "common/edidHelper.h"
-    #include "common/stringUtils.h"
+    #include "common/strutil.h"
 
     #include <X11/extensions/Xrandr.h>
     #include <X11/Xlib.h>
diff --git a/src/detection/dns/dns_apple.c b/src/detection/dns/dns_apple.c
index 2facd8fc9..e490ffe74 100644
--- a/src/detection/dns/dns_apple.c
+++ b/src/detection/dns/dns_apple.c
@@ -2,7 +2,7 @@
 
 #include "common/io.h"
 #include "common/mallocHelper.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/apple/cf_helpers.h"
 #include "common/debug.h"
 
diff --git a/src/detection/dns/dns_linux.c b/src/detection/dns/dns_linux.c
index 9f1a4429b..41e008cc2 100644
--- a/src/detection/dns/dns_linux.c
+++ b/src/detection/dns/dns_linux.c
@@ -2,7 +2,7 @@
 
 #include "common/io.h"
 #include "common/mallocHelper.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/debug.h"
 
 #ifdef __HAIKU__
diff --git a/src/detection/editor/editor.c b/src/detection/editor/editor.c
index bb586997b..b84f279bb 100644
--- a/src/detection/editor/editor.c
+++ b/src/detection/editor/editor.c
@@ -1,7 +1,7 @@
 #include "editor.h"
 #include "common/processing.h"
 #include "common/library.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/path.h"
 #include "common/binary.h"
 
diff --git a/src/detection/gamepad/gamepad_linux.c b/src/detection/gamepad/gamepad_linux.c
index c55ba7343..6bb4ee214 100644
--- a/src/detection/gamepad/gamepad_linux.c
+++ b/src/detection/gamepad/gamepad_linux.c
@@ -1,6 +1,6 @@
 #include "gamepad.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 static void detectGamepad(FFlist* devices, FFstrbuf* name, FFstrbuf* path) {
     uint32_t baseLen = path->length;
diff --git a/src/detection/gpu/gpu_android.c b/src/detection/gpu/gpu_android.c
index baf8a8d9e..08fd48af2 100644
--- a/src/detection/gpu/gpu_android.c
+++ b/src/detection/gpu/gpu_android.c
@@ -1,6 +1,6 @@
 #include "gpu.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <fcntl.h>
 
diff --git a/src/detection/gpu/gpu_bsd.c b/src/detection/gpu/gpu_bsd.c
index 0d8ca02f6..ae29f46c4 100644
--- a/src/detection/gpu/gpu_bsd.c
+++ b/src/detection/gpu/gpu_bsd.c
@@ -32,7 +32,7 @@ static void fillGPUTypeGeneric(FFGPUResult* gpu) {
 
 #if FF_HAVE_DRM
     #include "common/library.h"
-    #include "common/stringUtils.h"
+    #include "common/strutil.h"
 
     #include <xf86drm.h>
 
diff --git a/src/detection/gpu/gpu_drm.c b/src/detection/gpu/gpu_drm.c
index 2e077ad82..3a7d381a3 100644
--- a/src/detection/gpu/gpu_drm.c
+++ b/src/detection/gpu/gpu_drm.c
@@ -8,7 +8,7 @@
     #include "common/io.h"
     #include "common/library.h"
     #include "common/mallocHelper.h"
-    #include "common/stringUtils.h"
+    #include "common/strutil.h"
 
     #include "intel_drm.h"
     #include "asahi_drm.h"
diff --git a/src/detection/gpu/gpu_linux.c b/src/detection/gpu/gpu_linux.c
index de5093f69..3aaa09cb0 100644
--- a/src/detection/gpu/gpu_linux.c
+++ b/src/detection/gpu/gpu_linux.c
@@ -5,7 +5,7 @@
 #include "common/io.h"
 #include "common/library.h"
 #include "common/FFstrbuf.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/mallocHelper.h"
 #include "modules/gpu/option.h"
 
diff --git a/src/detection/gpu/gpu_sunos.c b/src/detection/gpu/gpu_sunos.c
index f739b6207..13d499815 100644
--- a/src/detection/gpu/gpu_sunos.c
+++ b/src/detection/gpu/gpu_sunos.c
@@ -1,5 +1,5 @@
 #include "gpu.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <libdevinfo.h>
 
diff --git a/src/detection/gtk_qt/qt.c b/src/detection/gtk_qt/qt.c
index 2e0ed0044..26c8b58e2 100644
--- a/src/detection/gtk_qt/qt.c
+++ b/src/detection/gtk_qt/qt.c
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
 #include "common/properties.h"
 #include "common/thread.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
 
diff --git a/src/detection/host/host_mac.c b/src/detection/host/host_mac.c
index 7efa18a9b..d68033263 100644
--- a/src/detection/host/host_mac.c
+++ b/src/detection/host/host_mac.c
@@ -1,5 +1,5 @@
 #include "host.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 const char* ffHostGetMacProductNameWithHwModel(const FFstrbuf* hwModel) {
     // Macbook Pro: https://support.apple.com/en-us/HT201300
diff --git a/src/detection/initsystem/initsystem_haiku.c b/src/detection/initsystem/initsystem_haiku.c
index bae9f851b..04857bca3 100644
--- a/src/detection/initsystem/initsystem_haiku.c
+++ b/src/detection/initsystem/initsystem_haiku.c
@@ -1,5 +1,5 @@
 #include "initsystem.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/haiku/version.h"
 #include "common/io.h"
 
diff --git a/src/detection/initsystem/initsystem_linux.c b/src/detection/initsystem/initsystem_linux.c
index cbce56fed..445657bad 100644
--- a/src/detection/initsystem/initsystem_linux.c
+++ b/src/detection/initsystem/initsystem_linux.c
@@ -1,7 +1,7 @@
 #include "initsystem.h"
 #include "common/processing.h"
 #include "common/binary.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <libgen.h>
 #include <unistd.h>
diff --git a/src/detection/keyboard/keyboard_linux.c b/src/detection/keyboard/keyboard_linux.c
index 343cc57eb..1a29abb01 100644
--- a/src/detection/keyboard/keyboard_linux.c
+++ b/src/detection/keyboard/keyboard_linux.c
@@ -1,6 +1,6 @@
 #include "keyboard.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <linux/input-event-codes.h>
 
diff --git a/src/detection/localip/localip_linux.c b/src/detection/localip/localip_linux.c
index 53fe9fc56..d07ec7696 100644
--- a/src/detection/localip/localip_linux.c
+++ b/src/detection/localip/localip_linux.c
@@ -1,7 +1,7 @@
 #include "localip.h"
 #include "common/io.h"
 #include "common/netif.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/debug.h"
 
 #include <string.h>
diff --git a/src/detection/media/media_linux.c b/src/detection/media/media_linux.c
index d12f1ac03..724e83484 100644
--- a/src/detection/media/media_linux.c
+++ b/src/detection/media/media_linux.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/memrchr.h"
 #include "detection/media/media.h"
 
diff --git a/src/detection/mouse/mouse_linux.c b/src/detection/mouse/mouse_linux.c
index a608f88aa..939c332a1 100644
--- a/src/detection/mouse/mouse_linux.c
+++ b/src/detection/mouse/mouse_linux.c
@@ -1,6 +1,6 @@
 #include "mouse.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 const char* ffDetectMouse(FFlist* devices /* List of FFMouseDevice */) {
     FF_AUTO_CLOSE_DIR DIR* dirp = opendir("/sys/class/input/");
diff --git a/src/detection/netio/netio_linux.c b/src/detection/netio/netio_linux.c
index aa48c0114..5870d3f43 100644
--- a/src/detection/netio/netio_linux.c
+++ b/src/detection/netio/netio_linux.c
@@ -2,7 +2,7 @@
 
 #include "common/io.h"
 #include "common/netif.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <fcntl.h>
 #include <net/if.h>
diff --git a/src/detection/netio/netio_sunos.c b/src/detection/netio/netio_sunos.c
index 553634a33..3789e4528 100644
--- a/src/detection/netio/netio_sunos.c
+++ b/src/detection/netio/netio_sunos.c
@@ -1,6 +1,6 @@
 #include "netio.h"
 #include "common/netif.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <kstat.h>
 
diff --git a/src/detection/opencl/opencl.c b/src/detection/opencl/opencl.c
index 880eb7e01..14216ac09 100644
--- a/src/detection/opencl/opencl.c
+++ b/src/detection/opencl/opencl.c
@@ -9,7 +9,7 @@
 
     #include "common/library.h"
     #include "common/parsing.h"
-    #include "common/stringUtils.h"
+    #include "common/strutil.h"
     #include <string.h>
 
     #define CL_TARGET_OPENCL_VERSION 110
diff --git a/src/detection/os/os_apple.m b/src/detection/os/os_apple.m
index e3201908c..2890fc31a 100644
--- a/src/detection/os/os_apple.m
+++ b/src/detection/os/os_apple.m
@@ -1,7 +1,7 @@
 #include "os.h"
 #include "common/io.h"
 #include "common/sysctl.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/mallocHelper.h"
 
 #include <stdlib.h>
diff --git a/src/detection/os/os_linux.c b/src/detection/os/os_linux.c
index f6223e5ca..fc653a3c6 100644
--- a/src/detection/os/os_linux.c
+++ b/src/detection/os/os_linux.c
@@ -3,7 +3,7 @@
 #include "common/parsing.h"
 #include "common/io.h"
 #include "common/processing.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/detection/os/os_windows.c b/src/detection/os/os_windows.c
index 12e51bbea..2f280c842 100644
--- a/src/detection/os/os_windows.c
+++ b/src/detection/os/os_windows.c
@@ -1,5 +1,5 @@
 #include "os.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/windows/registry.h"
 #include "common/windows/unicode.h"
 
diff --git a/src/detection/packages/packages_apple.c b/src/detection/packages/packages_apple.c
index 83ccaf047..fd268868c 100644
--- a/src/detection/packages/packages_apple.c
+++ b/src/detection/packages/packages_apple.c
@@ -2,7 +2,7 @@
 #include "common/io.h"
 #include "common/parsing.h"
 #include "common/processing.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 static void countBrewPackages(FFstrbuf* baseDir, FFPackagesResult* result) {
     uint32_t baseDirLength = baseDir->length;
diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c
index 98a01b23a..0f42f8a6b 100644
--- a/src/detection/packages/packages_linux.c
+++ b/src/detection/packages/packages_linux.c
@@ -3,7 +3,7 @@
 #include "common/parsing.h"
 #include "common/properties.h"
 #include "common/settings.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/os/os.h"
 
 static uint32_t getNumElements(FFstrbuf* baseDir, const char* dirname, bool isdir) {
diff --git a/src/detection/packages/packages_nix.c b/src/detection/packages/packages_nix.c
index 95a27e5a2..d1cc2647e 100644
--- a/src/detection/packages/packages_nix.c
+++ b/src/detection/packages/packages_nix.c
@@ -1,7 +1,7 @@
 #include "packages.h"
 #include "common/io.h"
 #include "common/processing.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 static bool isValidNixPkg(FFstrbuf* pkg) {
     if (!ffPathExists(pkg->chars, FF_PATHTYPE_DIRECTORY)) {
diff --git a/src/detection/packages/packages_windows.c b/src/detection/packages/packages_windows.c
index 4023a92e0..3bf4dfa72 100644
--- a/src/detection/packages/packages_windows.c
+++ b/src/detection/packages/packages_windows.c
@@ -1,6 +1,6 @@
 #include "packages.h"
 #include "common/processing.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/path.h"
 #include "common/windows/unicode.h"
 #include "common/mallocHelper.h"
diff --git a/src/detection/physicaldisk/physicaldisk_bsd.c b/src/detection/physicaldisk/physicaldisk_bsd.c
index eda060905..5a877681f 100644
--- a/src/detection/physicaldisk/physicaldisk_bsd.c
+++ b/src/detection/physicaldisk/physicaldisk_bsd.c
@@ -2,7 +2,7 @@
 
 #if __has_include(<libgeom.h>)
 
-    #include "common/stringUtils.h"
+    #include "common/strutil.h"
 
     #include <devstat.h>
     #include <memory.h>
diff --git a/src/detection/physicaldisk/physicaldisk_haiku.c b/src/detection/physicaldisk/physicaldisk_haiku.c
index 89799a2e1..e44ddced1 100644
--- a/src/detection/physicaldisk/physicaldisk_haiku.c
+++ b/src/detection/physicaldisk/physicaldisk_haiku.c
@@ -1,7 +1,7 @@
 #include "physicaldisk.h"
 
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <OS.h>
 #include <StorageDefs.h>
diff --git a/src/detection/physicaldisk/physicaldisk_linux.c b/src/detection/physicaldisk/physicaldisk_linux.c
index c06f8dc42..f8126b96a 100644
--- a/src/detection/physicaldisk/physicaldisk_linux.c
+++ b/src/detection/physicaldisk/physicaldisk_linux.c
@@ -1,7 +1,7 @@
 #include "physicaldisk.h"
 #include "common/io.h"
 #include "common/properties.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/src/detection/physicaldisk/physicaldisk_sunos.c b/src/detection/physicaldisk/physicaldisk_sunos.c
index 93952c295..d929d5a23 100644
--- a/src/detection/physicaldisk/physicaldisk_sunos.c
+++ b/src/detection/physicaldisk/physicaldisk_sunos.c
@@ -1,5 +1,5 @@
 #include "physicaldisk.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "sys/scsi/generic/inquiry.h"
 
 #include <libdevinfo.h>
diff --git a/src/detection/physicalmemory/physicalmemory_apple.m b/src/detection/physicalmemory/physicalmemory_apple.m
index b9d2c267e..e35f53863 100644
--- a/src/detection/physicalmemory/physicalmemory_apple.m
+++ b/src/detection/physicalmemory/physicalmemory_apple.m
@@ -1,7 +1,7 @@
 #include "physicalmemory.h"
 #include "common/processing.h"
 #include "common/smbios.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/apple/cf_helpers.h"
 
 #import <Foundation/Foundation.h>
diff --git a/src/detection/poweradapter/poweradapter_linux.c b/src/detection/poweradapter/poweradapter_linux.c
index 747e5b42a..fb555d538 100644
--- a/src/detection/poweradapter/poweradapter_linux.c
+++ b/src/detection/poweradapter/poweradapter_linux.c
@@ -1,6 +1,6 @@
 #include "poweradapter.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <dirent.h>
 #include <unistd.h>
diff --git a/src/detection/processes/processes_linux.c b/src/detection/processes/processes_linux.c
index 6b7b46855..dee8c0951 100644
--- a/src/detection/processes/processes_linux.c
+++ b/src/detection/processes/processes_linux.c
@@ -1,7 +1,7 @@
 #include "processes.h"
 
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 const char* ffDetectProcesses(uint32_t* result) {
     FF_AUTO_CLOSE_DIR DIR* dir = opendir("/proc");
diff --git a/src/detection/sound/sound_haiku.cpp b/src/detection/sound/sound_haiku.cpp
index 8cb3814c3..d69602e02 100644
--- a/src/detection/sound/sound_haiku.cpp
+++ b/src/detection/sound/sound_haiku.cpp
@@ -1,6 +1,6 @@
 extern "C" {
 #include "sound.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 }
 #include <MediaAddOn.h>
 #include <MediaNode.h>
diff --git a/src/detection/sound/sound_obsd.c b/src/detection/sound/sound_obsd.c
index 0d9d7fea4..a6dd6df40 100644
--- a/src/detection/sound/sound_obsd.c
+++ b/src/detection/sound/sound_obsd.c
@@ -1,5 +1,5 @@
 #include "sound.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <fcntl.h>
 #include <sndio.h>
diff --git a/src/detection/sound/sound_sunos.c b/src/detection/sound/sound_sunos.c
index be3e9739a..7c84e55cb 100644
--- a/src/detection/sound/sound_sunos.c
+++ b/src/detection/sound/sound_sunos.c
@@ -1,6 +1,6 @@
 #include "sound.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/detection/terminalfont/terminalfont.c b/src/detection/terminalfont/terminalfont.c
index 0bf1db654..7ef71206a 100644
--- a/src/detection/terminalfont/terminalfont.c
+++ b/src/detection/terminalfont/terminalfont.c
@@ -3,7 +3,7 @@
 #include "common/properties.h"
 #include "common/processing.h"
 #include "common/debug.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/terminalshell/terminalshell.h"
 
 static void detectAlacritty(FFTerminalFontResult* terminalFont) {
diff --git a/src/detection/terminalfont/terminalfont_linux.c b/src/detection/terminalfont/terminalfont_linux.c
index 8dd1533dc..bfc8959dc 100644
--- a/src/detection/terminalfont/terminalfont_linux.c
+++ b/src/detection/terminalfont/terminalfont_linux.c
@@ -6,7 +6,7 @@
 #include "common/io.h"
 #include "common/processing.h"
 #include "common/mallocHelper.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/binary.h"
 #include "detection/terminalshell/terminalshell.h"
 #include "detection/displayserver/displayserver.h"
diff --git a/src/detection/terminalfont/terminalfont_windows.c b/src/detection/terminalfont/terminalfont_windows.c
index cfb786522..87566af8d 100644
--- a/src/detection/terminalfont/terminalfont_windows.c
+++ b/src/detection/terminalfont/terminalfont_windows.c
@@ -5,7 +5,7 @@
 #include "common/properties.h"
 #include "common/windows/unicode.h"
 #include "common/windows/registry.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/terminalshell/terminalshell.h"
 #include "terminalfont.h"
 
diff --git a/src/detection/terminalshell/terminalshell.c b/src/detection/terminalshell/terminalshell.c
index c6733b2c3..d51bc465f 100644
--- a/src/detection/terminalshell/terminalshell.c
+++ b/src/detection/terminalshell/terminalshell.c
@@ -3,7 +3,7 @@
 #include "common/processing.h"
 #include "common/properties.h"
 #include "common/path.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/binary.h"
 
 #include <ctype.h>
diff --git a/src/detection/terminalshell/terminalshell_linux.c b/src/detection/terminalshell/terminalshell_linux.c
index 9c99c8be9..bb5cd586c 100644
--- a/src/detection/terminalshell/terminalshell_linux.c
+++ b/src/detection/terminalshell/terminalshell_linux.c
@@ -3,7 +3,7 @@
 #include "common/parsing.h"
 #include "common/processing.h"
 #include "common/thread.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/detection/terminalshell/terminalshell_windows.c b/src/detection/terminalshell/terminalshell_windows.c
index 263692996..978103b0b 100644
--- a/src/detection/terminalshell/terminalshell_windows.c
+++ b/src/detection/terminalshell/terminalshell_windows.c
@@ -7,7 +7,7 @@
 #include "common/windows/unicode.h"
 #include "common/windows/version.h"
 #include "common/windows/nt.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <stdalign.h>
 #include <windows.h>
diff --git a/src/detection/terminaltheme/terminaltheme.c b/src/detection/terminaltheme/terminaltheme.c
index 5be3c2068..e609754d7 100644
--- a/src/detection/terminaltheme/terminaltheme.c
+++ b/src/detection/terminaltheme/terminaltheme.c
@@ -1,6 +1,6 @@
 #include "terminaltheme.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <inttypes.h>
 
diff --git a/src/detection/vulkan/vulkan.c b/src/detection/vulkan/vulkan.c
index 001966de9..013c45726 100644
--- a/src/detection/vulkan/vulkan.c
+++ b/src/detection/vulkan/vulkan.c
@@ -7,7 +7,7 @@
     #include "common/library.h"
     #include "common/io.h"
     #include "common/parsing.h"
-    #include "common/stringUtils.h"
+    #include "common/strutil.h"
 
     #include <stdlib.h>
     #include <vulkan/vulkan.h>
diff --git a/src/detection/wifi/wifi_apple.m b/src/detection/wifi/wifi_apple.m
index 21411335e..21808e03d 100644
--- a/src/detection/wifi/wifi_apple.m
+++ b/src/detection/wifi/wifi_apple.m
@@ -1,6 +1,6 @@
 #include "wifi.h"
 #include "common/processing.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #import <CoreWLAN/CoreWLAN.h>
 
diff --git a/src/detection/wifi/wifi_bsd.c b/src/detection/wifi/wifi_bsd.c
index 865a0a80f..fab1293bc 100644
--- a/src/detection/wifi/wifi_bsd.c
+++ b/src/detection/wifi/wifi_bsd.c
@@ -1,6 +1,6 @@
 #include "wifi.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <sys/ioctl.h>
 #include <sys/socket.h>
diff --git a/src/detection/wifi/wifi_linux.c b/src/detection/wifi/wifi_linux.c
index 87e226715..6f761590d 100644
--- a/src/detection/wifi/wifi_linux.c
+++ b/src/detection/wifi/wifi_linux.c
@@ -1,7 +1,7 @@
 #include "wifi.h"
 #include "common/io.h"
 #include "common/debug.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/src/detection/wifi/wifi_nbsd.c b/src/detection/wifi/wifi_nbsd.c
index b7dbe131e..52897c487 100644
--- a/src/detection/wifi/wifi_nbsd.c
+++ b/src/detection/wifi/wifi_nbsd.c
@@ -1,6 +1,6 @@
 #include "wifi.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #define COMPAT_FREEBSD_NET80211 1
 #include <sys/ioctl.h>
diff --git a/src/detection/wifi/wifi_obsd.c b/src/detection/wifi/wifi_obsd.c
index 2fa4cd75c..f686231b3 100644
--- a/src/detection/wifi/wifi_obsd.c
+++ b/src/detection/wifi/wifi_obsd.c
@@ -1,6 +1,6 @@
 #include "wifi.h"
 #include "common/io.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 #include <sys/ioctl.h>
 #include <sys/socket.h>
diff --git a/src/detection/wm/wm_apple.m b/src/detection/wm/wm_apple.m
index 0db5eba1b..89273e939 100644
--- a/src/detection/wm/wm_apple.m
+++ b/src/detection/wm/wm_apple.m
@@ -2,7 +2,7 @@
 
 #include "common/sysctl.h"
 #include "common/mallocHelper.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/apple/version.h"
 
 #include <ctype.h>
diff --git a/src/detection/wm/wm_linux.c b/src/detection/wm/wm_linux.c
index da4fc68bc..1ca1c91d9 100644
--- a/src/detection/wm/wm_linux.c
+++ b/src/detection/wm/wm_linux.c
@@ -4,7 +4,7 @@
 #include "common/io.h"
 #include "common/binary.h"
 #include "common/path.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/debug.h"
 
 const char* ffDetectWMPlugin(FF_A_UNUSED FFstrbuf* pluginName) {
diff --git a/src/detection/wmtheme/wmtheme_linux.c b/src/detection/wmtheme/wmtheme_linux.c
index 685ba5f5e..fdc1fe6a4 100644
--- a/src/detection/wmtheme/wmtheme_linux.c
+++ b/src/detection/wmtheme/wmtheme_linux.c
@@ -3,7 +3,7 @@
 #include "common/properties.h"
 #include "common/parsing.h"
 #include "common/settings.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/mallocHelper.h"
 #include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
diff --git a/src/fastfetch.c b/src/fastfetch.c
index f8cdb5584..a82d853eb 100644
--- a/src/fastfetch.c
+++ b/src/fastfetch.c
@@ -7,7 +7,7 @@
 #include "common/io.h"
 #include "common/jsonconfig.h"
 #include "common/time.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/mallocHelper.h"
 #include "fastfetch_datatext.h"
 
diff --git a/src/logo/image/image.c b/src/logo/image/image.c
index 60dc77741..78083e68e 100644
--- a/src/logo/image/image.c
+++ b/src/logo/image/image.c
@@ -2,7 +2,7 @@
 #include "common/io.h"
 #include "common/printing.h"
 #include "common/processing.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/base64.h"
 #include "detection/terminalsize/terminalsize.h"
 
diff --git a/src/logo/logo.c b/src/logo/logo.c
index 9dad028ef..f708bdb92 100644
--- a/src/logo/logo.c
+++ b/src/logo/logo.c
@@ -3,7 +3,7 @@
 #include "common/printing.h"
 #include "common/processing.h"
 #include "common/textModifier.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/media/media.h"
 #include "detection/os/os.h"
 #include "detection/terminalshell/terminalshell.h"
diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c
index f59375c9c..61cef84bb 100644
--- a/src/modules/battery/battery.c
+++ b/src/modules/battery/battery.c
@@ -3,7 +3,7 @@
 #include "common/percent.h"
 #include "common/duration.h"
 #include "common/temps.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/battery/battery.h"
 #include "modules/battery/battery.h"
 
diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c
index 34ba73840..8f8700ff1 100644
--- a/src/modules/bios/bios.c
+++ b/src/modules/bios/bios.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/bios/bios.h"
 #include "modules/bios/bios.h"
 
diff --git a/src/modules/bluetooth/bluetooth.c b/src/modules/bluetooth/bluetooth.c
index b771c3095..641acebdc 100644
--- a/src/modules/bluetooth/bluetooth.c
+++ b/src/modules/bluetooth/bluetooth.c
@@ -1,7 +1,7 @@
 #include "common/percent.h"
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/bluetooth/bluetooth.h"
 #include "modules/bluetooth/bluetooth.h"
 
diff --git a/src/modules/bluetoothradio/bluetoothradio.c b/src/modules/bluetoothradio/bluetoothradio.c
index d3b9f1745..713931ab9 100644
--- a/src/modules/bluetoothradio/bluetoothradio.c
+++ b/src/modules/bluetoothradio/bluetoothradio.c
@@ -1,7 +1,7 @@
 #include "common/percent.h"
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/bluetoothradio/bluetoothradio.h"
 #include "modules/bluetoothradio/bluetoothradio.h"
 
diff --git a/src/modules/board/board.c b/src/modules/board/board.c
index 3723ad7a8..a0801a274 100644
--- a/src/modules/board/board.c
+++ b/src/modules/board/board.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/board/board.h"
 #include "modules/board/board.h"
 
diff --git a/src/modules/bootmgr/bootmgr.c b/src/modules/bootmgr/bootmgr.c
index b5fcfcc20..f44d67a8d 100644
--- a/src/modules/bootmgr/bootmgr.c
+++ b/src/modules/bootmgr/bootmgr.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/bootmgr/bootmgr.h"
 #include "modules/bootmgr/bootmgr.h"
 
diff --git a/src/modules/brightness/brightness.c b/src/modules/brightness/brightness.c
index 9f440c476..54bb98940 100644
--- a/src/modules/brightness/brightness.c
+++ b/src/modules/brightness/brightness.c
@@ -1,7 +1,7 @@
 #include "common/percent.h"
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/brightness/brightness.h"
 #include "modules/brightness/brightness.h"
 
diff --git a/src/modules/btrfs/btrfs.c b/src/modules/btrfs/btrfs.c
index 30cadd346..238d17767 100644
--- a/src/modules/btrfs/btrfs.c
+++ b/src/modules/btrfs/btrfs.c
@@ -2,7 +2,7 @@
 #include "common/jsonconfig.h"
 #include "common/percent.h"
 #include "common/size.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/btrfs/btrfs.h"
 #include "modules/btrfs/btrfs.h"
 
diff --git a/src/modules/camera/camera.c b/src/modules/camera/camera.c
index fbabfa329..7067bbc2f 100644
--- a/src/modules/camera/camera.c
+++ b/src/modules/camera/camera.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/libc/libc.h"
 #include "detection/camera/camera.h"
 #include "modules/camera/camera.h"
diff --git a/src/modules/chassis/chassis.c b/src/modules/chassis/chassis.c
index fc00dd944..d944baa44 100644
--- a/src/modules/chassis/chassis.c
+++ b/src/modules/chassis/chassis.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/chassis/chassis.h"
 #include "modules/chassis/chassis.h"
 
diff --git a/src/modules/colors/colors.c b/src/modules/colors/colors.c
index 168fc0fe7..ff821d12f 100644
--- a/src/modules/colors/colors.c
+++ b/src/modules/colors/colors.c
@@ -2,7 +2,7 @@
 #include "common/jsonconfig.h"
 #include "common/textModifier.h"
 #include "common/color.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "logo/logo.h"
 #include "modules/colors/colors.h"
 
diff --git a/src/modules/cpucache/cpucache.c b/src/modules/cpucache/cpucache.c
index 0224a21e7..7263a5160 100644
--- a/src/modules/cpucache/cpucache.c
+++ b/src/modules/cpucache/cpucache.c
@@ -1,7 +1,7 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
 #include "common/size.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/cpucache/cpucache.h"
 #include "modules/cpucache/cpucache.h"
 
diff --git a/src/modules/cpuusage/cpuusage.c b/src/modules/cpuusage/cpuusage.c
index 83ea0887a..5c01e914a 100644
--- a/src/modules/cpuusage/cpuusage.c
+++ b/src/modules/cpuusage/cpuusage.c
@@ -1,7 +1,7 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
 #include "common/percent.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/cpuusage/cpuusage.h"
 #include "modules/cpuusage/cpuusage.h"
 
diff --git a/src/modules/cursor/cursor.c b/src/modules/cursor/cursor.c
index e99a9b612..0b6f6c735 100644
--- a/src/modules/cursor/cursor.c
+++ b/src/modules/cursor/cursor.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/cursor/cursor.h"
 #include "modules/cursor/cursor.h"
 
diff --git a/src/modules/custom/custom.c b/src/modules/custom/custom.c
index 036921553..054f3704c 100644
--- a/src/modules/custom/custom.c
+++ b/src/modules/custom/custom.c
@@ -1,7 +1,7 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
 #include "common/textModifier.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "modules/custom/custom.h"
 
 bool ffPrintCustom(FFCustomOptions* options) {
diff --git a/src/modules/datetime/datetime.c b/src/modules/datetime/datetime.c
index be1188a10..e902fff42 100644
--- a/src/modules/datetime/datetime.c
+++ b/src/modules/datetime/datetime.c
@@ -1,7 +1,7 @@
 #include "common/time.h"
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "modules/datetime/datetime.h"
 
 #include <time.h>
diff --git a/src/modules/de/de.c b/src/modules/de/de.c
index e3b50ac81..d66d20528 100644
--- a/src/modules/de/de.c
+++ b/src/modules/de/de.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/displayserver/displayserver.h"
 #include "detection/de/de.h"
 #include "modules/de/de.h"
diff --git a/src/modules/diskio/diskio.c b/src/modules/diskio/diskio.c
index f008db01a..3ff31fad4 100644
--- a/src/modules/diskio/diskio.c
+++ b/src/modules/diskio/diskio.c
@@ -1,7 +1,7 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
 #include "common/size.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/diskio/diskio.h"
 #include "modules/diskio/diskio.h"
 
diff --git a/src/modules/display/display.c b/src/modules/display/display.c
index 07b5356ba..b11a2aabc 100644
--- a/src/modules/display/display.c
+++ b/src/modules/display/display.c
@@ -1,7 +1,7 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
 #include "common/size.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/displayserver/displayserver.h"
 #include "modules/display/display.h"
 
diff --git a/src/modules/dns/dns.c b/src/modules/dns/dns.c
index 7612fcac9..d7c90c4d8 100644
--- a/src/modules/dns/dns.c
+++ b/src/modules/dns/dns.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/dns/dns.h"
 #include "modules/dns/dns.h"
 
diff --git a/src/modules/editor/editor.c b/src/modules/editor/editor.c
index 1e0c20c32..23b19372a 100644
--- a/src/modules/editor/editor.c
+++ b/src/modules/editor/editor.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/libc/libc.h"
 #include "detection/editor/editor.h"
 #include "modules/editor/editor.h"
diff --git a/src/modules/font/font.c b/src/modules/font/font.c
index 6994c693e..a32a7e80c 100644
--- a/src/modules/font/font.c
+++ b/src/modules/font/font.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/font/font.h"
 #include "modules/font/font.h"
 
diff --git a/src/modules/gamepad/gamepad.c b/src/modules/gamepad/gamepad.c
index a9e1d2035..d34dcca85 100644
--- a/src/modules/gamepad/gamepad.c
+++ b/src/modules/gamepad/gamepad.c
@@ -1,7 +1,7 @@
 #include "common/percent.h"
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/gamepad/gamepad.h"
 #include "modules/gamepad/gamepad.h"
 
diff --git a/src/modules/gpu/gpu.c b/src/modules/gpu/gpu.c
index 64705926b..b0ace2000 100644
--- a/src/modules/gpu/gpu.c
+++ b/src/modules/gpu/gpu.c
@@ -4,7 +4,7 @@
 #include "common/temps.h"
 #include "common/size.h"
 #include "common/frequency.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/host/host.h"
 #include "detection/gpu/gpu.h"
 #include "modules/gpu/gpu.h"
diff --git a/src/modules/host/host.c b/src/modules/host/host.c
index b22673a12..2a53cd398 100644
--- a/src/modules/host/host.c
+++ b/src/modules/host/host.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/host/host.h"
 #include "modules/host/host.h"
 
diff --git a/src/modules/icons/icons.c b/src/modules/icons/icons.c
index af73954f9..d3764ad07 100644
--- a/src/modules/icons/icons.c
+++ b/src/modules/icons/icons.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/icons/icons.h"
 #include "modules/icons/icons.h"
 
diff --git a/src/modules/initsystem/initsystem.c b/src/modules/initsystem/initsystem.c
index 957dafeda..3c3f3677e 100644
--- a/src/modules/initsystem/initsystem.c
+++ b/src/modules/initsystem/initsystem.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/initsystem/initsystem.h"
 #include "modules/initsystem/initsystem.h"
 
diff --git a/src/modules/kernel/kernel.c b/src/modules/kernel/kernel.c
index 102c45469..c405cbfa4 100644
--- a/src/modules/kernel/kernel.c
+++ b/src/modules/kernel/kernel.c
@@ -1,7 +1,7 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
 #include "common/size.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "modules/kernel/kernel.h"
 
 bool ffPrintKernel(FFKernelOptions* options) {
diff --git a/src/modules/keyboard/keyboard.c b/src/modules/keyboard/keyboard.c
index b28e8d688..09c3cd5a3 100644
--- a/src/modules/keyboard/keyboard.c
+++ b/src/modules/keyboard/keyboard.c
@@ -1,7 +1,7 @@
 #include "common/percent.h"
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/keyboard/keyboard.h"
 #include "modules/keyboard/keyboard.h"
 
diff --git a/src/modules/lm/lm.c b/src/modules/lm/lm.c
index 40f252221..a1317d285 100644
--- a/src/modules/lm/lm.c
+++ b/src/modules/lm/lm.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/lm/lm.h"
 #include "modules/lm/lm.h"
 
diff --git a/src/modules/loadavg/loadavg.c b/src/modules/loadavg/loadavg.c
index d384eaaf2..32ced1261 100644
--- a/src/modules/loadavg/loadavg.c
+++ b/src/modules/loadavg/loadavg.c
@@ -1,7 +1,7 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
 #include "common/percent.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/loadavg/loadavg.h"
 #include "detection/cpu/cpu.h"
 #include "modules/loadavg/loadavg.h"
diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c
index e73e2c5ed..ef4a110cd 100644
--- a/src/modules/localip/localip.c
+++ b/src/modules/localip/localip.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/localip/localip.h"
 #include "modules/localip/localip.h"
 
diff --git a/src/modules/memory/memory.c b/src/modules/memory/memory.c
index 34b9ac61d..4fbdf75fb 100644
--- a/src/modules/memory/memory.c
+++ b/src/modules/memory/memory.c
@@ -2,7 +2,7 @@
 #include "common/jsonconfig.h"
 #include "common/percent.h"
 #include "common/size.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/memory/memory.h"
 #include "modules/memory/memory.h"
 
diff --git a/src/modules/monitor/monitor.c b/src/modules/monitor/monitor.c
index a88532ecd..105ee67c6 100644
--- a/src/modules/monitor/monitor.c
+++ b/src/modules/monitor/monitor.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/displayserver/displayserver.h"
 #include "modules/monitor/monitor.h"
 
diff --git a/src/modules/mouse/mouse.c b/src/modules/mouse/mouse.c
index c3856c9ec..abc467832 100644
--- a/src/modules/mouse/mouse.c
+++ b/src/modules/mouse/mouse.c
@@ -1,7 +1,7 @@
 #include "common/percent.h"
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/mouse/mouse.h"
 #include "modules/mouse/mouse.h"
 
diff --git a/src/modules/netio/netio.c b/src/modules/netio/netio.c
index 00d58dffa..17047fffd 100644
--- a/src/modules/netio/netio.c
+++ b/src/modules/netio/netio.c
@@ -1,7 +1,7 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
 #include "common/size.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/netio/netio.h"
 #include "modules/netio/netio.h"
 
diff --git a/src/modules/opencl/opencl.c b/src/modules/opencl/opencl.c
index 1ba5bf358..d69b3fe79 100644
--- a/src/modules/opencl/opencl.c
+++ b/src/modules/opencl/opencl.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/opencl/opencl.h"
 #include "detection/gpu/gpu.h"
 #include "modules/opencl/opencl.h"
diff --git a/src/modules/opengl/opengl.c b/src/modules/opengl/opengl.c
index 4ce2313a4..0754cb20c 100644
--- a/src/modules/opengl/opengl.c
+++ b/src/modules/opengl/opengl.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/opengl/opengl.h"
 #include "modules/opengl/opengl.h"
 
diff --git a/src/modules/os/os.c b/src/modules/os/os.c
index 6744fbe8c..e402699b0 100644
--- a/src/modules/os/os.c
+++ b/src/modules/os/os.c
@@ -1,7 +1,7 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
 #include "common/option.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/os/os.h"
 #include "modules/os/os.h"
 
diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c
index a0012047a..dc8e0be56 100644
--- a/src/modules/packages/packages.c
+++ b/src/modules/packages/packages.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/packages/packages.h"
 #include "modules/packages/packages.h"
 
diff --git a/src/modules/player/player.c b/src/modules/player/player.c
index 8391e4a53..58d1b3b00 100644
--- a/src/modules/player/player.c
+++ b/src/modules/player/player.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/media/media.h"
 #include "modules/player/player.h"
 
diff --git a/src/modules/poweradapter/poweradapter.c b/src/modules/poweradapter/poweradapter.c
index 03d405372..2e70c000d 100644
--- a/src/modules/poweradapter/poweradapter.c
+++ b/src/modules/poweradapter/poweradapter.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/poweradapter/poweradapter.h"
 #include "modules/poweradapter/poweradapter.h"
 
diff --git a/src/modules/processes/processes.c b/src/modules/processes/processes.c
index 0a3c1329b..44ab59d4d 100644
--- a/src/modules/processes/processes.c
+++ b/src/modules/processes/processes.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/processes/processes.h"
 #include "modules/processes/processes.h"
 
diff --git a/src/modules/publicip/publicip.c b/src/modules/publicip/publicip.c
index 8e9aee277..552173395 100644
--- a/src/modules/publicip/publicip.c
+++ b/src/modules/publicip/publicip.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "modules/publicip/publicip.h"
 #include "detection/publicip/publicip.h"
 
diff --git a/src/modules/separator/separator.c b/src/modules/separator/separator.c
index 402ccb65c..4c5b4bc92 100644
--- a/src/modules/separator/separator.c
+++ b/src/modules/separator/separator.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/textModifier.h"
 #include "logo/logo.h"
 #include "modules/separator/separator.h"
diff --git a/src/modules/shell/shell.c b/src/modules/shell/shell.c
index 59f55d6f3..f18c1bfd8 100644
--- a/src/modules/shell/shell.c
+++ b/src/modules/shell/shell.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/terminalshell/terminalshell.h"
 #include "modules/shell/shell.h"
 
diff --git a/src/modules/sound/sound.c b/src/modules/sound/sound.c
index f4d47be74..bf37c1f1b 100644
--- a/src/modules/sound/sound.c
+++ b/src/modules/sound/sound.c
@@ -1,7 +1,7 @@
 #include "common/percent.h"
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/sound/sound.h"
 #include "modules/sound/sound.h"
 
diff --git a/src/modules/swap/swap.c b/src/modules/swap/swap.c
index a612b413d..78af47558 100644
--- a/src/modules/swap/swap.c
+++ b/src/modules/swap/swap.c
@@ -2,7 +2,7 @@
 #include "common/jsonconfig.h"
 #include "common/percent.h"
 #include "common/size.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/swap/swap.h"
 #include "modules/swap/swap.h"
 
diff --git a/src/modules/terminal/terminal.c b/src/modules/terminal/terminal.c
index 1a6308cd1..8dc6f4c4b 100644
--- a/src/modules/terminal/terminal.c
+++ b/src/modules/terminal/terminal.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/terminalshell/terminalshell.h"
 #include "modules/terminal/terminal.h"
 
diff --git a/src/modules/terminalfont/terminalfont.c b/src/modules/terminalfont/terminalfont.c
index 883abd8c1..91e45c747 100644
--- a/src/modules/terminalfont/terminalfont.c
+++ b/src/modules/terminalfont/terminalfont.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/terminalfont/terminalfont.h"
 #include "modules/terminalfont/terminalfont.h"
 
diff --git a/src/modules/terminalsize/terminalsize.c b/src/modules/terminalsize/terminalsize.c
index c83d9580d..4a7c555ad 100644
--- a/src/modules/terminalsize/terminalsize.c
+++ b/src/modules/terminalsize/terminalsize.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/terminalsize/terminalsize.h"
 #include "modules/terminalsize/terminalsize.h"
 
diff --git a/src/modules/terminaltheme/terminaltheme.c b/src/modules/terminaltheme/terminaltheme.c
index 6455d9ff0..80bcd2950 100644
--- a/src/modules/terminaltheme/terminaltheme.c
+++ b/src/modules/terminaltheme/terminaltheme.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/terminaltheme/terminaltheme.h"
 #include "modules/terminaltheme/terminaltheme.h"
 
diff --git a/src/modules/theme/theme.c b/src/modules/theme/theme.c
index d11c3bc70..70cb778ab 100644
--- a/src/modules/theme/theme.c
+++ b/src/modules/theme/theme.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/theme/theme.h"
 #include "modules/theme/theme.h"
 
diff --git a/src/modules/tpm/tpm.c b/src/modules/tpm/tpm.c
index c9196d8da..ecdd38609 100644
--- a/src/modules/tpm/tpm.c
+++ b/src/modules/tpm/tpm.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/tpm/tpm.h"
 #include "modules/tpm/tpm.h"
 
diff --git a/src/modules/uptime/uptime.c b/src/modules/uptime/uptime.c
index 8d7b95492..e096bfc2f 100644
--- a/src/modules/uptime/uptime.c
+++ b/src/modules/uptime/uptime.c
@@ -2,7 +2,7 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
 #include "common/time.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/uptime/uptime.h"
 #include "modules/uptime/uptime.h"
 
diff --git a/src/modules/users/users.c b/src/modules/users/users.c
index d0c608383..5575bbeaa 100644
--- a/src/modules/users/users.c
+++ b/src/modules/users/users.c
@@ -1,7 +1,7 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
 #include "common/time.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/users/users.h"
 #include "modules/users/users.h"
 
diff --git a/src/modules/version/version.c b/src/modules/version/version.c
index c4f3a5c38..dcc4bbef1 100644
--- a/src/modules/version/version.c
+++ b/src/modules/version/version.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/libc/libc.h"
 #include "detection/version/version.h"
 #include "modules/version/version.h"
diff --git a/src/modules/vulkan/vulkan.c b/src/modules/vulkan/vulkan.c
index 73b1a3042..9ecbd32cf 100644
--- a/src/modules/vulkan/vulkan.c
+++ b/src/modules/vulkan/vulkan.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/gpu/gpu.h"
 #include "detection/vulkan/vulkan.h"
 #include "modules/vulkan/vulkan.h"
diff --git a/src/modules/wallpaper/wallpaper.c b/src/modules/wallpaper/wallpaper.c
index 159684c30..a4d17c01a 100644
--- a/src/modules/wallpaper/wallpaper.c
+++ b/src/modules/wallpaper/wallpaper.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/wallpaper/wallpaper.h"
 #include "modules/wallpaper/wallpaper.h"
 
diff --git a/src/modules/weather/weather.c b/src/modules/weather/weather.c
index c0bc39373..6c156929d 100644
--- a/src/modules/weather/weather.c
+++ b/src/modules/weather/weather.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/weather/weather.h"
 #include "modules/weather/weather.h"
 
diff --git a/src/modules/wifi/wifi.c b/src/modules/wifi/wifi.c
index 26284a32b..42485dce6 100644
--- a/src/modules/wifi/wifi.c
+++ b/src/modules/wifi/wifi.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/wifi/wifi.h"
 #include "modules/wifi/wifi.h"
 
diff --git a/src/modules/wm/wm.c b/src/modules/wm/wm.c
index bb0ff1da0..5ec66463b 100644
--- a/src/modules/wm/wm.c
+++ b/src/modules/wm/wm.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/displayserver/displayserver.h"
 #include "detection/wm/wm.h"
 #include "modules/wm/wm.h"
diff --git a/src/modules/wmtheme/wmtheme.c b/src/modules/wmtheme/wmtheme.c
index 51166ffd5..775e88a9d 100644
--- a/src/modules/wmtheme/wmtheme.c
+++ b/src/modules/wmtheme/wmtheme.c
@@ -1,6 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/wmtheme/wmtheme.h"
 #include "modules/wmtheme/wmtheme.h"
 
diff --git a/src/modules/zpool/zpool.c b/src/modules/zpool/zpool.c
index c0e2cd39f..44a6de2a1 100644
--- a/src/modules/zpool/zpool.c
+++ b/src/modules/zpool/zpool.c
@@ -3,7 +3,7 @@
 #include "common/percent.h"
 #include "common/size.h"
 #include "common/FFstrbuf.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "detection/zpool/zpool.h"
 #include "modules/zpool/zpool.h"
 
diff --git a/src/options/display.c b/src/options/display.c
index e4498ca3a..ec80a3723 100644
--- a/src/options/display.c
+++ b/src/options/display.c
@@ -2,7 +2,7 @@
 #include "common/color.h"
 #include "common/jsonconfig.h"
 #include "common/percent.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "options/display.h"
 
 #include <unistd.h>
diff --git a/src/options/general.c b/src/options/general.c
index ae268ccf7..6257a0f17 100644
--- a/src/options/general.c
+++ b/src/options/general.c
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
 #include "common/jsonconfig.h"
 #include "common/processing.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "options/general.h"
 
 #include <unistd.h>
diff --git a/src/options/logo.c b/src/options/logo.c
index 804e0b73c..6205b8ea8 100644
--- a/src/options/logo.c
+++ b/src/options/logo.c
@@ -1,7 +1,7 @@
 #include "logo/logo.h"
 
 #include "common/jsonconfig.h"
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 
 void ffOptionsInitLogo(FFOptionsLogo* options) {
     ffStrbufInit(&options->source);
diff --git a/tests/strutil.c b/tests/strutil.c
index 77614239f..a225c5ff9 100644
--- a/tests/strutil.c
+++ b/tests/strutil.c
@@ -1,4 +1,4 @@
-#include "common/stringUtils.h"
+#include "common/strutil.h"
 #include "common/textModifier.h"
 
 #include <stdint.h>