diff --git a/fs_interface/Device.h b/fs_interface/Device.h
index 85adab57..35b3b4b5 100644
--- a/fs_interface/Device.h
+++ b/fs_interface/Device.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_DEVICE_H_
-#define FSPP_DEVICE_H_
+#ifndef MESSMER_FSPP_FSINTERFACE_DEVICE_H_
+#define MESSMER_FSPP_FSINTERFACE_DEVICE_H_
 
 #include <boost/filesystem.hpp>
 #include <messmer/cpp-utils/pointer/unique_ref.h>
diff --git a/fs_interface/Dir.h b/fs_interface/Dir.h
index e647e0e9..35441497 100644
--- a/fs_interface/Dir.h
+++ b/fs_interface/Dir.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_DIR_H_
-#define FSPP_DIR_H_
+#ifndef MESSMER_FSPP_FSINTERFACE_DIR_H_
+#define MESSMER_FSPP_FSINTERFACE_DIR_H_
 
 #include "Node.h"
 #include <messmer/cpp-utils/pointer/unique_ref.h>
diff --git a/fs_interface/File.h b/fs_interface/File.h
index 85b78917..1c29c9ba 100644
--- a/fs_interface/File.h
+++ b/fs_interface/File.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_FILE_H_
-#define FSPP_FILE_H_
+#ifndef MESSMER_FSPP_FSINTERFACE_FILE_H_
+#define MESSMER_FSPP_FSINTERFACE_FILE_H_
 
 #include "Node.h"
 #include <messmer/cpp-utils/pointer/unique_ref.h>
diff --git a/fs_interface/Node.h b/fs_interface/Node.h
index 7216181a..e13a50f9 100644
--- a/fs_interface/Node.h
+++ b/fs_interface/Node.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_NODE_H_
-#define FSPP_NODE_H_
+#ifndef MESSMER_FSPP_FSINTERFACE_NODE_H_
+#define MESSMER_FSPP_FSINTERFACE_NODE_H_
 
 #include <boost/filesystem.hpp>
 
diff --git a/fs_interface/OpenFile.h b/fs_interface/OpenFile.h
index 04a58eea..290faedb 100644
--- a/fs_interface/OpenFile.h
+++ b/fs_interface/OpenFile.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_OPENFILE_H_
-#define FSPP_OPENFILE_H_
+#ifndef MESSMER_FSPP_FSINTERFACE_OPENFILE_H_
+#define MESSMER_FSPP_FSINTERFACE_OPENFILE_H_
 
 #include <boost/filesystem.hpp>
 #include <sys/stat.h>
diff --git a/fs_interface/Symlink.h b/fs_interface/Symlink.h
index 72db26b7..8d28860f 100644
--- a/fs_interface/Symlink.h
+++ b/fs_interface/Symlink.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_SYMLINK_H_
-#define FSPP_SYMLINK_H_
+#ifndef MESSMER_FSPP_FSINTERFACE_SYMLINK_H_
+#define MESSMER_FSPP_FSINTERFACE_SYMLINK_H_
 
 #include "Node.h"
 #include <messmer/cpp-utils/pointer/unique_ref.h>
diff --git a/fstest/FsTest.h b/fstest/FsTest.h
index c15b298b..cc1168ed 100644
--- a/fstest/FsTest.h
+++ b/fstest/FsTest.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_FSTEST_H_
 #define MESSMER_FSPP_FSTEST_FSTEST_H_
 
diff --git a/fstest/FsppDeviceTest.h b/fstest/FsppDeviceTest.h
index 81496fd9..47ec776d 100644
--- a/fstest/FsppDeviceTest.h
+++ b/fstest/FsppDeviceTest.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_FSPPDEVICETEST_H_
 #define MESSMER_FSPP_FSTEST_FSPPDEVICETEST_H_
 
diff --git a/fstest/FsppDirTest.h b/fstest/FsppDirTest.h
index 2bd0e00f..ee55c0f6 100644
--- a/fstest/FsppDirTest.h
+++ b/fstest/FsppDirTest.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_FSPPDIRTEST_H_
 #define MESSMER_FSPP_FSTEST_FSPPDIRTEST_H_
 
diff --git a/fstest/FsppFileTest.h b/fstest/FsppFileTest.h
index 35d27a61..ac6df30d 100644
--- a/fstest/FsppFileTest.h
+++ b/fstest/FsppFileTest.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_FSPPFILETEST_H_
 #define MESSMER_FSPP_FSTEST_FSPPFILETEST_H_
 
