diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c5bdce35..6a8341f94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,15 +47,15 @@ endif()
 add_executable(btop src/main.cpp)
 add_library(libbtop OBJECT
   src/btop.cpp
-  src/btop_cli.cpp
-  src/btop_config.cpp
-  src/btop_draw.cpp
-  src/btop_input.cpp
-  src/btop_log.cpp
-  src/btop_menu.cpp
-  src/btop_shared.cpp
-  src/btop_theme.cpp
-  src/btop_tools.cpp
+  src/cli.cpp
+  src/config.cpp
+  src/draw.cpp
+  src/input.cpp
+  src/log.cpp
+  src/menu.cpp
+  src/shared.cpp
+  src/theme.cpp
+  src/tools.cpp
 )
 
 target_link_libraries(btop libbtop)
@@ -67,15 +67,15 @@ if(BTOP_LTO)
 endif()
 
 if(APPLE)
-  target_sources(libbtop PRIVATE src/osx/btop_collect.cpp src/osx/sensors.cpp src/osx/smc.cpp)
+  target_sources(libbtop PRIVATE src/osx/collect.cpp src/osx/sensors.cpp src/osx/smc.cpp)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "MidnightBSD")
-  target_sources(libbtop PRIVATE src/freebsd/btop_collect.cpp)
+  target_sources(libbtop PRIVATE src/freebsd/collect.cpp)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
-  target_sources(libbtop PRIVATE src/openbsd/btop_collect.cpp src/openbsd/sysctlbyname.cpp)
+  target_sources(libbtop PRIVATE src/openbsd/collect.cpp src/openbsd/sysctlbyname.cpp)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
-  target_sources(libbtop PRIVATE src/netbsd/btop_collect.cpp)
+  target_sources(libbtop PRIVATE src/netbsd/collect.cpp)
 elseif(LINUX)
-  target_sources(libbtop PRIVATE src/linux/btop_collect.cpp)
+  target_sources(libbtop PRIVATE src/linux/collect.cpp)
   if(BTOP_GPU)
     add_subdirectory(src/linux/intel_gpu_top)
   endif()
diff --git a/src/btop.cpp b/src/btop.cpp
old mode 100755
new mode 100644
index df78d6651..144f24994
--- a/src/btop.cpp
+++ b/src/btop.cpp
@@ -58,15 +58,15 @@ tab-size = 4
 #include <fmt/core.h>
 #include <fmt/ostream.h>
 
-#include "btop_cli.hpp"
-#include "btop_config.hpp"
-#include "btop_draw.hpp"
-#include "btop_input.hpp"
-#include "btop_log.hpp"
-#include "btop_menu.hpp"
-#include "btop_shared.hpp"
-#include "btop_theme.hpp"
-#include "btop_tools.hpp"
+#include "cli.hpp"
+#include "config.hpp"
+#include "draw.hpp"
+#include "input.hpp"
+#include "log.hpp"
+#include "menu.hpp"
+#include "shared.hpp"
+#include "theme.hpp"
+#include "tools.hpp"
 
 using std::atomic;
 using std::cout;
diff --git a/src/btop_cli.cpp b/src/cli.cpp
similarity index 99%
rename from src/btop_cli.cpp
rename to src/cli.cpp
index a5f7f7cb5..0e4b19870 100644
--- a/src/btop_cli.cpp
+++ b/src/cli.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-#include "btop_cli.hpp"
+#include "cli.hpp"
 
 #include <algorithm>
 #include <expected>
@@ -18,8 +18,8 @@
 #include <fmt/base.h>
 #include <fmt/format.h>
 
-#include "btop_config.hpp"
-#include "btop_shared.hpp"
+#include "config.hpp"
+#include "shared.hpp"
 #include "config.h"
 
 using namespace std::string_view_literals;
diff --git a/src/btop_cli.hpp b/src/cli.hpp
similarity index 100%
rename from src/btop_cli.hpp
rename to src/cli.hpp
diff --git a/src/btop_config.cpp b/src/config.cpp
similarity index 99%
rename from src/btop_config.cpp
rename to src/config.cpp
index cce67161b..0b6832aff 100644
--- a/src/btop_config.cpp
+++ b/src/config.cpp
@@ -31,10 +31,10 @@ tab-size = 4
 #include <fmt/core.h>
 #include <sys/statvfs.h>
 
