diff --git a/include/coresystem/cs_param.hpp b/include/coresystem/cs_param.hpp
index f3cfcd86..2a4a1612 100644
--- a/include/coresystem/cs_param.hpp
+++ b/include/coresystem/cs_param.hpp
@@ -113,9 +113,9 @@ class SoloParamRepository : public FD4::FD4ResCap {
     from::set<int> liber_unknown;
     from::set<int> liber_unknown;
 };
+}; // namespace CS
+}; // namespace from
 
-LIBER_ASSERTS_BEGIN(SoloParamRepository);
+LIBER_ASSERTS_BEGIN(from::CS::SoloParamRepository);
 LIBER_ASSERT_SIZE(0x37C8);
 LIBER_ASSERTS_END;
-}; // namespace CS
-}; // namespace from
diff --git a/include/coresystem/memory.hpp b/include/coresystem/memory.hpp
index 60a73b6e..07892cae 100644
--- a/include/coresystem/memory.hpp
+++ b/include/coresystem/memory.hpp
@@ -32,9 +32,9 @@ class CSMemory : public FD4::FD4MemoryManager {
 
     bool liber_unknown = false;
 };
+} // namespace CS
+} // namespace from
 
-LIBER_ASSERTS_BEGIN(CSMemory);
+LIBER_ASSERTS_BEGIN(from::CS::CSMemory);
 LIBER_ASSERT_SIZE(0x2B8);
 LIBER_ASSERTS_END;
-} // namespace CS
-} // namespace from
diff --git a/include/coresystem/task.hpp b/include/coresystem/task.hpp
index afe96993..30f90ad3 100644
--- a/include/coresystem/task.hpp
+++ b/include/coresystem/task.hpp
@@ -266,9 +266,9 @@ class CSTask : private CSTaskBase {
     void* task_seeds_0x60[6];
     bool liber_unknown;
 };
+} // namespace CS
+} // namespace from
 
-LIBER_ASSERTS_BEGIN(CSTask);
+LIBER_ASSERTS_BEGIN(from::CS::CSTask);
 LIBER_ASSERT_SIZE(0xE8);
 LIBER_ASSERTS_END;
-} // namespace CS
-} // namespace from
diff --git a/include/coresystem/window.hpp b/include/coresystem/window.hpp
index 0d357cf7..634624e2 100644
--- a/include/coresystem/window.hpp
+++ b/include/coresystem/window.hpp
@@ -161,7 +161,10 @@ class CSWindow : public FD4::FD4ComponentBase {
     graphics_settings graphics_settings;
 };
 
-LIBER_ASSERTS_BEGIN(CSWindow);
+} // namespace CS
+} // namespace from
+
+LIBER_ASSERTS_BEGIN(from::CS::CSWindow);
 LIBER_ASSERT_OFFS(0x8, window_handle);
 LIBER_ASSERT_OFFS(0x20, window_position);
 LIBER_ASSERT_OFFS(0x28, window_size);
@@ -189,6 +192,3 @@ LIBER_ASSERT_OFFS(0x124, graphics_settings.global_illumination_quality);
 LIBER_ASSERT_OFFS(0x128, graphics_settings.grass_quality);
 LIBER_ASSERT_OFFS(0x128, graphics_settings.grass_quality);
 LIBER_ASSERTS_END;
-
-} // namespace CS
-} // namespace from
diff --git a/include/dantelion2/fileio.hpp b/include/dantelion2/fileio.hpp
index 47bc7b4c..e3b33315 100644
--- a/include/dantelion2/fileio.hpp
+++ b/include/dantelion2/fileio.hpp
@@ -196,19 +196,6 @@ class DLFileDeviceManager {
     mutable DLKR::DLPlainLightMutex mutex;
 };
 
-LIBER_ASSERTS_BEGIN(DLFileDevice);
-LIBER_ASSERT_SIZE(0x40);
-LIBER_ASSERTS_END;
-
-LIBER_ASSERTS_BEGIN(DLFileOperator);
-LIBER_ASSERT_SIZE(0x60);
-LIBER_ASSERTS_END;
-
-LIBER_ASSERTS_BEGIN(DLFileDeviceManager);
-LIBER_ASSERT_SIZE(0xE8);
-LIBER_ASSERT_OFFS(0xB8, mutex);
-LIBER_ASSERTS_END;
-
 } // namespace DLIO
 // Dantelion input/output devices (older namespace, has D postfix)
 namespace DLIOD {
@@ -233,13 +220,26 @@ class MicrosoftDiskFileOperator : public DLIO::DLFileOperator {
     void* liber_unknown;
     int liber_unknown;
 };
+} // namespace msvc90_windows
+} // namespace DLIOD
+} // namespace from
+/// @endcond
 
