diff --git a/includes/TerreateGraphics.hpp b/includes/TerreateGraphics.hpp
index 1c7b7e9..abadd88 100644
--- a/includes/TerreateGraphics.hpp
+++ b/includes/TerreateGraphics.hpp
@@ -1,5 +1,5 @@
-#ifndef __TERREATE_CORE_TERREATECORE_HPP__
-#define __TERREATE_CORE_TERREATECORE_HPP__
+#ifndef __TERREATE_GRAPHICS_TERREATEGRAPHICS_HPP__
+#define __TERREATE_GRAPHICS_TERREATEGRAPHICS_HPP__
 
 #include "animation.hpp"
 #include "buffer.hpp"
@@ -39,4 +39,4 @@ class Clock : public Object {
 void Initialize(Bool const &enableConsoleLog = false);
 void Terminate();
 } // namespace TerreateGraphics::Core
-#endif // __TERREATE_CORE_TERREATECORE_HPP__
+#endif // __TERREATE_GRAPHICS_TERREATEGRAPHICS_HPP__
diff --git a/includes/animation.hpp b/includes/animation.hpp
index 4a049ba..cde7d06 100644
--- a/includes/animation.hpp
+++ b/includes/animation.hpp
@@ -1,5 +1,5 @@
-#ifndef __TERREATE_CORE_ANIMATION_HPP__
-#define __TERREATE_CORE_ANIMATION_HPP__
+#ifndef __TERREATE_GRAPHICS_ANIMATION_HPP__
+#define __TERREATE_GRAPHICS_ANIMATION_HPP__
 
 #include "defines.hpp"
 #include "object.hpp"
@@ -73,4 +73,4 @@ class Animation : public Core::Object {
 };
 } // namespace TerreateGraphics::Animation
 
-#endif // __TERREATE_CORE_ANIMATION_HPP__
+#endif // __TERREATE_GRAPHICS_ANIMATION_HPP__
diff --git a/includes/bitflag.hpp b/includes/bitflag.hpp
index 39d96f7..b9970f4 100644
--- a/includes/bitflag.hpp
+++ b/includes/bitflag.hpp
@@ -1,5 +1,5 @@
-#ifndef __TERREATE_CORE_BITFLAG_HPP__
-#define __TERREATE_CORE_BITFLAG_HPP__
+#ifndef __TERREATE_GRAPHICS_BITFLAG_HPP__
+#define __TERREATE_GRAPHICS_BITFLAG_HPP__
 
 #include "defines.hpp"
 
@@ -208,4 +208,4 @@ template <enumtype T> BitFlag<T> operator^(T const &lhs, T const &rhs) {
 }
 } // namespace TerreateGraphics::Core
 
-#endif // __TERREATE_CORE_BITFLAG_HPP__
+#endif // __TERREATE_GRAPHICS_BITFLAG_HPP__
diff --git a/includes/buffer.hpp b/includes/buffer.hpp
index 3a5f32c..bd0f5b8 100644
--- a/includes/buffer.hpp
+++ b/includes/buffer.hpp
@@ -1,5 +1,5 @@
-#ifndef __TERREATE_CORE_BUFFER_HPP__
-#define __TERREATE_CORE_BUFFER_HPP__
+#ifndef __TERREATE_GRAPHICS_BUFFER_HPP__
+#define __TERREATE_GRAPHICS_BUFFER_HPP__
 
 #include "defines.hpp"
 #include "logger.hpp"
@@ -146,4 +146,4 @@ class Buffer final : public Object {
 };
 } // namespace TerreateGraphics::Core
 
-#endif // __TERREATE_CORE_BUFFER_HPP__
+#endif // __TERREATE_GRAPHICS_BUFFER_HPP__
diff --git a/includes/defines.hpp b/includes/defines.hpp
index d428349..3c2683c 100644
--- a/includes/defines.hpp
+++ b/includes/defines.hpp
@@ -1,5 +1,5 @@
-#ifndef __TERREATE_CORE_DEFINES_HPP__
-#define __TERREATE_CORE_DEFINES_HPP__
+#ifndef __TERREATE_GRAPHICS_DEFINES_HPP__
+#define __TERREATE_GRAPHICS_DEFINES_HPP__
 
 #include <atomic>
 #include <chrono>
@@ -634,4 +634,4 @@ static unsigned COLOR_BUFFERS[] = {
     (GLenum)Attachment::COLOR30, (GLenum)Attachment::COLOR31};
 } // namespace TerreateGraphics::Defines
 
-#endif // __TERREATE_CORE_DEFINES_HPP__
+#endif // __TERREATE_GRAPHICS_DEFINES_HPP__
diff --git a/includes/event.hpp b/includes/event.hpp
index 47bdae7..474da8b 100644
--- a/includes/event.hpp
+++ b/includes/event.hpp
@@ -1,5 +1,5 @@
-#ifndef __TERREATE_CORE_EVENT_HPP__
-#define __TERREATE_CORE_EVENT_HPP__
+#ifndef __TERREATE_GRAPHICS_EVENT_HPP__
+#define __TERREATE_GRAPHICS_EVENT_HPP__
 
 #include "defines.hpp"
 #include "logger.hpp"