diff --git a/fstest/FsppOpenFileTest.h b/fstest/FsppOpenFileTest.h
index cb5e11ff..7dc39f67 100644
--- a/fstest/FsppOpenFileTest.h
+++ b/fstest/FsppOpenFileTest.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_FSPPOPENFILETEST_H_
 #define MESSMER_FSPP_FSTEST_FSPPOPENFILETEST_H_
 
diff --git a/fstest/testutils/FileSystemTest.h b/fstest/testutils/FileSystemTest.h
index e5fb0ff8..5b35f044 100644
--- a/fstest/testutils/FileSystemTest.h
+++ b/fstest/testutils/FileSystemTest.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_TESTUTILS_FILESYSTEMTEST_H_
 #define MESSMER_FSPP_FSTEST_TESTUTILS_FILESYSTEMTEST_H_
 
diff --git a/fstest/testutils/FileTest.h b/fstest/testutils/FileTest.h
index 0c40eaa0..35f2ad09 100644
--- a/fstest/testutils/FileTest.h
+++ b/fstest/testutils/FileTest.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_TESTUTILS_FILETEST_H_
 #define MESSMER_FSPP_FSTEST_TESTUTILS_FILETEST_H_
 
diff --git a/fuse/Filesystem.h b/fuse/Filesystem.h
index d915979c..f406de3f 100644
--- a/fuse/Filesystem.h
+++ b/fuse/Filesystem.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_IMPL_FILESYSTEM_H_
-#define FSPP_IMPL_FILESYSTEM_H_
+#ifndef MESSMER_FSPP_FUSE_FILESYSTEM_H_
+#define MESSMER_FSPP_FUSE_FILESYSTEM_H_
 
 #include <boost/filesystem.hpp>
 #include <messmer/cpp-utils/pointer/unique_ref.h>
diff --git a/fuse/Fuse.h b/fuse/Fuse.h
index 3041cbd4..7972a4da 100644
--- a/fuse/Fuse.h
+++ b/fuse/Fuse.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_FUSE_FUSE_H_
-#define FSPP_FUSE_FUSE_H_
+#ifndef MESSMER_FSPP_FUSE_FUSE_H_
+#define MESSMER_FSPP_FUSE_FUSE_H_
 
 #include "params.h"
 #include <cstdio>
diff --git a/fuse/FuseErrnoException.h b/fuse/FuseErrnoException.h
index f776edd0..bdfeab70 100644
--- a/fuse/FuseErrnoException.h
+++ b/fuse/FuseErrnoException.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_FUSE_FUSEERRNOEXCEPTION_H_
-#define FSPP_FUSE_FUSEERRNOEXCEPTION_H_
+#ifndef MESSMER_FSPP_FUSE_FUSEERRNOEXCEPTION_H_
+#define MESSMER_FSPP_FUSE_FUSEERRNOEXCEPTION_H_
 
 #include <stdexcept>
 #include <errno.h>
diff --git a/fuse/params.h b/fuse/params.h
index dd527203..9903ac82 100644
--- a/fuse/params.h
+++ b/fuse/params.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_FUSE_PARAMS_H_
-#define FSPP_FUSE_PARAMS_H_
+#ifndef MESSMER_FSPP_FUSE_PARAMS_H_
+#define MESSMER_FSPP_FUSE_PARAMS_H_
 
 #define FUSE_USE_VERSION 26
 #include <fuse.h>
diff --git a/impl/FilesystemImpl.h b/impl/FilesystemImpl.h
index 8f2c17a3..a821ccd7 100644
--- a/impl/FilesystemImpl.h
+++ b/impl/FilesystemImpl.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_IMPL_FILESYSTEMIMPL_H_
-#define FSPP_IMPL_FILESYSTEMIMPL_H_
+#ifndef MESSMER_FSPP_IMPL_FILESYSTEMIMPL_H_
+#define MESSMER_FSPP_IMPL_FILESYSTEMIMPL_H_
 
 #include "FuseOpenFileList.h"
 #include "../fuse/Filesystem.h"
diff --git a/impl/FuseOpenFileList.h b/impl/FuseOpenFileList.h
index 85bbf6db..77573d17 100644
--- a/impl/FuseOpenFileList.h
+++ b/impl/FuseOpenFileList.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_IMPL_FUSEOPENFILELIST_H_
-#define FSPP_IMPL_FUSEOPENFILELIST_H_
+#ifndef MESSMER_FSPP_IMPL_FUSEOPENFILELIST_H_
+#define MESSMER_FSPP_IMPL_FUSEOPENFILELIST_H_
 
 #include "../fs_interface/File.h"
 #include "../fs_interface/OpenFile.h"