-LIBER_ASSERTS_BEGIN(MicrosoftDiskFileOperator);
+LIBER_ASSERTS_BEGIN(from::DLIO::DLFileDevice);
+LIBER_ASSERT_SIZE(0x40);
+LIBER_ASSERTS_END;
+
+LIBER_ASSERTS_BEGIN(from::DLIO::DLFileOperator);
+LIBER_ASSERT_SIZE(0x60);
+LIBER_ASSERTS_END;
+
+LIBER_ASSERTS_BEGIN(from::DLIO::DLFileDeviceManager);
+LIBER_ASSERT_SIZE(0xE8);
+LIBER_ASSERT_OFFS(0xB8, mutex);
+LIBER_ASSERTS_END;
+
+LIBER_ASSERTS_BEGIN(from::DLIOD::msvc90_windows::MicrosoftDiskFileOperator);
 LIBER_ASSERT_SIZE(0xD8);
 LIBER_ASSERT_OFFS(0x6C, file_info);
 LIBER_ASSERT_OFFS(0xA0, cursor_pos);
 LIBER_ASSERTS_END;
-} // namespace msvc90_windows
-} // namespace DLIOD
-} // namespace from
-/// @endcond
diff --git a/include/dantelion2/kernel_runtime.hpp b/include/dantelion2/kernel_runtime.hpp
index 23bb5c81..4428ff7b 100644
--- a/include/dantelion2/kernel_runtime.hpp
+++ b/include/dantelion2/kernel_runtime.hpp
@@ -94,10 +94,6 @@ class DLPlainLightMutex : public DLUT::DLNonCopyable {
     } _dummy_section;
 };
 
-LIBER_ASSERTS_BEGIN(DLPlainLightMutex);
-LIBER_ASSERT_SIZE(0x30);
-LIBER_ASSERTS_END;
-
 /**
  * @brief A wrapper around a Windows kernel mutex.
  *
@@ -144,10 +140,6 @@ class DLPlainMutex : public DLUT::DLNonCopyable {
     HANDLE mutex_handle;
 };
 
-LIBER_ASSERTS_BEGIN(DLPlainMutex);
-LIBER_ASSERT_SIZE(0x10);
-LIBER_ASSERTS_END;
-
 /**
  * @brief A wrapper around a Windows Critical Section (with a spincount).
  *
@@ -179,9 +171,17 @@ class DLPlainAdaptiveMutex : public DLPlainLightMutex {
 private:
     int spin_count;
 };
+} // namespace DLKR
+} // namespace from
 
-LIBER_ASSERTS_BEGIN(DLPlainAdaptiveMutex);
+LIBER_ASSERTS_BEGIN(from::DLKR::DLPlainLightMutex);
+LIBER_ASSERT_SIZE(0x30);
+LIBER_ASSERTS_END;
+
+LIBER_ASSERTS_BEGIN(from::DLKR::DLPlainMutex);
+LIBER_ASSERT_SIZE(0x10);
+LIBER_ASSERTS_END;
+
+LIBER_ASSERTS_BEGIN(from::DLKR::DLPlainAdaptiveMutex);
 LIBER_ASSERT_SIZE(0x38);
 LIBER_ASSERTS_END;
-} // namespace DLKR
-} // namespace from
diff --git a/include/dantelion2/reflection.hpp b/include/dantelion2/reflection.hpp
index 9465a412..a2bb4da9 100644
--- a/include/dantelion2/reflection.hpp
+++ b/include/dantelion2/reflection.hpp
@@ -423,23 +423,23 @@ class DLRuntimeClassTemplate {
         DLRuntimeClassTemplate::dl_runtime_class_name_w.string
     };
 };
+} // namespace DLRF
+} // namespace from
 
-LIBER_ASSERTS_BEGIN(DLRuntimeMethod);
+LIBER_ASSERTS_BEGIN(from::DLRF::DLRuntimeMethod);
 LIBER_ASSERT_SIZE(0x70);
 LIBER_ASSERT_OFFS(0x18, invokers);
 LIBER_ASSERT_OFFS(0x60, mutex);
 LIBER_ASSERTS_END;
 
-LIBER_ASSERTS_TEMPLATE_BEGIN(DLRuntimeObjectHolder, DLRuntimeMethod);
+LIBER_ASSERTS_TEMPLATE_BEGIN(from::DLRF::DLRuntimeObjectHolder, from::DLRF::DLRuntimeMethod);
 LIBER_ASSERT_SIZE(0x20);
 LIBER_ASSERTS_END;
 
-LIBER_ASSERTS_BEGIN(DLRuntimeClass);
+LIBER_ASSERTS_BEGIN(from::DLRF::DLRuntimeClass);
 LIBER_ASSERT_SIZE(0x38);
 LIBER_ASSERTS_END;
 
-LIBER_ASSERTS_TEMPLATE_BEGIN(DLRuntimeClassImpl, liber::dummy);
+LIBER_ASSERTS_TEMPLATE_BEGIN(from::DLRF::DLRuntimeClassImpl, liber::dummy);
 LIBER_ASSERT_SIZE(0x48);
 LIBER_ASSERTS_END;
-} // namespace DLRF
-} // namespace from
diff --git a/include/dantelion2/text.hpp b/include/dantelion2/text.hpp
index f7437425..901ad9f6 100644
--- a/include/dantelion2/text.hpp
+++ b/include/dantelion2/text.hpp
@@ -33,7 +33,7 @@ struct string_hash {
 
     /**
      * @brief Construct a new string hash object.
-     * 
+     *
      * @param str the string
      */
     explicit string_hash(const wchar_t* str)
