diff --git a/Engine/src/Runtime/Core/public/Logging/Logging.h b/Engine/src/Runtime/Core/public/Logging/Logging.h
index b7ee163..e1ece57 100644
--- a/Engine/src/Runtime/Core/public/Logging/Logging.h
+++ b/Engine/src/Runtime/Core/public/Logging/Logging.h
@@ -16,7 +16,7 @@ namespace Phanes::Core::Logging
 	PHANES_CORE void Init();
 
 	PHANES_CORE inline std::shared_ptr<spdlog::logger>& PEngineLogger() { return _PEngineLogger; };
-	PHANES_CORE inline std::shared_ptr<spdlog::logger>& PGameLogger() { return _PAppLogger; };
+	PHANES_CORE inline std::shared_ptr<spdlog::logger>& PAppLogger() { return _PAppLogger; };
 }
 
 
@@ -27,17 +27,17 @@ namespace PLog = Phanes::Core::Logging; // User Macros
 // Default logger
 
 #define PENGINE_LOG_TRACE(...)			::Phanes::Core::Logging::PEngineLogger()->trace(__VA_ARGS__)
-#define PENGINE_LOG_INFO(...)				::Phanes::Core::Logging::PEngineLogger()->info(__VA_ARGS__)
-#define PENGINE_LOG_WARN(...)				::Phanes::Core::Logging::PEngineLogger()->warn(__VA_ARGS__)
+#define PENGINE_LOG_INFO(...)			::Phanes::Core::Logging::PEngineLogger()->info(__VA_ARGS__)
+#define PENGINE_LOG_WARN(...)			::Phanes::Core::Logging::PEngineLogger()->warn(__VA_ARGS__)
 #define PENGINE_LOG_ERROR(...)			::Phanes::Core::Logging::PEngineLogger()->error(__VA_ARGS__)
-#define PENGINE_LOG_FATAL(...)			::Phanes::Core::Logging::PEngineLogger()->fatal(__VA_ARGS__)
+#define PENGINE_LOG_FATAL(...)			::Phanes::Core::Logging::PEngineLogger()->critical(__VA_ARGS__)
 
 
-#define PAPP_LOG_TRACE(...)			::Phanes::Core::Logging::PAppLogger()->trace(__VA_ARGS__)
-#define PAPP_LOG_INFO(...)			::Phanes::Core::Logging::PAppLogger()->info(__VA_ARGS__)
-#define PAPP_LOG_WARN(...)			::Phanes::Core::Logging::PAppLogger()->warn(__VA_ARGS__)
-#define PAPP_LOG_ERROR(...)			::Phanes::Core::Logging::PAppLogger()->error(__VA_ARGS__)
-#define PAPP_LOG_FATAL(...)			::Phanes::Core::Logging::PAppLogger()->fatal(__VA_ARGS__)
+#define PAPP_LOG_TRACE(...)				::Phanes::Core::Logging::PAppLogger()->trace(__VA_ARGS__)
+#define PAPP_LOG_INFO(...)				::Phanes::Core::Logging::PAppLogger()->info(__VA_ARGS__)
+#define PAPP_LOG_WARN(...)				::Phanes::Core::Logging::PAppLogger()->warn(__VA_ARGS__)
+#define PAPP_LOG_ERROR(...)				::Phanes::Core::Logging::PAppLogger()->error(__VA_ARGS__)
+#define PAPP_LOG_FATAL(...)				::Phanes::Core::Logging::PAppLogger()->critical(__VA_ARGS__)
 
 #else 
 
diff --git a/Engine/src/Runtime/Core/public/Math/MathUnitConversion.hpp b/Engine/src/Runtime/Core/public/Math/MathUnitConversion.hpp
index a1ffa9a..24b4cd2 100644
--- a/Engine/src/Runtime/Core/public/Math/MathUnitConversion.hpp
+++ b/Engine/src/Runtime/Core/public/Math/MathUnitConversion.hpp
@@ -6,7 +6,7 @@
 
 #include "Core/public/Misc/Boilerplate.h"
 
-#include "Core/public/Math/MathCommon.h"
+#include "Core/public/Math/MathCommon.hpp"
 
 namespace Phanes::Core::Math::UnitConversion 
 {