diff --git a/impl/IdList.h b/impl/IdList.h
index 010e18c6..bcbffe12 100644
--- a/impl/IdList.h
+++ b/impl/IdList.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_FUSE_IDLIST_H_
-#define FSPP_FUSE_IDLIST_H_
+#ifndef MESSMER_FSPP_IMPL_IDLIST_H_
+#define MESSMER_FSPP_IMPL_IDLIST_H_
 
 #include <map>
 #include <mutex>
diff --git a/impl/Profiler.h b/impl/Profiler.h
index a706a7ea..68a20c0f 100644
--- a/impl/Profiler.h
+++ b/impl/Profiler.h
@@ -1,5 +1,6 @@
-#ifndef FSPP_IMPL_PROFILER_H
-#define FSPP_IMPL_PROFILER_H
+#pragma once
+#ifndef MESSMER_FSPP_IMPL_PROFILER_H
+#define MESSMER_FSPP_IMPL_PROFILER_H
 
 #include <atomic>
 #include <chrono>
diff --git a/test/fuse/access/testutils/FuseAccessTest.h b/test/fuse/access/testutils/FuseAccessTest.h
index 8b15f050..4b430f10 100644
--- a/test/fuse/access/testutils/FuseAccessTest.h
+++ b/test/fuse/access/testutils/FuseAccessTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_ACCESS_TESTUTILS_FUSEACCESSTEST_H_
-#define TEST_FSPP_FUSE_ACCESS_TESTUTILS_FUSEACCESSTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_ACCESS_TESTUTILS_FUSEACCESSTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_ACCESS_TESTUTILS_FUSEACCESSTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 
diff --git a/test/fuse/createAndOpenFile/testutils/FuseCreateAndOpenTest.h b/test/fuse/createAndOpenFile/testutils/FuseCreateAndOpenTest.h
index 9f795b31..52541b5f 100644
--- a/test/fuse/createAndOpenFile/testutils/FuseCreateAndOpenTest.h
+++ b/test/fuse/createAndOpenFile/testutils/FuseCreateAndOpenTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_CREATEANDOPENFILE_TESTUTILS_FUSECREATEANDOPENTEST_H_
-#define TEST_FSPP_FUSE_CREATEANDOPENFILE_TESTUTILS_FUSECREATEANDOPENTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_CREATEANDOPENFILE_TESTUTILS_FUSECREATEANDOPENTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_CREATEANDOPENFILE_TESTUTILS_FUSECREATEANDOPENTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 
diff --git a/test/fuse/fdatasync/testutils/FuseFdatasyncTest.h b/test/fuse/fdatasync/testutils/FuseFdatasyncTest.h
index 96a9c55c..8c73cce3 100644
--- a/test/fuse/fdatasync/testutils/FuseFdatasyncTest.h
+++ b/test/fuse/fdatasync/testutils/FuseFdatasyncTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_FDATASYNC_TESTUTILS_FUSEFDATASYNCTEST_H_
-#define TEST_FSPP_FUSE_FDATASYNC_TESTUTILS_FUSEFDATASYNCTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_FDATASYNC_TESTUTILS_FUSEFDATASYNCTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_FDATASYNC_TESTUTILS_FUSEFDATASYNCTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 
diff --git a/test/fuse/flush/testutils/FuseFlushTest.h b/test/fuse/flush/testutils/FuseFlushTest.h
index df48d74a..d90ff8fb 100644
--- a/test/fuse/flush/testutils/FuseFlushTest.h
+++ b/test/fuse/flush/testutils/FuseFlushTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_FLUSH_TESTUTILS_FUSEFLUSHTEST_H_
-#define TEST_FSPP_FUSE_FLUSH_TESTUTILS_FUSEFLUSHTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_FLUSH_TESTUTILS_FUSEFLUSHTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_FLUSH_TESTUTILS_FUSEFLUSHTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 
diff --git a/test/fuse/fstat/testutils/FuseFstatTest.h b/test/fuse/fstat/testutils/FuseFstatTest.h
index 0cec3f5d..761a82a1 100644
--- a/test/fuse/fstat/testutils/FuseFstatTest.h
+++ b/test/fuse/fstat/testutils/FuseFstatTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_FSTAT_TESTUTILS_FUSEFSTATTEST_H_
-#define TEST_FSPP_FUSE_FSTAT_TESTUTILS_FUSEFSTATTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_FSTAT_TESTUTILS_FUSEFSTATTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_FSTAT_TESTUTILS_FUSEFSTATTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 
diff --git a/test/fuse/fsync/testutils/FuseFsyncTest.h b/test/fuse/fsync/testutils/FuseFsyncTest.h
index e8536427..1ab04c96 100644
--- a/test/fuse/fsync/testutils/FuseFsyncTest.h
+++ b/test/fuse/fsync/testutils/FuseFsyncTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_FSYNC_TESTUTILS_FUSEFSYNCTEST_H_
-#define TEST_FSPP_FUSE_FSYNC_TESTUTILS_FUSEFSYNCTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_FSYNC_TESTUTILS_FUSEFSYNCTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_FSYNC_TESTUTILS_FUSEFSYNCTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 
diff --git a/test/fuse/ftruncate/testutils/FuseFTruncateTest.h b/test/fuse/ftruncate/testutils/FuseFTruncateTest.h
index ae125a09..d77dff07 100644
--- a/test/fuse/ftruncate/testutils/FuseFTruncateTest.h
+++ b/test/fuse/ftruncate/testutils/FuseFTruncateTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_FTRUNCATE_TESTUTILS_FUSEFTRUNCATETEST_H_
-#define TEST_FSPP_FUSE_FTRUNCATE_TESTUTILS_FUSEFTRUNCATETEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_FTRUNCATE_TESTUTILS_FUSEFTRUNCATETEST_H_
+#define MESSMER_FSPP_TEST_FUSE_FTRUNCATE_TESTUTILS_FUSEFTRUNCATETEST_H_
 
 #include "../../../testutils/FuseTest.h"
 
