diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.hpp b/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.hpp
index 437f1a3..f430662 100644
--- a/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.hpp
+++ b/Bigfoot/Sources/Engine/Include/Engine/Asset/Asset.hpp
@@ -4,8 +4,8 @@
  * \author Romain BOULLARD
  * \date   April 2026
  *********************************************************************/
-#ifndef BIGFOOT_ENGINE_ASSET_HPP
-#define BIGFOOT_ENGINE_ASSET_HPP
+#ifndef BIGFOOT_ENGINE_ASSET_ASSET_HPP
+#define BIGFOOT_ENGINE_ASSET_ASSET_HPP
 #include <Engine/Asset/Asset_generated.hpp>
 #include <Engine/Asset/Reference_generated.hpp>
 #include <Engine/EngineAssertHandler.hpp>
diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetContainer.hpp b/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetContainer.hpp
index 57c7f60..edae881 100644
--- a/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetContainer.hpp
+++ b/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetContainer.hpp
@@ -4,8 +4,8 @@
  * \author Romain BOULLARD
  * \date   May 2026
  *********************************************************************/
-#ifndef BIGFOOT_ENGINE_ASSETCONTAINER_HPP
-#define BIGFOOT_ENGINE_ASSETCONTAINER_HPP
+#ifndef BIGFOOT_ENGINE_ASSET_ASSETCONTAINER_HPP
+#define BIGFOOT_ENGINE_ASSET_ASSETCONTAINER_HPP
 #include <Engine/EngineAssertHandler.hpp>
 
 #include <System/UUID/UUID.hpp>
diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetHelper.hpp b/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetHelper.hpp
index 134be0d..d8bece8 100644
--- a/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetHelper.hpp
+++ b/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetHelper.hpp
@@ -4,8 +4,8 @@
  * \author Romain BOULLARD
  * \date   April 2026
  *********************************************************************/
-#ifndef BIGFOOT_ENGINE_ASSETHELPER_HPP
-#define BIGFOOT_ENGINE_ASSETHELPER_HPP
+#ifndef BIGFOOT_ENGINE_ASSET_ASSETHELPER_HPP
+#define BIGFOOT_ENGINE_ASSET_ASSETHELPER_HPP
 #include <Engine/Asset/AssetContainer.hpp>
 #include <Engine/Asset/Reference.hpp>
 #include <Engine/Asset/Reference_generated.hpp>
diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetTypeID.hpp b/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetTypeID.hpp
index f8a48e2..6b82dc6 100644
--- a/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetTypeID.hpp
+++ b/Bigfoot/Sources/Engine/Include/Engine/Asset/AssetTypeID.hpp
@@ -4,8 +4,8 @@
  * \author Romain BOULLARD
  * \date   February 2026
  *********************************************************************/
-#ifndef BIGFOOT_ENGINE_ASSETTYPEID_HPP
-#define BIGFOOT_ENGINE_ASSETTYPEID_HPP
+#ifndef BIGFOOT_ENGINE_ASSET_ASSETTYPEID_HPP
+#define BIGFOOT_ENGINE_ASSET_ASSETTYPEID_HPP
 #include <cstdint>
 
 namespace Bigfoot
diff --git a/Bigfoot/Sources/Engine/Include/Engine/Asset/Reference.hpp b/Bigfoot/Sources/Engine/Include/Engine/Asset/Reference.hpp
index 93d4771..610daf9 100644
--- a/Bigfoot/Sources/Engine/Include/Engine/Asset/Reference.hpp
+++ b/Bigfoot/Sources/Engine/Include/Engine/Asset/Reference.hpp
@@ -4,8 +4,8 @@
  * \author Romain BOULLARD
  * \date   April 2026
  *********************************************************************/
-#ifndef BIGFOOT_ENGINE_REFERENCE_HPP
-#define BIGFOOT_ENGINE_REFERENCE_HPP
+#ifndef BIGFOOT_ENGINE_ASSET_REFERENCE_HPP
+#define BIGFOOT_ENGINE_ASSET_REFERENCE_HPP
 #include <Engine/Asset/AssetContainer.hpp>
 
 #include <System/UUID/UUID.hpp>
diff --git a/Bigfoot/Sources/Engine/Include/Engine/BigFile/BigFile.hpp b/Bigfoot/Sources/Engine/Include/Engine/BigFile/BigFile.hpp
index 93474ef..cb1c562 100644
--- a/Bigfoot/Sources/Engine/Include/Engine/BigFile/BigFile.hpp
+++ b/Bigfoot/Sources/Engine/Include/Engine/BigFile/BigFile.hpp
@@ -4,8 +4,8 @@
  * \author Romain BOULLARD
  * \date   October 2025
  *********************************************************************/