@@ -53,4 +53,4 @@ class EventSystem : public Object {
 };
 } // namespace TerreateGraphics::Event
 
-#endif // __TERREATE_CORE_EVENT_HPP__
+#endif // __TERREATE_GRAPHICS_EVENT_HPP__
diff --git a/includes/font.hpp b/includes/font.hpp
index bdfcd9b..8bd008b 100644
--- a/includes/font.hpp
+++ b/includes/font.hpp
@@ -1,5 +1,5 @@
-#ifndef __TERREATE_CORE_FONT_HPP__
-#define __TERREATE_CORE_FONT_HPP__
+#ifndef __TERREATE_GRAPHICS_FONT_HPP__
+#define __TERREATE_GRAPHICS_FONT_HPP__
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
@@ -88,4 +88,4 @@ class Font final : public Object {
 };
 } // namespace TerreateGraphics::Core
 
-#endif // __TERREATE_CORE_FONT_HPP__
+#endif // __TERREATE_GRAPHICS_FONT_HPP__
diff --git a/includes/job.hpp b/includes/job.hpp
index 96a7e8c..dabd38b 100644
--- a/includes/job.hpp
+++ b/includes/job.hpp
@@ -1,5 +1,5 @@
-#ifndef __TERREATE_CORE_JOB_HPP__
-#define __TERREATE_CORE_JOB_HPP__
+#ifndef __TERREATE_GRAPHICS_JOB_HPP__
+#define __TERREATE_GRAPHICS_JOB_HPP__
 
 #include "defines.hpp"
 #include "logger.hpp"
@@ -156,4 +156,4 @@ class JobSystem : public Object {
 };
 } // namespace TerreateGraphics::Job
 
-#endif // __TERREATE_CORE_JOB_HPP__
+#endif // __TERREATE_GRAPHICS_JOB_HPP__
diff --git a/includes/logger.hpp b/includes/logger.hpp
index a8ae75a..f62b731 100644
--- a/includes/logger.hpp
+++ b/includes/logger.hpp
@@ -1,5 +1,5 @@
-#ifndef __TERREATE_CORE_LOGGER_HPP__
-#define __TERREATE_CORE_LOGGER_HPP__
+#ifndef __TERREATE_GRAPHICS_LOGGER_HPP__
+#define __TERREATE_GRAPHICS_LOGGER_HPP__
 
 #include "defines.hpp"
 
@@ -38,4 +38,4 @@ void Debug(Str const &msg);
 void Trace(Str const &msg);
 } // namespace TerreateGraphics::Logger
 
-#endif // __TERREATE_CORE_LOGGER_HPP__
+#endif // __TERREATE_GRAPHICS_LOGGER_HPP__
diff --git a/includes/model.hpp b/includes/model.hpp
index 3c24a49..cea1604 100644
--- a/includes/model.hpp
+++ b/includes/model.hpp
@@ -1,5 +1,5 @@
-#ifndef __TERREATE_CORE_MODEL_HPP__
-#define __TERREATE_CORE_MODEL_HPP__
+#ifndef __TERREATE_GRAPHICS_MODEL_HPP__
+#define __TERREATE_GRAPHICS_MODEL_HPP__
 
 #include "bitflag.hpp"
 #include "buffer.hpp"
@@ -420,4 +420,4 @@ class Model : public Core::Object {
 };
 } // namespace TerreateGraphics::Model
 
-#endif // __TERREATE_CORE_MODEL_HPP__
+#endif // __TERREATE_GRAPHICS_MODEL_HPP__
diff --git a/includes/object.hpp b/includes/object.hpp
index 0ae7e40..082e235 100644
--- a/includes/object.hpp
+++ b/includes/object.hpp
@@ -1,5 +1,5 @@
-#ifndef __TERREATE_CORE_OBJECT_HPP__
-#define __TERREATE_CORE_OBJECT_HPP__
+#ifndef __TERREATE_GRAPHICS_OBJECT_HPP__
+#define __TERREATE_GRAPHICS_OBJECT_HPP__
 
 #include <cstring>
 #include <random>
@@ -65,4 +65,4 @@ template <> struct std::hash<TerreateGraphics::Core::UUID> {
   }
 };
 
-#endif // __TERREATE_CORE_OBJECT_HPP__
+#endif // __TERREATE_GRAPHICS_OBJECT_HPP__
diff --git a/includes/screen.hpp b/includes/screen.hpp
index 98e1500..c53d0b9 100644
--- a/includes/screen.hpp
+++ b/includes/screen.hpp
@@ -1,5 +1,5 @@
-#ifndef __TERREATE_CORE_SCREEN_HPP__
-#define __TERREATE_CORE_SCREEN_HPP__
+#ifndef __TERREATE_GRAPHICS_SCREEN_HPP__
+#define __TERREATE_GRAPHICS_SCREEN_HPP__
 
 #include "defines.hpp"
 #include "logger.hpp"