diff --git a/test/fuse/lstat/testutils/FuseLstatReturnTest.h b/test/fuse/lstat/testutils/FuseLstatReturnTest.h
index 7f62c285..6b271022 100644
--- a/test/fuse/lstat/testutils/FuseLstatReturnTest.h
+++ b/test/fuse/lstat/testutils/FuseLstatReturnTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_LSTAT_FUSELSTATRETURNTEST_H_
-#define TEST_FSPP_FUSE_LSTAT_FUSELSTATRETURNTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_LSTAT_TESTUTILS_FUSELSTATRETURNTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_LSTAT_TESTUTILS_FUSELSTATRETURNTEST_H_
 
 #include "FuseLstatTest.h"
 
diff --git a/test/fuse/lstat/testutils/FuseLstatTest.h b/test/fuse/lstat/testutils/FuseLstatTest.h
index 41f3c2fd..b31d3f14 100644
--- a/test/fuse/lstat/testutils/FuseLstatTest.h
+++ b/test/fuse/lstat/testutils/FuseLstatTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_LSTAT_FUSELSTATTEST_H_
-#define TEST_FSPP_FUSE_LSTAT_FUSELSTATTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_LSTAT_TESTUTILS_FUSELSTATTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_LSTAT_TESTUTILS_FUSELSTATTEST_H_
 
 #include <string>
 #include <functional>
