diff --git a/src/DrakePinA.hpp b/src/DrakePinA.hpp
index b8deec4..ca9a4e9 100644
--- a/src/DrakePinA.hpp
+++ b/src/DrakePinA.hpp
@@ -3,13 +3,13 @@
 #include "DrakePinTypes.hpp"
 #include "platform/gpio_platforms.hpp"
 
-using namespace DrakePin;
-
-class DrakePinA
+namespace DrakePin
+{
+class PinA
 {
 	public:
 		
-		constexpr DrakePinA(const PinA_t &pin, uint32_t sampling) : _pin(pin), _sampling(sampling)
+		constexpr PinA(const PinA_t &pin, uint32_t sampling) : _pin(pin), _sampling(sampling)
 		{}
 		
 		void Init()
@@ -44,3 +44,6 @@ class DrakePinA
 		uint32_t _sampling;
 		
 };
+}
+
+using DrakePinA = DrakePin::PinA;
diff --git a/src/DrakePinD.hpp b/src/DrakePinD.hpp
index c63e4bc..48b6861 100644
--- a/src/DrakePinD.hpp
+++ b/src/DrakePinD.hpp
@@ -3,13 +3,13 @@
 #include "DrakePinTypes.hpp"
 #include "platform/gpio_platforms.hpp"
 
-using namespace DrakePin;
-
-class DrakePinD
+namespace DrakePin
+{
+class PinD
 {
 	public:
 		
-		constexpr DrakePinD(const PinD_t &pin, ModeD_t mode, LevelD_t level) : _pin(pin), _mode(mode), _level(level)
+		constexpr PinD(const PinD_t &pin, ModeD_t mode, LevelD_t level) : _pin(pin), _mode(mode), _level(level)
 		{}
 		
 		void Init()
@@ -67,3 +67,6 @@ class DrakePinD
 		LevelD_t _level;
 		
 };
+}
+
+using DrakePinD = DrakePin::PinD;