diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41f0b6673b5075a6d00a7bb25afc3640c8aba26c..7fe5aa9ec3b38c91ec44fd136f3f4343fbe6a333 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,7 +178,7 @@ add_definitions(-DLIBGKFS_LOG_MESSAGE_SIZE=${CLIENT_LOG_MESSAGE_SIZE})
 message(STATUS "[gekkofs] Maximum log message size in the client library: ${CLIENT_LOG_MESSAGE_SIZE}")
 mark_as_advanced(CLIENT_LOG_MESSAGE_SIZE)
 
-configure_file(include/global/cmake_configure.hpp.in include/global/cmake_configure.hpp)
+configure_file(include/common/cmake_configure.hpp.in include/common/cmake_configure.hpp)
 
 # Imported target
 add_library(RocksDB INTERFACE IMPORTED GLOBAL)
@@ -235,8 +235,8 @@ include_directories(
 
 include(GNUInstallDirs)
 
-# Global components
-add_subdirectory(src/global)
+# Common components
+add_subdirectory(src/common)
 # Daemon
 add_subdirectory(src/daemon)
 # Client library
diff --git a/include/client/gkfs_functions.hpp b/include/client/gkfs_functions.hpp
index ec4e4f97a34676d69874ce504fd43228804dc72a..f64b50215fe487a6d60d03a286fd44022808be54 100644
--- a/include/client/gkfs_functions.hpp
+++ b/include/client/gkfs_functions.hpp
@@ -31,7 +31,7 @@
 #define GEKKOFS_GKFS_FUNCTIONS_HPP
 
 #include <client/open_file_map.hpp>
-#include <global/metadata.hpp>
+#include <common/metadata.hpp>
 
 struct statfs;
 struct statvfs;
diff --git a/include/client/preload_util.hpp b/include/client/preload_util.hpp
index 2efca45250110b2ab93231c1555b35fb7eba0c67..a2354ce245ede655c7394945d4f3d9f253dc82b5 100644
--- a/include/client/preload_util.hpp
+++ b/include/client/preload_util.hpp
@@ -31,7 +31,7 @@
 #define GEKKOFS_PRELOAD_UTIL_HPP
 
 #include <client/preload.hpp>
-#include <global/metadata.hpp>
+#include <common/metadata.hpp>
 
 #include <string>
 #include <iostream>
diff --git a/include/client/rpc/rpc_types.hpp b/include/client/rpc/rpc_types.hpp
index 68695e54038511f552071a23c8a2a6a569186314..973e347279ef8f8ead500c84d7d910d5a02b4df4 100644
--- a/include/client/rpc/rpc_types.hpp
+++ b/include/client/rpc/rpc_types.hpp
@@ -46,8 +46,8 @@
 #endif
 
 
-#include <global/global_defs.hpp>
-#include <global/rpc/rpc_types.hpp>
+#include <common/common_defs.hpp>
+#include <common/rpc/rpc_types.hpp>
 
 namespace hermes {
 namespace detail {
diff --git a/include/global/arithmetic/arithmetic.hpp b/include/common/arithmetic/arithmetic.hpp
similarity index 98%
rename from include/global/arithmetic/arithmetic.hpp
rename to include/common/arithmetic/arithmetic.hpp
index e00e49941bd02c6b06c36f6fd34dbc15120e5a7e..afab3c5408eaf3e1e11a0b507df3cf506ad865a7 100644
--- a/include/global/arithmetic/arithmetic.hpp
+++ b/include/common/arithmetic/arithmetic.hpp
@@ -26,8 +26,8 @@
   SPDX-License-Identifier: GPL-3.0-or-later
 */
 
-#ifndef GKFS_GLOBAL_ARITHMETIC_HPP
-#define GKFS_GLOBAL_ARITHMETIC_HPP
+#ifndef GKFS_COMMON_ARITHMETIC_HPP
+#define GKFS_COMMON_ARITHMETIC_HPP
 
 #include <cstdint>
 #include <unistd.h>
@@ -215,4 +215,4 @@ block_count(const uint64_t offset, const size_t size, const size_t block_size) {
 
 } // namespace gkfs::utils::arithmetic
 
-#endif // GKFS_GLOBAL_ARITHMETIC_HPP
\ No newline at end of file
+#endif // GKFS_COMMON_ARITHMETIC_HPP
\ No newline at end of file
diff --git a/include/global/cmake_configure.hpp.in b/include/common/cmake_configure.hpp.in
similarity index 100%
rename from include/global/cmake_configure.hpp.in
rename to include/common/cmake_configure.hpp.in
diff --git a/include/global/global_defs.hpp b/include/common/common_defs.hpp
similarity index 96%
rename from include/global/global_defs.hpp
rename to include/common/common_defs.hpp
index 08a4adc1a248765023303353bdccbfb2721152b4..5acc8123024eb6638bd107aa0eda528f35748c52 100644
--- a/include/global/global_defs.hpp
+++ b/include/common/common_defs.hpp
@@ -26,8 +26,8 @@
   SPDX-License-Identifier: GPL-3.0-or-later
 */
 
-#ifndef GEKKOFS_GLOBAL_DEFS_HPP
-#define GEKKOFS_GLOBAL_DEFS_HPP
+#ifndef GEKKOFS_COMMON_DEFS_HPP
+#define GEKKOFS_COMMON_DEFS_HPP
 
 // These constexpr set the RPC's identity and which handler the receiver end
 // should use
@@ -66,4 +66,4 @@ constexpr auto na_sm = "na+sm";
 } // namespace protocol
 } // namespace gkfs::rpc
 
-#endif // GEKKOFS_GLOBAL_DEFS_HPP
+#endif // GEKKOFS_COMMON_DEFS_HPP
diff --git a/include/global/env_util.hpp b/include/common/env_util.hpp
similarity index 100%
rename from include/global/env_util.hpp
rename to include/common/env_util.hpp
diff --git a/include/global/log_util.hpp b/include/common/log_util.hpp
similarity index 100%
rename from include/global/log_util.hpp
rename to include/common/log_util.hpp
diff --git a/include/global/metadata.hpp b/include/common/metadata.hpp
similarity index 100%
rename from include/global/metadata.hpp
rename to include/common/metadata.hpp
diff --git a/include/global/path_util.hpp b/include/common/path_util.hpp
similarity index 100%
rename from include/global/path_util.hpp
rename to include/common/path_util.hpp
diff --git a/include/global/rpc/distributor.hpp b/include/common/rpc/distributor.hpp
similarity index 100%
rename from include/global/rpc/distributor.hpp
rename to include/common/rpc/distributor.hpp
diff --git a/include/global/rpc/rpc_types.hpp b/include/common/rpc/rpc_types.hpp
similarity index 100%
rename from include/global/rpc/rpc_types.hpp
rename to include/common/rpc/rpc_types.hpp
diff --git a/include/global/rpc/rpc_util.hpp b/include/common/rpc/rpc_util.hpp
similarity index 92%
rename from include/global/rpc/rpc_util.hpp
rename to include/common/rpc/rpc_util.hpp
index 0d2623388d8854a08739af8dfb6b624a383d61fa..3a0f61571bdd33ce274754433512650fef932a25 100644
--- a/include/global/rpc/rpc_util.hpp
+++ b/include/common/rpc/rpc_util.hpp
@@ -26,8 +26,8 @@
   SPDX-License-Identifier: GPL-3.0-or-later
 */
 
-#ifndef GEKKOFS_GLOBAL_RPC_UTILS_HPP
-#define GEKKOFS_GLOBAL_RPC_UTILS_HPP
+#ifndef GEKKOFS_COMMON_RPC_UTILS_HPP
+#define GEKKOFS_COMMON_RPC_UTILS_HPP
 
 extern "C" {
 #include <mercury_types.h>
@@ -49,4 +49,4 @@ get_host_by_name(const std::string& hostname);
 
 } // namespace gkfs::rpc
 
-#endif // GEKKOFS_GLOBAL_RPC_UTILS_HPP
+#endif // GEKKOFS_COMMON_RPC_UTILS_HPP
diff --git a/include/config.hpp b/include/config.hpp
index 094c6077e43dcdc5ffac1d0f0b3592e732028119..7dd6d2ba75a64cb96dac9afe58a52c415bef0381 100644
--- a/include/config.hpp
+++ b/include/config.hpp
@@ -29,7 +29,7 @@
 #ifndef GEKKOFS_CONFIG_HPP
 #define GEKKOFS_CONFIG_HPP
 
-#include <global/cmake_configure.hpp>
+#include <common/cmake_configure.hpp>
 
 // environment prefixes (are concatenated in env module at compile time)
 #define CLIENT_ENV_PREFIX "LIBGKFS_"
diff --git a/include/daemon/backend/data/chunk_storage.hpp b/include/daemon/backend/data/chunk_storage.hpp
index 18a6bf9f0488e3173ffb5b573533bb2edb7d33b3..dd6f7ee68b05f549e72b462a38060f2476780a9e 100644
--- a/include/daemon/backend/data/chunk_storage.hpp
+++ b/include/daemon/backend/data/chunk_storage.hpp
@@ -29,7 +29,7 @@
 #ifndef GEKKOFS_CHUNK_STORAGE_HPP
 #define GEKKOFS_CHUNK_STORAGE_HPP
 
-#include <global/global_defs.hpp>
+#include <common/common_defs.hpp>
 
 #include <limits>
 #include <string>
diff --git a/include/daemon/backend/metadata/merge.hpp b/include/daemon/backend/metadata/merge.hpp
index 879221e66a311c57c65a9cd774b741473e8607b7..dcd2b4a267687301a73723bb3de0428f3e009412 100644
--- a/include/daemon/backend/metadata/merge.hpp
+++ b/include/daemon/backend/metadata/merge.hpp
@@ -31,7 +31,7 @@
 
 
 #include <rocksdb/merge_operator.h>
-#include <global/metadata.hpp>
+#include <common/metadata.hpp>
 
 namespace rdb = rocksdb;
 
diff --git a/include/daemon/daemon.hpp b/include/daemon/daemon.hpp
index 3f9fa7f568b3b7c96db2b2dd88241b56bc914d4f..612712b63bcad416fcffbde8129dbee216112fbb 100644
--- a/include/daemon/daemon.hpp
+++ b/include/daemon/daemon.hpp
@@ -34,7 +34,7 @@
 #include <spdlog/spdlog.h>
 
 #include <config.hpp>
-#include <global/global_defs.hpp>
+#include <common/common_defs.hpp>
 // margo
 extern "C" {
 #include <abt.h>
diff --git a/include/daemon/ops/data.hpp b/include/daemon/ops/data.hpp
index c2e901accd6bbbddb23a7d832e276a71b7d182b3..4754fa0ce73cfd6d421a6b4fd4732628eccf6e81 100644
--- a/include/daemon/ops/data.hpp
+++ b/include/daemon/ops/data.hpp
@@ -30,7 +30,7 @@
 #define GEKKOFS_DAEMON_DATA_HPP
 
 #include <daemon/daemon.hpp>
-#include <global/global_defs.hpp>
+#include <common/common_defs.hpp>
 
 #include <string>
 #include <vector>
diff --git a/include/daemon/ops/metadentry.hpp b/include/daemon/ops/metadentry.hpp
index 9c5538e8f2cff2a7868a8bfe8c39bc400acde53c..aabcdbc49865bde69afd209fd7fe78a9a3c1ca79 100644
--- a/include/daemon/ops/metadentry.hpp
+++ b/include/daemon/ops/metadentry.hpp
@@ -30,7 +30,7 @@
 #define GEKKOFS_METADENTRY_HPP
 
 #include <daemon/daemon.hpp>
-#include <global/metadata.hpp>
+#include <common/metadata.hpp>
 
 namespace gkfs {
 namespace metadata {
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index b79ea63b913329971da4a0ee5bb2f74fb3f0992d..4fbda13f67f20ac95592648dd2e1d0743dcc0d3b 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -38,8 +38,8 @@ set(PRELOAD_SRC
     preload.cpp
     preload_context.cpp
     preload_util.cpp
-    ../global/path_util.cpp
-    ../global/rpc/rpc_util.cpp
+    ../common/path_util.cpp
+    ../common/rpc/rpc_util.cpp
     rpc/rpc_types.cpp
     rpc/forward_data.cpp
     rpc/forward_management.cpp
@@ -70,11 +70,11 @@ set(PRELOAD_HEADERS
     ../../include/client/syscalls/rets.hpp
     ../../include/client/syscalls/syscall.hpp
     ../../include/client/syscalls/detail/syscall_info.h
-    ../../include/global/cmake_configure.hpp
-    ../../include/global/global_defs.hpp
-    ../../include/global/path_util.hpp
-    ../../include/global/rpc/rpc_types.hpp
-    ../../include/global/rpc/rpc_util.hpp
+    ../../include/common/cmake_configure.hpp
+    ../../include/common/common_defs.hpp
+    ../../include/common/path_util.hpp
+    ../../include/common/rpc/rpc_types.hpp
+    ../../include/common/rpc/rpc_util.hpp
     )
 set(PRELOAD_LINK_LIBRARIES
     # internal
diff --git a/src/client/gkfs_functions.cpp b/src/client/gkfs_functions.cpp
index 58b6280d45a17fc35e515810755f26b035a15d15..36054c23a6ab3e9ff2c86909dfa4a037e1a6c827 100644
--- a/src/client/gkfs_functions.cpp
+++ b/src/client/gkfs_functions.cpp
@@ -36,7 +36,7 @@
 #include <client/rpc/forward_data.hpp>
 #include <client/open_dir.hpp>
 
-#include <global/path_util.hpp>
+#include <common/path_util.hpp>
 
 extern "C" {
 #include <dirent.h> // used for file types in the getdents{,64}() functions
diff --git a/src/client/hooks.cpp b/src/client/hooks.cpp
index 3268384828b5049c08e47812dcaa58f15f22fbc7..34d18a6aa57920ff2a03581a1b12d7a66db6312f 100644
--- a/src/client/hooks.cpp
+++ b/src/client/hooks.cpp
@@ -35,7 +35,7 @@
 #include <client/path.hpp>
 #include <client/open_dir.hpp>
 
-#include <global/path_util.hpp>
+#include <common/path_util.hpp>
 
 #include <memory>
 
diff --git a/src/client/path.cpp b/src/client/path.cpp
index ae0e6085e3fcbeca23b21293ec77f9d8d4c1da76..3b2164b591da8688e701edbd06e8ba4aa99a52c1 100644
--- a/src/client/path.cpp
+++ b/src/client/path.cpp
@@ -32,7 +32,7 @@
 #include <client/logging.hpp>
 #include <client/env.hpp>
 
-#include <global/path_util.hpp>
+#include <common/path_util.hpp>
 
 #include <vector>
 #include <string>
diff --git a/src/client/preload.cpp b/src/client/preload.cpp
index ff1eb1267582ef56ea493d3dcbe5eaae936b159b..e5b0eff9dceae67728eb65c888f0574991083bc9 100644
--- a/src/client/preload.cpp
+++ b/src/client/preload.cpp
@@ -34,8 +34,8 @@
 #include <client/preload_util.hpp>
 #include <client/intercept.hpp>
 
-#include <global/rpc/distributor.hpp>
-#include <global/global_defs.hpp>
+#include <common/rpc/distributor.hpp>
+#include <common/common_defs.hpp>
 
 #include <fstream>
 
diff --git a/src/client/preload_context.cpp b/src/client/preload_context.cpp
index 4d26437c3b9edc527ff3053f796a3c1ad0a2ce64..8762e7aebf319bb13d1dcc6e3c8f7f6e5fa2392a 100644
--- a/src/client/preload_context.cpp
+++ b/src/client/preload_context.cpp
@@ -34,8 +34,8 @@
 #include <client/open_dir.hpp>
 #include <client/path.hpp>
 
-#include <global/env_util.hpp>
-#include <global/path_util.hpp>
+#include <common/env_util.hpp>
+#include <common/path_util.hpp>
 #include <config.hpp>
 
 #include <hermes.hpp>
diff --git a/src/client/preload_util.cpp b/src/client/preload_util.cpp
index 255588a8f690aaa19611b9e5eaaa7205bb57196b..5ca518038460841fd094e791999532c65d65a008 100644
--- a/src/client/preload_util.cpp
+++ b/src/client/preload_util.cpp
@@ -32,10 +32,10 @@
 #include <client/logging.hpp>
 #include <client/rpc/forward_metadata.hpp>
 
-#include <global/rpc/distributor.hpp>
-#include <global/rpc/rpc_util.hpp>
-#include <global/env_util.hpp>
-#include <global/global_defs.hpp>
+#include <common/rpc/distributor.hpp>
+#include <common/rpc/rpc_util.hpp>
+#include <common/env_util.hpp>
+#include <common/common_defs.hpp>
 
 #include <hermes.hpp>
 
diff --git a/src/client/rpc/forward_data.cpp b/src/client/rpc/forward_data.cpp
index d45ebfbfc69079764ba7a751e9f07dd3b387206e..151c4f70b9f72bfead5cf9ad687f6edeed59231b 100644
--- a/src/client/rpc/forward_data.cpp
+++ b/src/client/rpc/forward_data.cpp
@@ -32,8 +32,8 @@
 #include <client/rpc/rpc_types.hpp>
 #include <client/logging.hpp>
 
-#include <global/rpc/distributor.hpp>
-#include <global/arithmetic/arithmetic.hpp>
+#include <common/rpc/distributor.hpp>
+#include <common/arithmetic/arithmetic.hpp>
 
 #include <unordered_set>
 
diff --git a/src/client/rpc/forward_metadata.cpp b/src/client/rpc/forward_metadata.cpp
index e5882dfce101dd1f4ff66371cc69b6b83d8e5a58..1cb51ab86db7e8bafcd25323c7c992768afd5bbe 100644
--- a/src/client/rpc/forward_metadata.cpp
+++ b/src/client/rpc/forward_metadata.cpp
@@ -34,9 +34,9 @@
 #include <client/open_dir.hpp>
 #include <client/rpc/rpc_types.hpp>
 
-#include <global/rpc/rpc_util.hpp>
-#include <global/rpc/distributor.hpp>
-#include <global/rpc/rpc_types.hpp>
+#include <common/rpc/rpc_util.hpp>
+#include <common/rpc/distributor.hpp>
+#include <common/rpc/rpc_types.hpp>
 
 using namespace std;
 
diff --git a/src/global/CMakeLists.txt b/src/common/CMakeLists.txt
similarity index 95%
rename from src/global/CMakeLists.txt
rename to src/common/CMakeLists.txt
index e80874fd43c058c8ef9afcbc43ca1089ddd96754..4c6698ed67e1e55e7f09fe46cb2ddfc35a38a627 100644
--- a/src/global/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -32,7 +32,7 @@ add_library(distributor STATIC)
 set_property(TARGET distributor PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_sources(distributor
     PUBLIC
-    ${INCLUDE_DIR}/global/rpc/distributor.hpp
+    ${INCLUDE_DIR}/common/rpc/distributor.hpp
     PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}/rpc/distributor.cpp
     )
@@ -45,7 +45,7 @@ add_library(log_util STATIC)
 set_property(TARGET log_util PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_sources(log_util
     PUBLIC
-    ${INCLUDE_DIR}/global/log_util.hpp
+    ${INCLUDE_DIR}/common/log_util.hpp
     PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}/log_util.cpp
     )
@@ -62,7 +62,7 @@ add_library(env_util STATIC)
 set_property(TARGET env_util PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_sources(env_util
     PUBLIC
-    ${INCLUDE_DIR}/global/env_util.hpp
+    ${INCLUDE_DIR}/common/env_util.hpp
     PRIVATE
     ${INCLUDE_DIR}/config.hpp
     ${CMAKE_CURRENT_LIST_DIR}/env_util.cpp
@@ -76,7 +76,7 @@ add_library(metadata STATIC)
 set_property(TARGET metadata PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_sources(metadata
     PUBLIC
-    ${INCLUDE_DIR}/global/metadata.hpp
+    ${INCLUDE_DIR}/common/metadata.hpp
     PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}/metadata.cpp
     )
diff --git a/src/global/arithmetic/CMakeLists.txt b/src/common/arithmetic/CMakeLists.txt
similarity index 96%
rename from src/global/arithmetic/CMakeLists.txt
rename to src/common/arithmetic/CMakeLists.txt
index 326e5038db8de703d0855c17035ebf58825af81e..5e9cdc8f56d2fb6ce0f597f2b8e62f4974cecf34 100644
--- a/src/global/arithmetic/CMakeLists.txt
+++ b/src/common/arithmetic/CMakeLists.txt
@@ -29,12 +29,12 @@
 add_library(arithmetic INTERFACE)
 target_sources(arithmetic
   INTERFACE
-    ${INCLUDE_DIR}/global/arithmetic/arithmetic.hpp
+    ${INCLUDE_DIR}/common/arithmetic/arithmetic.hpp
   )
 
 target_include_directories(arithmetic
   INTERFACE
-    ${INCLUDE_DIR}/global/arithmetic/
+    ${INCLUDE_DIR}/common/arithmetic/
   )
 
 target_code_coverage(arithmetic INTERFACE)
diff --git a/src/global/env_util.cpp b/src/common/env_util.cpp
similarity index 97%
rename from src/global/env_util.cpp
rename to src/common/env_util.cpp
index 728b435570185208df6dbee9d3d70b682df79b8b..c5e72687772c767d9519981df3d159f109147531 100644
--- a/src/global/env_util.cpp
+++ b/src/common/env_util.cpp
@@ -25,8 +25,7 @@
 
   SPDX-License-Identifier: GPL-3.0-or-later
 */
-
-#include <global/env_util.hpp>
+#include <common/env_util.hpp>
 
 #include <string>
 #include <cstdlib>
diff --git a/src/global/log_util.cpp b/src/common/log_util.cpp
similarity index 99%
rename from src/global/log_util.cpp
rename to src/common/log_util.cpp
index 5f1957e27a7754928ee0445a4b1851119fa85095..9280e1ac83f121366a71611a0a296952ce0b06b2 100644
--- a/src/global/log_util.cpp
+++ b/src/common/log_util.cpp
@@ -26,7 +26,7 @@
   SPDX-License-Identifier: GPL-3.0-or-later
 */
 
-#include <global/log_util.hpp>
+#include <common/log_util.hpp>
 
 #include <spdlog/sinks/basic_file_sink.h>
 #include <vector>
diff --git a/src/global/metadata.cpp b/src/common/metadata.cpp
similarity index 99%
rename from src/global/metadata.cpp
rename to src/common/metadata.cpp
index d46d0c797ca91f61d20a4948073bb68260dcdf32..c3948847e9bb2e7457cd2c1f6d392945650f6385 100644
--- a/src/global/metadata.cpp
+++ b/src/common/metadata.cpp
@@ -26,7 +26,7 @@
   SPDX-License-Identifier: GPL-3.0-or-later
 */
 
-#include <global/metadata.hpp>
+#include <common/metadata.hpp>
 #include <config.hpp>
 
 #include <fmt/format.h>
diff --git a/src/global/path_util.cpp b/src/common/path_util.cpp
similarity index 98%
rename from src/global/path_util.cpp
rename to src/common/path_util.cpp
index 0a64bb85b7cb2361b1fa2e50a17e42a98ccbbd61..7b6782129dd9b3e460a0af9c129aa301c0c1b269 100644
--- a/src/global/path_util.cpp
+++ b/src/common/path_util.cpp
@@ -26,7 +26,7 @@
   SPDX-License-Identifier: GPL-3.0-or-later
 */
 
-#include <global/path_util.hpp>
+#include <common/path_util.hpp>
 
 #include <system_error>
 #include <cstring>
diff --git a/src/global/rpc/distributor.cpp b/src/common/rpc/distributor.cpp
similarity index 98%
rename from src/global/rpc/distributor.cpp
rename to src/common/rpc/distributor.cpp
index 7409d2eaa2876f6e8fdf9eaed3f52619fb6a23d7..3b1c4011f3fc015f2cc6ccb05489e9e7b10d99d4 100644
--- a/src/global/rpc/distributor.cpp
+++ b/src/common/rpc/distributor.cpp
@@ -26,7 +26,7 @@
   SPDX-License-Identifier: GPL-3.0-or-later
 */
 
-#include <global/rpc/distributor.hpp>
+#include <common/rpc/distributor.hpp>
 
 using namespace std;
 
diff --git a/src/global/rpc/rpc_util.cpp b/src/common/rpc/rpc_util.cpp
similarity index 97%
rename from src/global/rpc/rpc_util.cpp
rename to src/common/rpc/rpc_util.cpp
index 1a9251358a7bb8626a813acafbc7452ad47bb721..5f045ed82244dbcd62293de17fd105b3cfe8c20d 100644
--- a/src/global/rpc/rpc_util.cpp
+++ b/src/common/rpc/rpc_util.cpp
@@ -26,7 +26,7 @@
   SPDX-License-Identifier: GPL-3.0-or-later
 */
 
-#include <global/rpc/rpc_util.hpp>
+#include <common/rpc/rpc_util.hpp>
 
 extern "C" {
 #include <unistd.h>
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
index f490a4be3d5c1ed5716c9221515676d9c5d2fdd3..14355531534a6131c20ffa6e6349cc7301ec9f87 100644
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
@@ -30,8 +30,8 @@ add_subdirectory(backend/metadata)
 add_subdirectory(backend/data)
 
 set(DAEMON_SRC
-    ../global/rpc/rpc_util.cpp
-    ../global/path_util.cpp
+    ../common/rpc/rpc_util.cpp
+    ../common/path_util.cpp
     daemon.cpp
     util.cpp
     ops/metadentry.cpp
@@ -45,11 +45,11 @@ set(DAEMON_SRC
 set(DAEMON_HEADERS
     ../../include/config.hpp
     ../../include/version.hpp
-    ../../include/global/cmake_configure.hpp
-    ../../include/global/global_defs.hpp
-    ../../include/global/rpc/rpc_types.hpp
-    ../../include/global/rpc/rpc_util.hpp
-    ../../include/global/path_util.hpp
+    ../../include/common/cmake_configure.hpp
+    ../../include/common/common_defs.hpp
+    ../../include/common/rpc/rpc_types.hpp
+    ../../include/common/rpc/rpc_util.hpp
+    ../../include/common/path_util.hpp
     ../../include/daemon/daemon.hpp
     ../../include/daemon/util.hpp
     ../../include/daemon/ops/data.hpp
diff --git a/src/daemon/backend/data/CMakeLists.txt b/src/daemon/backend/data/CMakeLists.txt
index 0f63647a7b74098b530561a09a8fb7453c12a7c2..50795377ad2f2dafc82e4dfb499fe6572c01c00e 100644
--- a/src/daemon/backend/data/CMakeLists.txt
+++ b/src/daemon/backend/data/CMakeLists.txt
@@ -32,8 +32,8 @@ target_sources(storage
     PUBLIC
     ${INCLUDE_DIR}/daemon/backend/data/chunk_storage.hpp
     PRIVATE
-    ${INCLUDE_DIR}/global/path_util.hpp
-    ${INCLUDE_DIR}/global/global_defs.hpp
+    ${INCLUDE_DIR}/common/path_util.hpp
+    ${INCLUDE_DIR}/common/common_defs.hpp
     ${INCLUDE_DIR}/daemon/backend/data/data_module.hpp
     ${INCLUDE_DIR}/daemon/backend/data/file_handle.hpp
     ${CMAKE_CURRENT_LIST_DIR}/chunk_storage.cpp
diff --git a/src/daemon/backend/data/chunk_storage.cpp b/src/daemon/backend/data/chunk_storage.cpp
index dbe5f90c961e8402d9edf0a1c8d12f8d21c041fa..338885bf1bd13b5c18b78b4090d1cb3d071345b3 100644
--- a/src/daemon/backend/data/chunk_storage.cpp
+++ b/src/daemon/backend/data/chunk_storage.cpp
@@ -29,7 +29,7 @@
 #include <daemon/backend/data/data_module.hpp>
 #include <daemon/backend/data/chunk_storage.hpp>
 #include <daemon/backend/data/file_handle.hpp>
-#include <global/path_util.hpp>
+#include <common/path_util.hpp>
 
 #include <cerrno>
 
diff --git a/src/daemon/backend/metadata/CMakeLists.txt b/src/daemon/backend/metadata/CMakeLists.txt
index f2ac88359e149d914b36158433f9ffc91fbab66b..d04c8d91eedeca305c6758ca79687193c18fc865 100644
--- a/src/daemon/backend/metadata/CMakeLists.txt
+++ b/src/daemon/backend/metadata/CMakeLists.txt
@@ -33,7 +33,7 @@ target_sources(metadata_db
     ${INCLUDE_DIR}/daemon/backend/metadata/db.hpp
     ${INCLUDE_DIR}/daemon/backend/exceptions.hpp
     PRIVATE
-    ${INCLUDE_DIR}/global/path_util.hpp
+    ${INCLUDE_DIR}/common/path_util.hpp
     ${INCLUDE_DIR}/daemon/backend/metadata/merge.hpp
     ${CMAKE_CURRENT_LIST_DIR}/merge.cpp
     ${CMAKE_CURRENT_LIST_DIR}/db.cpp
diff --git a/src/daemon/backend/metadata/db.cpp b/src/daemon/backend/metadata/db.cpp
index c56a7567dc24fceb244a7bc10b63ea804ab0456a..9389d3557fd2d92094d491afdfc59e721cb1a562 100644
--- a/src/daemon/backend/metadata/db.cpp
+++ b/src/daemon/backend/metadata/db.cpp
@@ -30,8 +30,8 @@
 #include <daemon/backend/metadata/merge.hpp>
 #include <daemon/backend/exceptions.hpp>
 
-#include <global/metadata.hpp>
-#include <global/path_util.hpp>
+#include <common/metadata.hpp>
+#include <common/path_util.hpp>
 
 extern "C" {
 #include <sys/stat.h>
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index a8537ccddcc8cb9d34bf450da88b41ba69a9d8f3..452f76ef3cd60191dc40e61aa8f7c86ae669e5e6 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -28,10 +28,10 @@
 
 #include <daemon/daemon.hpp>
 #include <version.hpp>
-#include <global/log_util.hpp>
-#include <global/env_util.hpp>
-#include <global/rpc/rpc_types.hpp>
-#include <global/rpc/rpc_util.hpp>
+#include <common/log_util.hpp>
+#include <common/env_util.hpp>
+#include <common/rpc/rpc_types.hpp>
+#include <common/rpc/rpc_util.hpp>
 #include <daemon/env.hpp>
 #include <daemon/handler/rpc_defs.hpp>
 #include <daemon/ops/metadentry.hpp>
diff --git a/src/daemon/handler/srv_data.cpp b/src/daemon/handler/srv_data.cpp
index 172202f99c68df5624b46dc4584760d8daff06a3..697ca86e451337d9c4260762f2504b227b0310c0 100644
--- a/src/daemon/handler/srv_data.cpp
+++ b/src/daemon/handler/srv_data.cpp
@@ -32,9 +32,9 @@
 #include <daemon/backend/data/chunk_storage.hpp>
 #include <daemon/ops/data.hpp>
 
-#include <global/rpc/rpc_types.hpp>
-#include <global/rpc/distributor.hpp>
-#include <global/arithmetic/arithmetic.hpp>
+#include <common/rpc/rpc_types.hpp>
+#include <common/rpc/distributor.hpp>
+#include <common/arithmetic/arithmetic.hpp>
 
 #ifdef GKFS_ENABLE_AGIOS
 #include <daemon/scheduler/agios.hpp>
diff --git a/src/daemon/handler/srv_management.cpp b/src/daemon/handler/srv_management.cpp
index 95d36ee7e06776a3ea7474906a560dcf0845c548..ec43dc2f8525bbad1051690f3846fbb91b2b63ca 100644
--- a/src/daemon/handler/srv_management.cpp
+++ b/src/daemon/handler/srv_management.cpp
@@ -29,7 +29,7 @@
 #include <daemon/daemon.hpp>
 #include <daemon/handler/rpc_defs.hpp>
 
-#include <global/rpc/rpc_types.hpp>
+#include <common/rpc/rpc_types.hpp>
 
 using namespace std;
 
diff --git a/src/daemon/handler/srv_metadata.cpp b/src/daemon/handler/srv_metadata.cpp
index 5f2c7635296fda101c25775cafaa8e134edc46d4..9eda0cd54514b6e2627114c1a0522663320e1498 100644
--- a/src/daemon/handler/srv_metadata.cpp
+++ b/src/daemon/handler/srv_metadata.cpp
@@ -32,7 +32,7 @@
 #include <daemon/backend/data/chunk_storage.hpp>
 #include <daemon/ops/metadentry.hpp>
 
-#include <global/rpc/rpc_types.hpp>
+#include <common/rpc/rpc_types.hpp>
 
 using namespace std;
 
diff --git a/src/daemon/ops/data.cpp b/src/daemon/ops/data.cpp
index a551221b97c1a421b88a0bbb0c43b5375c7ab592..ab30f542d3ea755d58ead505aa2c088affedc636 100644
--- a/src/daemon/ops/data.cpp
+++ b/src/daemon/ops/data.cpp
@@ -28,7 +28,7 @@
 
 #include <daemon/ops/data.hpp>
 #include <daemon/backend/data/chunk_storage.hpp>
-#include <global/arithmetic/arithmetic.hpp>
+#include <common/arithmetic/arithmetic.hpp>
 #include <utility>
 
 extern "C" {
diff --git a/src/daemon/util.cpp b/src/daemon/util.cpp
index d2e96c8c7a67127220d39412d3deec1d4ce1f452..5dfe97cf9e8595d371dd7001796bfaad7066679b 100644
--- a/src/daemon/util.cpp
+++ b/src/daemon/util.cpp
@@ -29,7 +29,7 @@
 #include <daemon/util.hpp>
 #include <daemon/daemon.hpp>
 
-#include <global/rpc/rpc_util.hpp>
+#include <common/rpc/rpc_util.hpp>
 
 #include <fstream>
 #include <iostream>