diff --git a/test/fuse/mkdir/testutils/FuseMkdirTest.h b/test/fuse/mkdir/testutils/FuseMkdirTest.h
index 06db44de..3cbeb9ea 100644
--- a/test/fuse/mkdir/testutils/FuseMkdirTest.h
+++ b/test/fuse/mkdir/testutils/FuseMkdirTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_MKDIR_TESTUTILS_FUSEMKDIRTEST_H_
-#define TEST_FSPP_FUSE_MKDIR_TESTUTILS_FUSEMKDIRTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_MKDIR_TESTUTILS_FUSEMKDIRTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_MKDIR_TESTUTILS_FUSEMKDIRTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 
diff --git a/test/fuse/openFile/testutils/FuseOpenTest.h b/test/fuse/openFile/testutils/FuseOpenTest.h
index e3cd1e08..edb07ca0 100644
--- a/test/fuse/openFile/testutils/FuseOpenTest.h
+++ b/test/fuse/openFile/testutils/FuseOpenTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_OPENFILE_TESTUTILS_FUSEOPENTEST_H_
-#define TEST_FSPP_FUSE_OPENFILE_TESTUTILS_FUSEOPENTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_OPENFILE_TESTUTILS_FUSEOPENTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_OPENFILE_TESTUTILS_FUSEOPENTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 
diff --git a/test/fuse/read/testutils/FuseReadTest.h b/test/fuse/read/testutils/FuseReadTest.h
index f94684c6..f7d25ae4 100644
--- a/test/fuse/read/testutils/FuseReadTest.h
+++ b/test/fuse/read/testutils/FuseReadTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_READ_TESTUTILS_FUSEREADTEST_H_
-#define TEST_FSPP_FUSE_READ_TESTUTILS_FUSEREADTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_READ_TESTUTILS_FUSEREADTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_READ_TESTUTILS_FUSEREADTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 
diff --git a/test/fuse/readDir/testutils/FuseReadDirTest.h b/test/fuse/readDir/testutils/FuseReadDirTest.h
index 01e108e5..66492139 100644
--- a/test/fuse/readDir/testutils/FuseReadDirTest.h
+++ b/test/fuse/readDir/testutils/FuseReadDirTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_READDIR_TESTUTILS_FUSEREADDIRTEST_H_
-#define TEST_FSPP_FUSE_READDIR_TESTUTILS_FUSEREADDIRTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_READDIR_TESTUTILS_FUSEREADDIRTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_READDIR_TESTUTILS_FUSEREADDIRTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 #include <dirent.h>
diff --git a/test/fuse/rename/testutils/FuseRenameTest.h b/test/fuse/rename/testutils/FuseRenameTest.h
index 207cfc0f..34192915 100644
--- a/test/fuse/rename/testutils/FuseRenameTest.h
+++ b/test/fuse/rename/testutils/FuseRenameTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_RENAME_TESTUTILS_FUSERENAMETEST_H_
-#define TEST_FSPP_FUSE_RENAME_TESTUTILS_FUSERENAMETEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_RENAME_TESTUTILS_FUSERENAMETEST_H_
+#define MESSMER_FSPP_TEST_FUSE_RENAME_TESTUTILS_FUSERENAMETEST_H_
 
 #include "../../../testutils/FuseTest.h"
 
diff --git a/test/fuse/rmdir/testutils/FuseRmdirTest.h b/test/fuse/rmdir/testutils/FuseRmdirTest.h
index eec3e50d..6f547d49 100644
--- a/test/fuse/rmdir/testutils/FuseRmdirTest.h
+++ b/test/fuse/rmdir/testutils/FuseRmdirTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_RMDIR_TESTUTILS_FUSERMDIRTEST_H_
-#define TEST_FSPP_FUSE_RMDIR_TESTUTILS_FUSERMDIRTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_RMDIR_TESTUTILS_FUSERMDIRTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_RMDIR_TESTUTILS_FUSERMDIRTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 
diff --git a/test/fuse/statfs/testutils/FuseStatfsReturnTest.h b/test/fuse/statfs/testutils/FuseStatfsReturnTest.h
index 99e46707..b6cec026 100644
--- a/test/fuse/statfs/testutils/FuseStatfsReturnTest.h
+++ b/test/fuse/statfs/testutils/FuseStatfsReturnTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_STATFS_FUSESTATFSRETURNTEST_H_
-#define TEST_FSPP_FUSE_STATFS_FUSESTATFSRETURNTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_STATFS_TESTUTILS_FUSESTATFSRETURNTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_STATFS_TESTUTILS_FUSESTATFSRETURNTEST_H_
 
 #include "FuseStatfsTest.h"
 
diff --git a/test/fuse/statfs/testutils/FuseStatfsTest.h b/test/fuse/statfs/testutils/FuseStatfsTest.h
index 1b8476a4..65278bd1 100644
--- a/test/fuse/statfs/testutils/FuseStatfsTest.h
+++ b/test/fuse/statfs/testutils/FuseStatfsTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_STATFS_FUSESTATFSTEST_H_
-#define TEST_FSPP_FUSE_STATFS_FUSESTATFSTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_STATFS_TESTUTILS_FUSESTATFSTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_STATFS_TESTUTILS_FUSESTATFSTEST_H_
 
 #include <string>
 #include <functional>