-#include "btop_config.hpp"
-#include "btop_log.hpp"
-#include "btop_shared.hpp"
-#include "btop_tools.hpp"
+#include "config.hpp"
+#include "log.hpp"
+#include "shared.hpp"
+#include "tools.hpp"
 
 using std::array;
 using std::atomic;
diff --git a/src/btop_config.hpp b/src/config.hpp
similarity index 100%
rename from src/btop_config.hpp
rename to src/config.hpp
diff --git a/src/btop_draw.cpp b/src/draw.cpp
similarity index 99%
rename from src/btop_draw.cpp
rename to src/draw.cpp
index bc121f6ba..b791327d0 100644
--- a/src/btop_draw.cpp
+++ b/src/draw.cpp
@@ -28,14 +28,14 @@ tab-size = 4
 
 #include <fmt/format.h>
 
-#include "btop_config.hpp"
-#include "btop_draw.hpp"
-#include "btop_input.hpp"
-#include "btop_log.hpp"
-#include "btop_menu.hpp"
-#include "btop_shared.hpp"
-#include "btop_theme.hpp"
-#include "btop_tools.hpp"
+#include "config.hpp"
+#include "draw.hpp"
+#include "input.hpp"
+#include "log.hpp"
+#include "menu.hpp"
+#include "shared.hpp"
+#include "theme.hpp"
+#include "tools.hpp"
 
 using std::array;
 using std::clamp;
diff --git a/src/btop_draw.hpp b/src/draw.hpp
similarity index 100%
rename from src/btop_draw.hpp
rename to src/draw.hpp
diff --git a/src/freebsd/btop_collect.cpp b/src/freebsd/collect.cpp
similarity index 99%
rename from src/freebsd/btop_collect.cpp
rename to src/freebsd/collect.cpp
index 1a8bdf761..efc1d929c 100644
--- a/src/freebsd/btop_collect.cpp
+++ b/src/freebsd/collect.cpp
@@ -63,10 +63,10 @@ tab-size = 4
 
 #include <fmt/format.h>
 
-#include "../btop_config.hpp"
-#include "../btop_log.hpp"
-#include "../btop_shared.hpp"
-#include "../btop_tools.hpp"
+#include "../config.hpp"
+#include "../log.hpp"
+#include "../shared.hpp"
+#include "../tools.hpp"
 
 using std::clamp, std::string_literals::operator""s, std::cmp_equal, std::cmp_less, std::cmp_greater;
 using std::ifstream, std::numeric_limits, std::streamsize, std::round, std::max, std::min;
diff --git a/src/btop_input.cpp b/src/input.cpp
similarity index 99%
rename from src/btop_input.cpp
rename to src/input.cpp
index c6c70366f..4209369cc 100644
--- a/src/btop_input.cpp
+++ b/src/input.cpp
@@ -27,12 +27,12 @@ tab-size = 4
 #include <utility>
 #include <cmath>
 
-#include "btop_input.hpp"
-#include "btop_tools.hpp"
-#include "btop_config.hpp"
-#include "btop_shared.hpp"
-#include "btop_menu.hpp"
-#include "btop_draw.hpp"
+#include "input.hpp"
+#include "tools.hpp"
+#include "config.hpp"
+#include "shared.hpp"
+#include "menu.hpp"
+#include "draw.hpp"
 
 using namespace Tools;
 using namespace std::literals; // for operator""s
diff --git a/src/btop_input.hpp b/src/input.hpp
similarity index 99%
rename from src/btop_input.hpp
rename to src/input.hpp
index b64662897..ea1416a17 100644
--- a/src/btop_input.hpp
+++ b/src/input.hpp
@@ -33,7 +33,7 @@ using std::string;
 /* The input functions rely on the following termios parameters being set:
 	Non-canonical mode (c_lflags & ~(ICANON))
 	VMIN and VTIME (c_cc) set to 0
-	These will automatically be set when running Term::init() from btop_tools.cpp
+	These will automatically be set when running Term::init() from tools.cpp
 */
 
 //* Functions and variables for handling keyboard and mouse input