@@ -90,4 +90,4 @@ class Screen final : public Object {
 };
 } // namespace TerreateGraphics::Core
 
-#endif // __TERREATE_CORE_SCREEN_HPP__
+#endif // __TERREATE_GRAPHICS_SCREEN_HPP__
diff --git a/includes/shader.hpp b/includes/shader.hpp
index dace81f..3d8a8d7 100644
--- a/includes/shader.hpp
+++ b/includes/shader.hpp
@@ -1,5 +1,5 @@
-#ifndef __TERREATE_CORE_SHADER_HPP__
-#define __TERREATE_CORE_SHADER_HPP__
+#ifndef __TERREATE_GRAPHICS_SHADER_HPP__
+#define __TERREATE_GRAPHICS_SHADER_HPP__
 
 #include "defines.hpp"
 #include "logger.hpp"
@@ -268,4 +268,4 @@ class Shader final : public Object {
 };
 } // namespace TerreateGraphics::Core
 
-#endif // __TERREATE_CORE_SHADER_HPP__
+#endif // __TERREATE_GRAPHICS_SHADER_HPP__
diff --git a/includes/skeleton.hpp b/includes/skeleton.hpp
index df06210..d9bb40c 100644
--- a/includes/skeleton.hpp
+++ b/includes/skeleton.hpp
@@ -1,5 +1,5 @@
-#ifndef __TERREATE_CORE_SKELETON_HPP__
-#define __TERREATE_CORE_SKELETON_HPP__
+#ifndef __TERREATE_GRAPHICS_SKELETON_HPP__
+#define __TERREATE_GRAPHICS_SKELETON_HPP__
 
 #include "defines.hpp"
 #include "object.hpp"
@@ -151,4 +151,4 @@ class Skeleton : public Core::Object {
 };
 } // namespace TerreateGraphics::Animation
 
-#endif // __TERREATE_CORE_SKELETON_HPP__
+#endif // __TERREATE_GRAPHICS_SKELETON_HPP__
diff --git a/includes/text.hpp b/includes/text.hpp
index 343c626..d0f0f33 100644
--- a/includes/text.hpp
+++ b/includes/text.hpp
@@ -1,5 +1,5 @@
-#ifndef __TERREATE_CORE_TEXT_HPP__
-#define __TERREATE_CORE_TEXT_HPP__
+#ifndef __TERREATE_GRAPHICS_TEXT_HPP__
+#define __TERREATE_GRAPHICS_TEXT_HPP__
 
 #include "defines.hpp"
 #include "font.hpp"
@@ -41,4 +41,4 @@ class Text : public Core::Object {
 };
 } // namespace TerreateGraphics::Core
 
-#endif // __TERREATE_CORE_TEXT_HPP__
+#endif // __TERREATE_GRAPHICS_TEXT_HPP__
diff --git a/includes/texture.hpp b/includes/texture.hpp
index 9499522..29bdf3b 100644
--- a/includes/texture.hpp
+++ b/includes/texture.hpp
@@ -1,5 +1,5 @@
-#ifndef __TERREATE_CORE_TEXTURE_HPP__
-#define __TERREATE_CORE_TEXTURE_HPP__
+#ifndef __TERREATE_GRAPHICS_TEXTURE_HPP__
+#define __TERREATE_GRAPHICS_TEXTURE_HPP__
 
 #define STB_IMAGE_STATIC
 #define STB_IMAGE_IMPLEMENTATION
@@ -175,4 +175,4 @@ class CubeTexture final : public Object {
 };
 } // namespace TerreateGraphics::Core
 
-#endif // __TERREATE_CORE_TEXTURE_HPP__
+#endif // __TERREATE_GRAPHICS_TEXTURE_HPP__
diff --git a/includes/window.hpp b/includes/window.hpp
index 127981d..f0bb78c 100644
--- a/includes/window.hpp
+++ b/includes/window.hpp
@@ -1,5 +1,5 @@
-#ifndef __TERREATE_CORE_WINDOW_HPP__
-#define __TERREATE_CORE_WINDOW_HPP__
+#ifndef __TERREATE_GRAPHICS_WINDOW_HPP__
+#define __TERREATE_GRAPHICS_WINDOW_HPP__
 
 #include "defines.hpp"
 #include "logger.hpp"
@@ -657,4 +657,4 @@ class Window final : public Object {
 };
 } // namespace TerreateGraphics::Core
 
-#endif // __TERREATE_CORE_WINDOW_HPP__
+#endif // __TERREATE_GRAPHICS_WINDOW_HPP__