diff --git a/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/Private/TaskFSMPrivate.h b/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/Private/TaskFSMPrivate.h
index 098949a..b3656e3 100644
--- a/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/Private/TaskFSMPrivate.h
+++ b/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/Private/TaskFSMPrivate.h
@@ -38,7 +38,7 @@ protected:
 
 	// Friends
 	template<class, class> friend class StateHandle;
-	friend class ::TaskFSM;
+	friend class NAMESPACE_SQUID::TaskFSM;
 
 	// Constructors (friend-only)
 	LinkHandle() = delete;
diff --git a/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/Task.h b/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/Task.h
index 555567a..c6c14ac 100644
--- a/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/Task.h
+++ b/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/Task.h
@@ -17,7 +17,7 @@
 #if SQUID_ENABLE_TASK_DEBUG
 /// @ingroup Tasks
 /// @brief Macro that instruments a task with a debug name string. Usually at the top of every task coroutine as @c TASK_NAME(__FUNCTION__)
-#define TASK_NAME(...) co_await SetDebugName(__VA_ARGS__);
+#define TASK_NAME(...) co_await NAMESPACE_SQUID::SetDebugName(__VA_ARGS__);
 #define DEBUG_STR , FString in_debugStr
 #define PASS_DEBUG_STR , in_debugStr
 #define MANUAL_DEBUG_STR(debugStr) , debugStr
diff --git a/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/TaskFSM.h b/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/TaskFSM.h
index a0de707..06131d2 100644
--- a/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/TaskFSM.h
+++ b/unreal/Plugins/SquidTasks/Source/SquidTasks/Public/SquidTasks/TaskFSM.h
@@ -102,7 +102,7 @@ public:
 	}
 
 private:
-	friend class ::TaskFSM;
+	friend class NAMESPACE_SQUID::TaskFSM;
 
 	StateHandle() = delete;
 	StateHandle(TSharedPtr<State<tStateInput, tStateConstructorFn>> InStatePtr)