4 files changed, 15 insertions, 24 deletions
diff --git a/dev/kernel/CFKit/GUIDWizard.h b/dev/kernel/CFKit/GUIDWizard.h
index c7cb18ac..e2d9bcb1 100644
--- a/dev/kernel/CFKit/GUIDWizard.h
+++ b/dev/kernel/CFKit/GUIDWizard.h
@@ -15,9 +15,7 @@
 #include <NeKit/Ref.h>
 #include <NeKit/Stream.h>
 
-namespace CF::XRN::Version1 {
-using namespace Kernel;
-
-Ref<GUIDSequence*>            cf_make_sequence(const ArrayList<UInt32>& seq);
-ErrorOr<Ref<Kernel::KString>> cf_try_guid_to_string(Ref<GUIDSequence*>& guid);
-}  // namespace CF::XRN::Version1
+namespace Kernel::CF::XRN::Version1 {
+Ref<GUIDSequence*>    cf_make_sequence(const ArrayList<UInt32>& seq);
+ErrorOr<Ref<KString>> cf_try_guid_to_string(Ref<GUIDSequence*>& guid);
+}  // namespace Kernel::CF::XRN::Version1
diff --git a/dev/kernel/CFKit/GUIDWrapper.h b/dev/kernel/CFKit/GUIDWrapper.h
index a3920357..14a96fde 100644
--- a/dev/kernel/CFKit/GUIDWrapper.h
+++ b/dev/kernel/CFKit/GUIDWrapper.h
@@ -15,10 +15,8 @@
 #define kXRNNil "@{........-....-M...-N...-............}"
 
 /// @brief eXtended Resource Namespace
-namespace CF::XRN {
-using namespace Kernel;
-
-union GUIDSequence {
+namespace Kernel::CF::XRN {
+union GUIDSequence final {
   alignas(8) UShort fU8[16];
   alignas(8) UShort fU16[8];
   alignas(8) UInt fU32[4];
@@ -38,8 +36,7 @@ class GUID final {
   ~GUID()         = default;
 
  public:
-  GUID& operator=(const GUID&) = default;
-  GUID(const GUID&)            = default;
+  NE_COPY_DEFAULT(GUID)
 
  public:
   GUIDSequence& operator->() noexcept { return fUUID; }
@@ -48,4 +45,4 @@ class GUID final {
  private:
   GUIDSequence fUUID;
 };
-}  // namespace CF::XRN
+}  // namespace Kernel::CF::XRN
diff --git a/dev/kernel/CFKit/Property.h b/dev/kernel/CFKit/Property.h
index 7fc9bf07..e8f2f713 100644
--- a/dev/kernel/CFKit/Property.h
+++ b/dev/kernel/CFKit/Property.h
@@ -15,9 +15,7 @@
 
 #define kMaxPropLen (256U)
 
-namespace CF {
-using namespace Kernel;
-
+namespace Kernel::CF {
 /// @brief handle to anything (number, ptr, string...)
 using PropertyId = UIntPtr;
 
@@ -32,9 +30,9 @@ class Property {
   Property& operator=(const Property&) = default;
   Property(const Property&)            = default;
 
-  BOOL            StringEquals(BasicKString<>& name);
+  BOOL            StringEquals(KBasicString<>& name);
   PropertyId&     GetValue();
-  BasicKString<>& GetKey();
+  KBasicString<>& GetKey();
 
  private:
   KString        fName{kMaxPropLen};
@@ -44,10 +42,10 @@ class Property {
 
 template <SizeT N>
 using PropertyArray = Array<Property, N>;
-}  // namespace CF
+}  // namespace Kernel::CF
 
 namespace Kernel {
-using namespace CF;
+using namespace Kernel::CF;
 }
 
 #endif  // !CFKIT_PROPS_H
diff --git a/dev/kernel/CFKit/Utils.h b/dev/kernel/CFKit/Utils.h
index 97b0ee53..247ad5fb 100644
--- a/dev/kernel/CFKit/Utils.h
+++ b/dev/kernel/CFKit/Utils.h
@@ -5,9 +5,7 @@
 #include <KernelKit/PE.h>
 
 /// @brief CFKit
-namespace CF {
-using namespace Kernel;
-
+namespace Kernel::CF {
 /// @brief Finds the PE header inside the blob.
 inline auto ldr_find_exec_header(DosHeaderPtr ptrDos) -> LDR_EXEC_HEADER_PTR {
   if (!ptrDos) return nullptr;
@@ -45,6 +43,6 @@ inline auto ldr_find_exec_header(const Char* ptrDos) -> LDR_EXEC_HEADER_PTR {
 inline auto ldr_find_opt_exec_header(const Char* ptrDos) -> LDR_OPTIONAL_HEADER_PTR {
   return ldr_find_opt_exec_header((DosHeaderPtr) ptrDos);
 }
-}  // namespace CF
+}  // namespace Kernel::CF
 
 #endif  // ifndef CFKIT_UTILS_H