1 files changed, 5 insertions, 7 deletions
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