diff --git a/src/linux/btop_collect.cpp b/src/linux/collect.cpp
similarity index 99%
rename from src/linux/btop_collect.cpp
rename to src/linux/collect.cpp
index 456abfa26..856d62239 100644
--- a/src/linux/btop_collect.cpp
+++ b/src/linux/collect.cpp
@@ -51,10 +51,10 @@ tab-size = 4
 	#include <pwd.h>
 #endif
 
-#include "../btop_config.hpp"
-#include "../btop_log.hpp"
-#include "../btop_shared.hpp"
-#include "../btop_tools.hpp"
+#include "../config.hpp"
+#include "../log.hpp"
+#include "../shared.hpp"
+#include "../tools.hpp"
 
 #if defined(GPU_SUPPORT)
 	#define class class_
diff --git a/src/btop_log.cpp b/src/log.cpp
similarity index 98%
rename from src/btop_log.cpp
rename to src/log.cpp
index 39df2e079..ea941c6f0 100644
--- a/src/btop_log.cpp
+++ b/src/log.cpp
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
-#include "btop_log.hpp"
+#include "log.hpp"
 
-#include "btop_shared.hpp"
+#include "shared.hpp"
 
 #include <algorithm>
 #include <cerrno>
diff --git a/src/btop_log.hpp b/src/log.hpp
similarity index 100%
rename from src/btop_log.hpp
rename to src/log.hpp
diff --git a/src/btop_menu.cpp b/src/menu.cpp
similarity index 99%
rename from src/btop_menu.cpp
rename to src/menu.cpp
index 45baa7d1a..cd206320b 100644
--- a/src/btop_menu.cpp
+++ b/src/menu.cpp
@@ -16,14 +16,14 @@ indent = tab
 tab-size = 4
 */
 
-#include "btop_menu.hpp"
-
-#include "btop_config.hpp"
-#include "btop_draw.hpp"
-#include "btop_log.hpp"
-#include "btop_shared.hpp"
-#include "btop_theme.hpp"
-#include "btop_tools.hpp"
+#include "menu.hpp"
+
+#include "config.hpp"
+#include "draw.hpp"
+#include "log.hpp"
+#include "shared.hpp"
+#include "theme.hpp"
+#include "tools.hpp"
 
 #include <errno.h>
 #include <signal.h>
diff --git a/src/btop_menu.hpp b/src/menu.hpp
similarity index 98%
rename from src/btop_menu.hpp
rename to src/menu.hpp
index 09deabddc..75a5e517d 100644
--- a/src/btop_menu.hpp
+++ b/src/menu.hpp
@@ -24,7 +24,7 @@ tab-size = 4
 #include <string_view>
 #include <vector>
 
-#include "btop_input.hpp"
+#include "input.hpp"
 
 using std::atomic;
 using std::bitset;
diff --git a/src/netbsd/btop_collect.cpp b/src/netbsd/collect.cpp
old mode 100755
new mode 100644
similarity index 99%
rename from src/netbsd/btop_collect.cpp
rename to src/netbsd/collect.cpp
index 050dba833..2f2c6d384
--- a/src/netbsd/btop_collect.cpp
+++ b/src/netbsd/collect.cpp
@@ -70,10 +70,10 @@ tab-size = 4
 
 #include <fmt/format.h>
 
-#include "../btop_config.hpp"
-#include "../btop_log.hpp"
-#include "../btop_shared.hpp"
-#include "../btop_tools.hpp"
+#include "../config.hpp"
+#include "../log.hpp"
+#include "../shared.hpp"
+#include "../tools.hpp"
 
 using std::clamp, std::string_literals::operator""s, std::cmp_equal, std::cmp_less, std::cmp_greater;
 using std::ifstream, std::numeric_limits, std::streamsize, std::round, std::max, std::min;
diff --git a/src/openbsd/btop_collect.cpp b/src/openbsd/collect.cpp
similarity index 99%
rename from src/openbsd/btop_collect.cpp
rename to src/openbsd/collect.cpp
index 7e5270006..9c2984a79 100644
--- a/src/openbsd/btop_collect.cpp
+++ b/src/openbsd/collect.cpp
@@ -66,10 +66,10 @@ tab-size = 4
 
 #include <fmt/format.h>
 
-#include "../btop_config.hpp"
-#include "../btop_log.hpp"
-#include "../btop_shared.hpp"
-#include "../btop_tools.hpp"
+#include "../config.hpp"
+#include "../log.hpp"
+#include "../shared.hpp"
+#include "../tools.hpp"
 
 #include "./sysctlbyname.h"
 