-#ifndef BIGFOOT_ENGINE_BIGFILE_HPP
-#define BIGFOOT_ENGINE_BIGFILE_HPP
+#ifndef BIGFOOT_ENGINE_BIGFILE_BIGFILE_HPP
+#define BIGFOOT_ENGINE_BIGFILE_BIGFILE_HPP
 #include <System/File.hpp>
 
 #include <Utils/TaggedType.hpp>
diff --git a/Bigfoot/Sources/System/Include/System/Time/Time.hpp b/Bigfoot/Sources/System/Include/System/Time/Time.hpp
index cef2214..5c1e008 100644
--- a/Bigfoot/Sources/System/Include/System/Time/Time.hpp
+++ b/Bigfoot/Sources/System/Include/System/Time/Time.hpp
@@ -4,8 +4,8 @@
  * \author Romain BOULLARD
  * \date   December 2025
  *********************************************************************/
-#ifndef BIGFOOT_SYSTEM_TIME_HPP
-#define BIGFOOT_SYSTEM_TIME_HPP
+#ifndef BIGFOOT_SYSTEM_TIME_TIME_HPP
+#define BIGFOOT_SYSTEM_TIME_TIME_HPP
 #include <chrono>
 #include <compare>
 #include <cstdint>
diff --git a/Bigfoot/Sources/System/Include/System/UUID/UUID.hpp b/Bigfoot/Sources/System/Include/System/UUID/UUID.hpp
index bb98558..761c435 100644
--- a/Bigfoot/Sources/System/Include/System/UUID/UUID.hpp
+++ b/Bigfoot/Sources/System/Include/System/UUID/UUID.hpp
@@ -4,8 +4,8 @@
  * \author Romain BOULLARD
  * \date   October 2025
  *********************************************************************/
-#ifndef BIGFOOT_SYSTEM_UUID_HPP
-#define BIGFOOT_SYSTEM_UUID_HPP
+#ifndef BIGFOOT_SYSTEM_UUID_UUID_HPP
+#define BIGFOOT_SYSTEM_UUID_UUID_HPP
 #include <uuid.h>
 
 namespace Bigfoot
diff --git a/Bigfoot/Sources/Utils/Include/Utils/Log/EASTLFormatters.hpp b/Bigfoot/Sources/Utils/Include/Utils/Log/EASTLFormatters.hpp
index 3a534ea..48e1236 100644
--- a/Bigfoot/Sources/Utils/Include/Utils/Log/EASTLFormatters.hpp
+++ b/Bigfoot/Sources/Utils/Include/Utils/Log/EASTLFormatters.hpp
@@ -4,8 +4,8 @@
  * \author Romain BOULLARD
  * \date   December 2025
  *********************************************************************/
-#ifndef BIGFOOT_SYSTEM_EASTLFORMATTERS_HPP
-#define BIGFOOT_SYSTEM_EASTLFORMATTERS_HPP
+#ifndef BIGFOOT_UTILS_LOG_EASTLFORMATTERS_HPP
+#define BIGFOOT_UTILS_LOG_EASTLFORMATTERS_HPP
 #include <Utils/TargetMacros.h>
 
 #if defined(BIGFOOT_NOT_OPTIMIZED)
diff --git a/Bigfoot/Sources/Utils/Include/Utils/Log/Log.hpp b/Bigfoot/Sources/Utils/Include/Utils/Log/Log.hpp
index 2e158a6..c89082e 100644
--- a/Bigfoot/Sources/Utils/Include/Utils/Log/Log.hpp
+++ b/Bigfoot/Sources/Utils/Include/Utils/Log/Log.hpp
@@ -4,8 +4,8 @@
  * \author Romain BOULLARD
  * \date   October 2025
  *********************************************************************/
-#ifndef BIGFOOT_UTILS_LOG_HPP
-#define BIGFOOT_UTILS_LOG_HPP
+#ifndef BIGFOOT_UTILS_LOG_LOG_HPP
+#define BIGFOOT_UTILS_LOG_LOG_HPP
 #include <Utils/Log/EASTLFormatters.hpp>
 
 #if defined BIGFOOT_NOT_OPTIMIZED
diff --git a/Bigfoot/Sources/Utils/Include/Utils/TaggedType.hpp b/Bigfoot/Sources/Utils/Include/Utils/TaggedType.hpp
index a020837..dc5a7e0 100644
--- a/Bigfoot/Sources/Utils/Include/Utils/TaggedType.hpp
+++ b/Bigfoot/Sources/Utils/Include/Utils/TaggedType.hpp
@@ -4,8 +4,8 @@
  * \author Romain BOULLARD
  * \date   December 2025
  *********************************************************************/