diff --git a/test/fuse/truncate/testutils/FuseTruncateTest.h b/test/fuse/truncate/testutils/FuseTruncateTest.h
index 7f89cc25..5b34322c 100644
--- a/test/fuse/truncate/testutils/FuseTruncateTest.h
+++ b/test/fuse/truncate/testutils/FuseTruncateTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_TRUNCATE_TESTUTILS_FUSETRUNCATETEST_H_
-#define TEST_FSPP_FUSE_TRUNCATE_TESTUTILS_FUSETRUNCATETEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_TRUNCATE_TESTUTILS_FUSETRUNCATETEST_H_
+#define MESSMER_FSPP_TEST_FUSE_TRUNCATE_TESTUTILS_FUSETRUNCATETEST_H_
 
 #include "../../../testutils/FuseTest.h"
 
diff --git a/test/fuse/unlink/testutils/FuseUnlinkTest.h b/test/fuse/unlink/testutils/FuseUnlinkTest.h
index a3d65d72..cfea0bb6 100644
--- a/test/fuse/unlink/testutils/FuseUnlinkTest.h
+++ b/test/fuse/unlink/testutils/FuseUnlinkTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_UNLINK_TESTUTILS_FUSEUNLINKTEST_H_
-#define TEST_FSPP_FUSE_UNLINK_TESTUTILS_FUSEUNLINKTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_UNLINK_TESTUTILS_FUSEUNLINKTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_UNLINK_TESTUTILS_FUSEUNLINKTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 
diff --git a/test/fuse/utimens/testutils/FuseUtimensTest.h b/test/fuse/utimens/testutils/FuseUtimensTest.h
index a4e2d677..9ce646cf 100644
--- a/test/fuse/utimens/testutils/FuseUtimensTest.h
+++ b/test/fuse/utimens/testutils/FuseUtimensTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_UTIMENS_TESTUTILS_FUSEUTIMENSTEST_H_
-#define TEST_FSPP_FUSE_UTIMENS_TESTUTILS_FUSEUTIMENSTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_UTIMENS_TESTUTILS_FUSEUTIMENSTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_UTIMENS_TESTUTILS_FUSEUTIMENSTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 
diff --git a/test/fuse/write/testutils/FuseWriteTest.h b/test/fuse/write/testutils/FuseWriteTest.h
index 62c0a45a..8da26a67 100644
--- a/test/fuse/write/testutils/FuseWriteTest.h
+++ b/test/fuse/write/testutils/FuseWriteTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_WRITE_TESTUTILS_FUSEWRITETEST_H_
-#define TEST_FSPP_FUSE_WRITE_TESTUTILS_FUSEWRITETEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_WRITE_TESTUTILS_FUSEWRITETEST_H_
+#define MESSMER_FSPP_TEST_FUSE_WRITE_TESTUTILS_FUSEWRITETEST_H_
 
 #include "../../../testutils/FuseTest.h"
 
diff --git a/test/testutils/FuseTest.h b/test/testutils/FuseTest.h
index 3a7d93ed..19f28237 100644
--- a/test/testutils/FuseTest.h
+++ b/test/testutils/FuseTest.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_TESTUTILS_FUSETEST_H_
-#define TEST_TESTUTILS_FUSETEST_H_
+#ifndef MESSMER_FSPP_TEST_TESTUTILS_FUSETEST_H_
+#define MESSMER_FSPP_TEST_TESTUTILS_FUSETEST_H_
 
 #include "google/gtest/gtest.h"
 #include "google/gmock/gmock.h"
diff --git a/test/testutils/FuseThread.h b/test/testutils/FuseThread.h
index 0af3929d..d6891c6e 100644
--- a/test/testutils/FuseThread.h
+++ b/test/testutils/FuseThread.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_TESTUTILS_FUSETHREAD_H_
-#define TEST_TESTUTILS_FUSETHREAD_H_
+#ifndef MESSMER_FSPP_TEST_TESTUTILS_FUSETHREAD_H_
+#define MESSMER_FSPP_TEST_TESTUTILS_FUSETHREAD_H_
 
 #include <thread>
 
diff --git a/test/testutils/InMemoryFile.h b/test/testutils/InMemoryFile.h
index 00c64217..04c9f054 100644
--- a/test/testutils/InMemoryFile.h
+++ b/test/testutils/InMemoryFile.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKS_MESSMER_FSPP_TEST_TESTUTILS_INMEMORYFILE_H_
-#define BLOCKS_MESSMER_FSPP_TEST_TESTUTILS_INMEMORYFILE_H_
+#ifndef MESSMER_FSPP_TEST_TESTUTILS_INMEMORYFILE_H_
+#define MESSMER_FSPP_TEST_TESTUTILS_INMEMORYFILE_H_
 
 #include <messmer/cpp-utils/data/Data.h>