diff --git a/projects/core/src/buffers/gryphn_buffer.h b/projects/core/src/buffers/gryphn_buffer.h
index d05f850..516dce8 100644
--- a/projects/core/src/buffers/gryphn_buffer.h
+++ b/projects/core/src/buffers/gryphn_buffer.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "stdlib.h"
-#include "utils/gryphn_error_code.h"
+#include "core/gryphn_return_code.h"
 #include "utils/lists/gryphn_array_list.h"
 #include <gryphn_handles.h>
 
diff --git a/projects/core/src/command/command_buffer/gryphn_command_buffer.h b/projects/core/src/command/command_buffer/gryphn_command_buffer.h
index e86efd8..a54f881 100644
--- a/projects/core/src/command/command_buffer/gryphn_command_buffer.h
+++ b/projects/core/src/command/command_buffer/gryphn_command_buffer.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "stdint.h"
-#include "utils/gryphn_error_code.h"
+#include "core/gryphn_return_code.h"
 #include "utils/lists/gryphn_array_list.h"
 #include "gryphn_handles.h"
 
diff --git a/projects/core/src/command/command_pool/gryphn_command_pool.h b/projects/core/src/command/command_pool/gryphn_command_pool.h
index 9797a51..0c343b0 100644
--- a/projects/core/src/command/command_pool/gryphn_command_pool.h
+++ b/projects/core/src/command/command_pool/gryphn_command_pool.h
@@ -1,6 +1,6 @@
 #pragma once
 // #include "stdint.h"
-#include <utils/gryphn_error_code.h>
+#include <core/gryphn_return_code.h>
 #include "gryphn_handles.h"
 
 typedef enum gnCommandPoolFlagBits {
diff --git a/projects/core/src/framebuffer/gryphn_framebuffer.h b/projects/core/src/framebuffer/gryphn_framebuffer.h
index a7516c4..1dc3c3b 100644
--- a/projects/core/src/framebuffer/gryphn_framebuffer.h
+++ b/projects/core/src/framebuffer/gryphn_framebuffer.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "utils/math/gryphn_vec2.h"
-#include "utils/gryphn_error_code.h"
+#include "core/gryphn_return_code.h"
 #include "gryphn_handles.h"
 
 typedef struct gnFramebufferInfo {
diff --git a/projects/core/src/instance/gryphn_instance.h b/projects/core/src/instance/gryphn_instance.h
index 37619f2..111a4cd 100644
--- a/projects/core/src/instance/gryphn_instance.h
+++ b/projects/core/src/instance/gryphn_instance.h
@@ -2,7 +2,7 @@
 #include "core/src/gryphn_rendering_api.h"
 #include "core/src/gryphn_handles.h"
 #include "utils/gryphn_version.h"
-#include "core/gryphn_error_code.h"
+#include "core/gryphn_return_code.h"
 #include "core/src/instance/gryphn_debugger.h"
 #include <gryphn_extensions.h>
 
diff --git a/projects/core/src/output_device/gryphn_output_device.h b/projects/core/src/output_device/gryphn_output_device.h
index b21d5c8..a80f453 100644
--- a/projects/core/src/output_device/gryphn_output_device.h
+++ b/projects/core/src/output_device/gryphn_output_device.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <output_device/gryphn_physical_output_device.h>
-#include <core/gryphn_error_code.h>
+#include <core/gryphn_return_code.h>
 
 typedef struct gnOutputDeviceEnabledFeatures {
 
diff --git a/projects/core/src/present/gryphn_present.h b/projects/core/src/present/gryphn_present.h
index b050b4d..291f861 100644
--- a/projects/core/src/present/gryphn_present.h
+++ b/projects/core/src/present/gryphn_present.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "stdint.h"
-#include "utils/gryphn_error_code.h"
+#include "core/gryphn_return_code.h"
 #include "gryphn_handles.h"
 
 typedef struct gnPresentInfo {
diff --git a/projects/core/src/renderpass/gryphn_render_pass_descriptor.h b/projects/core/src/renderpass/gryphn_render_pass_descriptor.h
index 0c2914d..6e11edd 100644
--- a/projects/core/src/renderpass/gryphn_render_pass_descriptor.h
+++ b/projects/core/src/renderpass/gryphn_render_pass_descriptor.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "stdint.h"
 #include "utils/gryphn_image_format.h"
-#include "utils/gryphn_error_code.h"
+#include "core/gryphn_return_code.h"
 #include "core/src/output_device/gryphn_physical_output_device.h"
 #include "gryphn_handles.h"
 
diff --git a/projects/core/src/shader_module/gryphn_shader_module.h b/projects/core/src/shader_module/gryphn_shader_module.h
index fa092db..37b00ad 100644
--- a/projects/core/src/shader_module/gryphn_shader_module.h
+++ b/projects/core/src/shader_module/gryphn_shader_module.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "stdint.h"
 #include "utils/gryphn_string.h"
-#include "utils/gryphn_error_code.h"
+#include "core/gryphn_return_code.h"
 #include "gryphn_handles.h"
 
 typedef enum gnShaderModuleStage {
diff --git a/projects/core/src/submit/gryphn_submit.h b/projects/core/src/submit/gryphn_submit.h
index 5c609e5..fd4a5c1 100644
--- a/projects/core/src/submit/gryphn_submit.h
+++ b/projects/core/src/submit/gryphn_submit.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "stdint.h"
-#include "utils/gryphn_error_code.h"
+#include "core/gryphn_return_code.h"
 #include "gryphn_handles.h"
 
 typedef struct gnSubmitInfo {
diff --git a/projects/core/src/textures/gryphn_texture.h b/projects/core/src/textures/gryphn_texture.h
index 478e16a..ffa6c04 100644
--- a/projects/core/src/textures/gryphn_texture.h
+++ b/projects/core/src/textures/gryphn_texture.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "utils/gryphn_image_format.h"
-#include "utils/gryphn_error_code.h"
+#include "core/gryphn_return_code.h"
 #include "utils/math/gryphn_vec3.h"
 #include "core/src/output_device/gryphn_physical_output_device.h"
 #include <gryphn_handles.h>
diff --git a/projects/core/src/window_surface/gryphn_surface_create_functions.h b/projects/core/src/window_surface/gryphn_surface_create_functions.h
index 1d2dacb..90dc2e2 100644
--- a/projects/core/src/window_surface/gryphn_surface_create_functions.h
+++ b/projects/core/src/window_surface/gryphn_surface_create_functions.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <gryphn_platform_include.h>
 #include <gryphn_handles.h>
-#include <utils/gryphn_error_code.h>
+#include <core/gryphn_return_code.h>
 
 #ifdef GN_PLATFORM_LINUX
     #ifdef GN_WINDOW_X11