@@ -229,9 +229,9 @@ class FD4BasicHashString {
  * may be related to weak referencing.
  */
 using DLString = std::pair<from::wstring, bool>;
+} // namespace DLTX
+} // namespace from
 
-LIBER_ASSERTS_BEGIN(FD4BasicHashString);
+LIBER_ASSERTS_BEGIN(from::DLTX::FD4BasicHashString);
 LIBER_ASSERT_SIZE(0x40);
 LIBER_ASSERTS_END;
-} // namespace DLTX
-} // namespace from
diff --git a/include/dantelion2/utility.hpp b/include/dantelion2/utility.hpp
index 474a0243..22a501b4 100644
--- a/include/dantelion2/utility.hpp
+++ b/include/dantelion2/utility.hpp
@@ -332,14 +332,7 @@ inline std::strong_ordering operator<=>(const DLReferenceCountPtr<T>& lhs,
     return lhs.get() <=> nullptr;
 }
 
-LIBER_ASSERTS_BEGIN(DLReferenceCountObject);
-LIBER_ASSERT_SIZE(0x10);
-LIBER_ASSERTS_END;
-
 struct dummy_rfco : DLReferenceCountObject {};
-LIBER_ASSERTS_TEMPLATE_BEGIN(DLReferenceCountPtr, dummy_rfco);
-LIBER_ASSERT_SIZE(0x8);
-LIBER_ASSERTS_END;
 } // namespace DLUT
 
 /**
@@ -357,3 +350,11 @@ template <typename T, typename... Args>
         std::forward<Args>(args)...);
 }
 } // namespace from
+
+LIBER_ASSERTS_BEGIN(from::DLUT::DLReferenceCountObject);
+LIBER_ASSERT_SIZE(0x10);
+LIBER_ASSERTS_END;
+
+LIBER_ASSERTS_TEMPLATE_BEGIN(from::DLUT::DLReferenceCountPtr, from::DLUT::dummy_rfco);
+LIBER_ASSERT_SIZE(0x8);
+LIBER_ASSERTS_END;
diff --git a/include/fd4/detail/fd4_memory.hpp b/include/fd4/detail/fd4_memory.hpp
index ab21c75c..af5e0e2b 100644
--- a/include/fd4/detail/fd4_memory.hpp
+++ b/include/fd4/detail/fd4_memory.hpp
@@ -51,11 +51,11 @@ class FD4MemoryManager {
     int liber_unknown = 0;
     bool liber_unknown = false;
 };
+} // namespace FD4
+} // namespace from
 
-LIBER_ASSERTS_BEGIN(FD4MemoryManager);
+LIBER_ASSERTS_BEGIN(from::FD4::FD4MemoryManager);
 LIBER_ASSERT_SIZE(0x2B0);
 LIBER_ASSERT_OFFS(0x60, allocator_names);
 LIBER_ASSERT_OFFS(0x288, size);
 LIBER_ASSERTS_END;
-} // namespace FD4
-} // namespace from
diff --git a/include/fd4/detail/fd4_task.hpp b/include/fd4/detail/fd4_task.hpp
index 80eb66d3..abdf1a7b 100644
--- a/include/fd4/detail/fd4_task.hpp
+++ b/include/fd4/detail/fd4_task.hpp
@@ -318,22 +318,24 @@ class FD4TaskManager {
         bool liber_unknown;
     }* liber_unknown;
 };
+} // namespace FD4
+} // namespace from
 
-LIBER_ASSERTS_TEMPLATE_BEGIN(FD4StepTemplateBase, void, FD4StepBaseInterface);
+LIBER_ASSERTS_TEMPLATE_BEGIN(from::FD4::FD4StepTemplateBase, void, from::FD4::FD4StepBaseInterface);
 LIBER_ASSERT_SIZE(0xA8);
 LIBER_ASSERT_OFFS(0x8, steps);
 LIBER_ASSERT_OFFS(0x68, unk_wstr);
 LIBER_ASSERT_OFFS(0x98, state);
 LIBER_ASSERTS_END;
 
-LIBER_ASSERTS_TEMPLATE_BEGIN(FD4StepTemplateBase, void, FD4TaskBase);
+LIBER_ASSERTS_TEMPLATE_BEGIN(from::FD4::FD4StepTemplateBase, void, from::FD4::FD4TaskBase);
 LIBER_ASSERT_SIZE(0xB0);
 LIBER_ASSERT_OFFS(0x10, steps);
 LIBER_ASSERT_OFFS(0x70, unk_wstr);
 LIBER_ASSERT_OFFS(0xA0, state);
 LIBER_ASSERTS_END;
 
-LIBER_ASSERTS_BEGIN(FD4TaskEntryGroup);
+LIBER_ASSERTS_BEGIN(from::FD4::FD4TaskEntryGroup);
 LIBER_ASSERT_SIZE(0xD0);
 LIBER_ASSERT_OFFS(0x08, entries);
 LIBER_ASSERT_OFFS(0x28, states);
@@ -341,9 +343,7 @@ LIBER_ASSERT_OFFS(0x48, queue);
 LIBER_ASSERT_OFFS(0x80, group_id);
 LIBER_ASSERTS_END;
 
-LIBER_ASSERTS_BEGIN(FD4TaskManager);
+LIBER_ASSERTS_BEGIN(from::FD4::FD4TaskManager);
 LIBER_ASSERT_SIZE(0x58);
 LIBER_ASSERT_OFFS(0x40, cs_task);
 LIBER_ASSERTS_END;
-} // namespace FD4
-} // namespace from
diff --git a/include/fd4/resource.hpp b/include/fd4/resource.hpp
index 5371b8f8..c61fb0ac 100644
--- a/include/fd4/resource.hpp
+++ b/include/fd4/resource.hpp
@@ -338,25 +338,25 @@ class FD4ResRep : public FD4ResCap {
 private:
     FD4ResCapHolder res_holder;
 };
+} // namespace FD4
+} // namespace from
 
-LIBER_ASSERTS_BEGIN(FD4ResCapHolderItem);
+LIBER_ASSERTS_BEGIN(from::FD4::FD4ResCapHolderItem);
 LIBER_ASSERT_SIZE(0x60);
 LIBER_ASSERTS_END;
 
-LIBER_ASSERTS_BEGIN(FD4ResCap);
+LIBER_ASSERTS_BEGIN(from::FD4::FD4ResCap);
 LIBER_ASSERT_SIZE(0x78);
 LIBER_ASSERTS_END;
 
-LIBER_ASSERTS_BEGIN(FD4FileCap);
+LIBER_ASSERTS_BEGIN(from::FD4::FD4FileCap);
 LIBER_ASSERT_SIZE(0x90);
 LIBER_ASSERTS_END;
 
-LIBER_ASSERTS_BEGIN(FD4ResCapHolder);
+LIBER_ASSERTS_BEGIN(from::FD4::FD4ResCapHolder);
 LIBER_ASSERT_SIZE(0x28);
 LIBER_ASSERTS_END;
 
-LIBER_ASSERTS_BEGIN(FD4ResRep);
+LIBER_ASSERTS_BEGIN(from::FD4::FD4ResRep);
 LIBER_ASSERT_SIZE(0xA0);
 LIBER_ASSERTS_END;
-} // namespace FD4
-} // namespace from
diff --git a/source/graphics/draw.cpp b/source/graphics/draw.cpp
index 5789e5f6..328badf9 100644
--- a/source/graphics/draw.cpp
+++ b/source/graphics/draw.cpp
@@ -137,11 +137,11 @@ void GXDrawTask::eztask_execute(FD4::FD4TaskData* data) {
     liber::function<"GXBS::GXDrawQueue::queue_callback", void>::call(draw_queue,
         &liber_draw_callback, this, this, priority);
 }
+} // namespace GXBS
+} // namespace from
 
-LIBER_ASSERTS_BEGIN(GXSwapChain);
+LIBER_ASSERTS_BEGIN(from::GXBS::GXSwapChain);
 LIBER_ASSERT_SIZE(0x170);
 LIBER_ASSERT_OFFS(0x68, main_texture);
 LIBER_ASSERT_OFFS(0xE8, depth_stencil_buffer);
 LIBER_ASSERTS_END;
-} // namespace GXBS
-} // namespace from