-#ifndef BIGFOOT_UTILS_TAGGEDTYPE_H
-#define BIGFOOT_UTILS_TAGGEDTYPE_H
+#ifndef BIGFOOT_UTILS_TAGGEDTYPE_HPP
+#define BIGFOOT_UTILS_TAGGEDTYPE_HPP
 
 #include <compare>
 
diff --git a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA.hpp b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA.hpp
index 41fcfd2..b88d0eb 100644
--- a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA.hpp
+++ b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA.hpp
@@ -4,8 +4,8 @@
  * \author Romain BOULLARD
  * \date   April 2026
  *********************************************************************/
-#ifndef BIGFOOT_ENGINE_ASSETA_HPP
-#define BIGFOOT_ENGINE_ASSETA_HPP
+#ifndef BIGFOOT_ENGINETESTS_ASSET_ASSETA_HPP
+#define BIGFOOT_ENGINETESTS_ASSET_ASSETA_HPP
 #include <Engine/Asset/Asset.hpp>
 
 #include <EngineTests/Asset/AssetA_generated.hpp>
diff --git a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA_fwd.hpp b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA_fwd.hpp
index b00de9d..9045207 100644
--- a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA_fwd.hpp
+++ b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetA_fwd.hpp
@@ -4,8 +4,8 @@
  * \author Romain BOULLARD
  * \date   May 2026
  *********************************************************************/
-#ifndef BIGFOOT_ENGINE_ASSETA_FWD_HPP
-#define BIGFOOT_ENGINE_ASSETA_FWD_HPP
+#ifndef BIGFOOT_ENGINETESTS_ASSET_ASSETA_FWD_HPP
+#define BIGFOOT_ENGINETESTS_ASSET_ASSETA_FWD_HPP
 #include <Engine/Asset/AssetHelper.hpp>
 
 namespace Bigfoot
diff --git a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB.hpp b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB.hpp
index 768efdb..6c97ac2 100644
--- a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB.hpp
+++ b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB.hpp
@@ -4,8 +4,8 @@
  * \author Romain BOULLARD
  * \date   April 2026
  *********************************************************************/
-#ifndef BIGFOOT_ENGINE_ASSETB_HPP
-#define BIGFOOT_ENGINE_ASSETB_HPP
+#ifndef BIGFOOT_ENGINETESTS_ASSET_ASSETB_HPP
+#define BIGFOOT_ENGINETESTS_ASSET_ASSETB_HPP
 #include <Engine/Asset/Asset.hpp>
 
 #include <EngineTests/Asset/AssetB_generated.hpp>
diff --git a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB_fwd.hpp b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB_fwd.hpp
index d9d102d..a8b4b2c 100644
--- a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB_fwd.hpp
+++ b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetB_fwd.hpp
@@ -4,8 +4,8 @@
  * \author Romain BOULLARD
  * \date   May 2026
  *********************************************************************/
-#ifndef BIGFOOT_ENGINE_ASSETB_FWD_HPP
-#define BIGFOOT_ENGINE_ASSETB_FWD_HPP
+#ifndef BIGFOOT_ENGINETESTS_ASSET_ASSETB_FWD_HPP
+#define BIGFOOT_ENGINETESTS_ASSET_ASSETB_FWD_HPP
 #include <Engine/Asset/AssetHelper.hpp>
 
 namespace Bigfoot
diff --git a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC.hpp b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC.hpp
index 0488a91..561f8ea 100644
--- a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC.hpp
+++ b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC.hpp
@@ -4,8 +4,8 @@
  * \author Romain BOULLARD
  * \date   April 2026
  *********************************************************************/
-#ifndef BIGFOOT_ENGINE_ASSETC_HPP
-#define BIGFOOT_ENGINE_ASSETC_HPP
+#ifndef BIGFOOT_ENGINETESTS_ASSET_ASSETC_HPP
+#define BIGFOOT_ENGINETESTS_ASSET_ASSETC_HPP
 #include <Engine/Asset/Asset.hpp>
 
 #include <EngineTests/Asset/AssetC_generated.hpp>
diff --git a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC_fwd.hpp b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC_fwd.hpp
index ac699e3..49c334f 100644
--- a/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC_fwd.hpp
+++ b/Bigfoot/Tests/Engine/Include/EngineTests/Asset/AssetC_fwd.hpp
@@ -4,8 +4,8 @@
  * \author Romain BOULLARD
  * \date   May 2026
  *********************************************************************/
-#ifndef BIGFOOT_ENGINE_ASSETC_FWD_HPP
-#define BIGFOOT_ENGINE_ASSETC_FWD_HPP
+#ifndef BIGFOOT_ENGINETESTS_ASSET_ASSETC_FWD_HPP
+#define BIGFOOT_ENGINETESTS_ASSET_ASSETC_FWD_HPP
 #include <Engine/Asset/AssetHelper.hpp>
 
 namespace Bigfoot