2 files changed, 5 insertions, 3 deletions
diff --git a/src/boot/BootKit/HW/ATA.h b/src/boot/BootKit/HW/ATA.h
index 7ebf296d..1842300b 100644
--- a/src/boot/BootKit/HW/ATA.h
+++ b/src/boot/BootKit/HW/ATA.h
@@ -9,8 +9,7 @@
 #include <BootKit/Device.h>
 #include <modules/ATA/ATA.h>
 
-using namespace Kernel;
-
+namespace Boot {
 class BootDeviceATA final : public Device {
  public:
   enum {
@@ -45,3 +44,4 @@ class BootDeviceATA final : public Device {
  private:
   ATATrait mTrait;
 };
+}  // namespace Boot
+\ No newline at end of file
diff --git a/src/boot/BootKit/HW/SATA.h b/src/boot/BootKit/HW/SATA.h
index 68ed30c8..442ea399 100644
--- a/src/boot/BootKit/HW/SATA.h
+++ b/src/boot/BootKit/HW/SATA.h
@@ -12,6 +12,7 @@
 
 #define kAHCISectorSz (512)
 
+namespace Boot {
 class BootDeviceSATA final {
  public:
   explicit BootDeviceSATA();
@@ -23,7 +24,7 @@ class BootDeviceSATA final {
     Kernel::Boolean mErr{false};
     Kernel::Boolean mDetected{false};
 
-    operator bool() { return !this->mErr; }
+    explicit operator bool() { return !this->mErr; }
   };
 
   operator bool() { return this->Leak().mDetected; }
@@ -40,3 +41,4 @@ class BootDeviceSATA final {
  private:
   SATATrait mTrait;
 };
+}  // namespace Boot
+\ No newline at end of file