diff --git a/src/openbsd/sysctlbyname.cpp b/src/openbsd/sysctlbyname.cpp
index b92484a82..4cb25d882 100644
--- a/src/openbsd/sysctlbyname.cpp
+++ b/src/openbsd/sysctlbyname.cpp
@@ -22,7 +22,7 @@
 #include <string.h>
 
 #include "internal.h"
-#include "../btop_tools.hpp"
+#include "../tools.hpp"
 
 int
 sysctlbyname(const char *name, void *oldp, size_t *oldlenp,
diff --git a/src/osx/btop_collect.cpp b/src/osx/collect.cpp
similarity index 99%
rename from src/osx/btop_collect.cpp
rename to src/osx/collect.cpp
index 068451eb2..5c2548e9f 100644
--- a/src/osx/btop_collect.cpp
+++ b/src/osx/collect.cpp
@@ -58,10 +58,10 @@ tab-size = 4
 
 #include <fmt/format.h>
 
-#include "../btop_config.hpp"
-#include "../btop_log.hpp"
-#include "../btop_shared.hpp"
-#include "../btop_tools.hpp"
+#include "../config.hpp"
+#include "../log.hpp"
+#include "../shared.hpp"
+#include "../tools.hpp"
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED > 101504
 #include "sensors.hpp"
diff --git a/src/btop_shared.cpp b/src/shared.cpp
similarity index 99%
rename from src/btop_shared.cpp
rename to src/shared.cpp
index 0990fe681..001013821 100644
--- a/src/btop_shared.cpp
+++ b/src/shared.cpp
@@ -23,9 +23,9 @@ tab-size = 4
 #include <regex>
 #include <string>
 
-#include "btop_config.hpp"
-#include "btop_shared.hpp"
-#include "btop_tools.hpp"
+#include "config.hpp"
+#include "shared.hpp"
+#include "tools.hpp"
 
 namespace fs = std::filesystem;
 namespace rng = std::ranges;
diff --git a/src/btop_shared.hpp b/src/shared.hpp
similarity index 100%
rename from src/btop_shared.hpp
rename to src/shared.hpp
diff --git a/src/btop_theme.cpp b/src/theme.cpp
similarity index 99%
rename from src/btop_theme.cpp
rename to src/theme.cpp
index c56d1a48a..51162a2c3 100644
--- a/src/btop_theme.cpp
+++ b/src/theme.cpp
@@ -20,10 +20,10 @@ tab-size = 4
 #include <fstream>
 #include <unistd.h>
 
-#include "btop_config.hpp"
-#include "btop_log.hpp"
-#include "btop_theme.hpp"
-#include "btop_tools.hpp"
+#include "config.hpp"
+#include "log.hpp"
+#include "theme.hpp"
+#include "tools.hpp"
 
 using std::round;
 using std::stoi;
diff --git a/src/btop_theme.hpp b/src/theme.hpp
similarity index 100%
rename from src/btop_theme.hpp
rename to src/theme.hpp
diff --git a/src/btop_tools.cpp b/src/tools.cpp
similarity index 99%
rename from src/btop_tools.cpp
rename to src/tools.cpp
index 737198151..4c87abb4c 100644
--- a/src/btop_tools.cpp
+++ b/src/tools.cpp
@@ -33,10 +33,10 @@ tab-size = 4
 #include <unistd.h>
 
 #include "widechar_width.hpp"
-#include "btop_log.hpp"
-#include "btop_shared.hpp"
-#include "btop_tools.hpp"
-#include "btop_config.hpp"
+#include "log.hpp"
+#include "shared.hpp"
+#include "tools.hpp"
+#include "config.hpp"
 
 using std::cout;
 using std::floor;
diff --git a/src/btop_tools.hpp b/src/tools.hpp
similarity index 99%
rename from src/btop_tools.hpp
rename to src/tools.hpp
index 79dd90062..a18d883cf 100644
--- a/src/btop_tools.hpp
+++ b/src/tools.hpp
@@ -52,7 +52,7 @@ tab-size = 4
 #include <fmt/core.h>
 #include <fmt/format.h>
 
-#include "btop_log.hpp"
+#include "log.hpp"
 
 using std::array;
 using std::atomic;