diff --git a/src/common/wifi/dot11/adapter/Ieee80211Dot11Adapters.cxx b/src/common/wifi/dot11/adapter/Ieee80211Dot11Adapters.cxx
index 1cb42a3a..de4eb64d 100644
--- a/src/common/wifi/dot11/adapter/Ieee80211Dot11Adapters.cxx
+++ b/src/common/wifi/dot11/adapter/Ieee80211Dot11Adapters.cxx
@@ -1,5 +1,6 @@
 
 #include <algorithm>
+#include <cstdlib>
 #include <iterator>
 #include <ranges>
 #include <unordered_map>
@@ -15,7 +16,6 @@
 namespace Microsoft::Net::Wifi
 {
 using Microsoft::Net::Remote::Wifi::WifiAccessPointOperationStatusCode;
-using Microsoft::Net::Wifi::AccessPointOperationStatusCode;
 
 WifiAccessPointOperationStatusCode
 ToDot11AccessPointOperationStatusCode(AccessPointOperationStatusCode& accessPointOperationStatusCode) noexcept
@@ -61,9 +61,6 @@ FromDot11AccessPointOperationStatusCode(WifiAccessPointOperationStatusCode wifiA
     }
 }
 
-using Microsoft::Net::Wifi::Dot11SecurityProtocol;
-using Microsoft::Net::Wifi::Ieee80211SecurityProtocol;
-
 Dot11SecurityProtocol
 ToDot11SecurityProtocol(Ieee80211SecurityProtocol ieee80211SecurityProtocol) noexcept
 {
@@ -98,9 +95,6 @@ FromDot11SecurityProtocol(Dot11SecurityProtocol dot11SecurityProtocol) noexcept
     }
 }
 
-using Microsoft::Net::Wifi::Dot11PhyType;
-using Microsoft::Net::Wifi::Ieee80211PhyType;
-
 Dot11PhyType
 ToDot11PhyType(const Ieee80211PhyType ieee80211PhyType) noexcept
 {
@@ -153,9 +147,6 @@ FromDot11PhyType(const Dot11PhyType dot11PhyType) noexcept
     }
 }
 
-using Microsoft::Net::Wifi::Dot11FrequencyBand;
-using Microsoft::Net::Wifi::Ieee80211FrequencyBand;
-
 Dot11FrequencyBand
 ToDot11FrequencyBand(const Ieee80211FrequencyBand ieee80211FrequencyBand) noexcept
 {
@@ -265,9 +256,6 @@ FromDot11SetFrequencyBandsRequest(const WifiAccessPointSetFrequencyBandsRequest&
     return ieee80211FrequencyBands;
 }
 
-using Microsoft::Net::Wifi::Dot11AuthenticationAlgorithm;
-using Microsoft::Net::Wifi::Ieee80211AuthenticationAlgorithm;
-
 Dot11AuthenticationAlgorithm
 ToDot11AuthenticationAlgorithm(const Ieee80211AuthenticationAlgorithm ieee80211AuthenticationAlgorithm) noexcept
 {
@@ -329,9 +317,6 @@ FromDot11AuthenticationAlgorithm(const Dot11AuthenticationAlgorithm dot11Authent
     }
 }
 
-using Microsoft::Net::Wifi::Dot11AkmSuite;
-using Microsoft::Net::Wifi::Ieee80211AkmSuite;
-
 Dot11AkmSuite
 ToDot11AkmSuite(const Ieee80211AkmSuite ieee80211AkmSuite) noexcept
 {
@@ -434,9 +419,6 @@ FromDot11AkmSuite(const Dot11AkmSuite dot11AkmSuite) noexcept
     }
 }
 
-using Microsoft::Net::Wifi::Dot11CipherSuite;
-using Microsoft::Net::Wifi::Ieee80211CipherSuite;
-
 Dot11CipherSuite
 ToDot11CipherSuite(const Ieee80211CipherSuite ieee80211CipherSuite) noexcept
 {
@@ -559,9 +541,6 @@ FromDot11CipherSuiteConfigurations(const std::unordered_map<Dot11SecurityProtoco
     return ieee80211CipherSuiteConfigurations;
 }
 
-using Microsoft::Net::Wifi::Dot11AccessPointCapabilities;
-using Microsoft::Net::Wifi::Ieee80211AccessPointCapabilities;
-
 Dot11AccessPointCapabilities
 ToDot11AccessPointCapabilities(const Ieee80211AccessPointCapabilities& ieee80211AccessPointCapabilities) noexcept
 {
diff --git a/src/common/wifi/dot11/adapter/include/microsoft/net/wifi/Ieee80211Dot11Adapters.hxx b/src/common/wifi/dot11/adapter/include/microsoft/net/wifi/Ieee80211Dot11Adapters.hxx
index 0ff1a6e6..c1452fb2 100644
--- a/src/common/wifi/dot11/adapter/include/microsoft/net/wifi/Ieee80211Dot11Adapters.hxx
+++ b/src/common/wifi/dot11/adapter/include/microsoft/net/wifi/Ieee80211Dot11Adapters.hxx
@@ -20,215 +20,215 @@ namespace Microsoft::Net::Wifi
  * @return Microsoft::Net::Remote::Wifi::WifiAccessPointOperationStatusCode
  */
 Microsoft::Net::Remote::Wifi::WifiAccessPointOperationStatusCode
-ToDot11AccessPointOperationStatusCode(Microsoft::Net::Wifi::AccessPointOperationStatusCode& accessPointOperationStatusCode) noexcept;
+ToDot11AccessPointOperationStatusCode(AccessPointOperationStatusCode& accessPointOperationStatusCode) noexcept;
 
 /**
  * @brief Convert the specified AccessPointOperationStatus to the equivalent WifiAccessPointOperationStatusCode.
  *
  * @param wifiAccessPointOperationStatusCode The AccessPointOperationStatus to convert.
- * @return Microsoft::Net::Wifi::AccessPointOperationStatusCode
+ * @return AccessPointOperationStatusCode
  */
-Microsoft::Net::Wifi::AccessPointOperationStatusCode
+AccessPointOperationStatusCode
 FromDot11AccessPointOperationStatusCode(Microsoft::Net::Remote::Wifi::WifiAccessPointOperationStatusCode wifiAccessPointOperationStatusCode) noexcept;
 
 /**
  * @brief Convert the specified Ieee80211SecurityProtocol to the equivalent Dot11SecurityProtocol.
  *
  * @param ieee80211SecurityProtocol The IEEE 802.11 security protocol to convert.
- * @return Microsoft::Net::Wifi::Dot11SecurityProtocol
+ * @return Dot11SecurityProtocol
  */
-Microsoft::Net::Wifi::Dot11SecurityProtocol
-ToDot11SecurityProtocol(Microsoft::Net::Wifi::Ieee80211SecurityProtocol ieee80211SecurityProtocol) noexcept;
+Dot11SecurityProtocol
+ToDot11SecurityProtocol(Ieee80211SecurityProtocol ieee80211SecurityProtocol) noexcept;
 
 /**
  * @brief Convert the specified Dot11SecurityProtocol to the equivalent Ieee80211SecurityProtocol.
  *
  * @param dot11SecurityProtocol The Dot11SecurityProtocol to convert.
- * @return Microsoft::Net::Wifi::Ieee80211SecurityProtocol
+ * @return Ieee80211SecurityProtocol
  */
-Microsoft::Net::Wifi::Ieee80211SecurityProtocol
-FromDot11SecurityProtocol(Microsoft::Net::Wifi::Dot11SecurityProtocol dot11SecurityProtocol) noexcept;
+Ieee80211SecurityProtocol
+FromDot11SecurityProtocol(Dot11SecurityProtocol dot11SecurityProtocol) noexcept;
 
 /**
  * @brief Convert the specified Dot11PhyType to the equivalent IEEE 802.11 protocol.
  *
  * @param ieee80211PhyType The IEEE 802.11 PHY type to convert.
- * @return Microsoft::Net::Wifi::Dot11PhyType
+ * @return Dot11PhyType
  */
-Microsoft::Net::Wifi::Dot11PhyType
-ToDot11PhyType(Microsoft::Net::Wifi::Ieee80211PhyType ieee80211PhyType) noexcept;
+Dot11PhyType
+ToDot11PhyType(Ieee80211PhyType ieee80211PhyType) noexcept;
 
 /**
  * @brief Convert the specified Dot11PhyType to the equivalent IEEE 802.11 protocol.
  *
  * @param dot11PhyType The Dot11PhyType to convert.
- * @return Microsoft::Net::Wifi::Ieee80211PhyType
+ * @return Ieee80211PhyType
  */
-Microsoft::Net::Wifi::Ieee80211PhyType
-FromDot11PhyType(Microsoft::Net::Wifi::Dot11PhyType dot11PhyType) noexcept;
+Ieee80211PhyType
+FromDot11PhyType(Dot11PhyType dot11PhyType) noexcept;
 
 /**
  * @brief Convert the specified Dot11FrequencyBand to the equivalent IEEE 802.11 frequency band.
  *
  * @param ieee80211FrequencyBand The IEEE 802.11 frequency band to convert.
- * @return Microsoft::Net::Wifi::Dot11FrequencyBand
+ * @return Dot11FrequencyBand
  */
-Microsoft::Net::Wifi::Dot11FrequencyBand
-ToDot11FrequencyBand(Microsoft::Net::Wifi::Ieee80211FrequencyBand ieee80211FrequencyBand) noexcept;
+Dot11FrequencyBand
+ToDot11FrequencyBand(Ieee80211FrequencyBand ieee80211FrequencyBand) noexcept;
 
 /**
  * @brief Convert the specified IEEE 802.11 frequency bands to the equivalent Dot11FrequencyBands.
  *
  * @param ieee80211FrequencyBands The IEEE 802.11 frequency bands to convert.
- * @return std::vector<Microsoft::Net::Wifi::Dot11FrequencyBand>
+ * @return std::vector<Dot11FrequencyBand>
  */
-std::vector<Microsoft::Net::Wifi::Dot11FrequencyBand>
-ToDot11FrequencyBands(const std::vector<Microsoft::Net::Wifi::Ieee80211FrequencyBand>& ieee80211FrequencyBands) noexcept;
+std::vector<Dot11FrequencyBand>
+ToDot11FrequencyBands(const std::vector<Ieee80211FrequencyBand>& ieee80211FrequencyBands) noexcept;
 
 /**
  * @brief Obtain a vector of Dot11FrequencyBands from the specified WifiAccessPointSetFrequencyBandsRequest.
  *
  * @param request The request to extract the Dot11FrequencyBands from.
- * @return std::vector<Microsoft::Net::Wifi::Dot11FrequencyBand>
+ * @return std::vector<Dot11FrequencyBand>
  */
-std::vector<Microsoft::Net::Wifi::Dot11FrequencyBand>
+std::vector<Dot11FrequencyBand>
 ToDot11FrequencyBands(const Microsoft::Net::Remote::Wifi::WifiAccessPointSetFrequencyBandsRequest& request) noexcept;
 
 /**
  * @brief Obtain a vector of Dot11FrequencyBands from the specified Dot11AccessPointConfiguration.
  *
  * @param dot11AccessPointConfiguration The Dot11AccessPointConfiguration to extract the Dot11FrequencyBands from.
- * @return std::vector<Microsoft::Net::Wifi::Dot11FrequencyBand>
+ * @return std::vector<Dot11FrequencyBand>
  */
-std::vector<Microsoft::Net::Wifi::Dot11FrequencyBand>
-ToDot11FrequencyBands(const Microsoft::Net::Wifi::Dot11AccessPointConfiguration& dot11AccessPointConfiguration) noexcept;
+std::vector<Dot11FrequencyBand>
+ToDot11FrequencyBands(const Dot11AccessPointConfiguration& dot11AccessPointConfiguration) noexcept;
 
 /**
  * @brief Convert the specified Dot11FrequencyBand to the equivalent IEEE 802.11 frequency band.
  *
  * @param dot11FrequencyBand The Dot11FrequencyBand to convert.
- * @return Microsoft::Net::Wifi::Ieee80211FrequencyBand
+ * @return Ieee80211FrequencyBand
  */
-Microsoft::Net::Wifi::Ieee80211FrequencyBand
-FromDot11FrequencyBand(Microsoft::Net::Wifi::Dot11FrequencyBand dot11FrequencyBand) noexcept;
+Ieee80211FrequencyBand
+FromDot11FrequencyBand(Dot11FrequencyBand dot11FrequencyBand) noexcept;
 
 /**
  * @brief Obtain the equivalent IEEE 802.11 frequency band from the Dot11FrequencyBands in the
  * WifiAccessPointSetFrequencyBandsRequest.
  *
  * @param request
- * @return std::vector<Microsoft::Net::Wifi::Ieee80211FrequencyBand>
+ * @return std::vector<Ieee80211FrequencyBand>
  */
-std::vector<Microsoft::Net::Wifi::Ieee80211FrequencyBand>
+std::vector<Ieee80211FrequencyBand>
 FromDot11SetFrequencyBandsRequest(const Microsoft::Net::Remote::Wifi::WifiAccessPointSetFrequencyBandsRequest& request);
 
 /**
  * @brief Convert the specified IEEE 802.11 authentication algorithm to the equivalent Dot11AuthenticationAlgorithm.
  *
  * @param ieee80211AuthenticationAlgorithm The IEEE 802.11 authentication algorithm to convert.
- * @return Microsoft::Net::Wifi::Dot11AuthenticationAlgorithm
+ * @return Dot11AuthenticationAlgorithm
  */
-Microsoft::Net::Wifi::Dot11AuthenticationAlgorithm
-ToDot11AuthenticationAlgorithm(Microsoft::Net::Wifi::Ieee80211AuthenticationAlgorithm ieee80211AuthenticationAlgorithm) noexcept;
+Dot11AuthenticationAlgorithm
+ToDot11AuthenticationAlgorithm(Ieee80211AuthenticationAlgorithm ieee80211AuthenticationAlgorithm) noexcept;
 
 /**
  * @brief Convert the specified IEEE 802.11 authentication algorithms to the equivalent Dot11AuthenticationAlgorithms.
  *
  * @param ieee80211AuthenticationAlgorithms The IEEE 802.11 authentication algorithms to convert.
- * @return std::vector<Microsoft::Net::Wifi::Dot11AuthenticationAlgorithm>
+ * @return std::vector<Dot11AuthenticationAlgorithm>
  */
-std::vector<Microsoft::Net::Wifi::Dot11AuthenticationAlgorithm>
-ToDot11AuthenticationAlgorithms(const std::vector<Microsoft::Net::Wifi::Ieee80211AuthenticationAlgorithm>& ieee80211AuthenticationAlgorithms) noexcept;
+std::vector<Dot11AuthenticationAlgorithm>
+ToDot11AuthenticationAlgorithms(const std::vector<Ieee80211AuthenticationAlgorithm>& ieee80211AuthenticationAlgorithms) noexcept;
 
 /**
  * @brief Obtain a vector of Dot11AuthenticationAlgorithms from the specified Dot11AccessPointConfiguration.
  *
  * @param dot11AccessPointConfiguration The Dot11AccessPointConfiguration to extract the Dot11AuthenticationAlgorithms from.
- * @return std::vector<Microsoft::Net::Wifi::Dot11AuthenticationAlgorithm>
+ * @return std::vector<Dot11AuthenticationAlgorithm>
  */
-std::vector<Microsoft::Net::Wifi::Dot11AuthenticationAlgorithm>
-ToDot11AuthenticationAlgorithms(const Microsoft::Net::Wifi::Dot11AccessPointConfiguration& dot11AccessPointConfiguration) noexcept;
+std::vector<Dot11AuthenticationAlgorithm>
+ToDot11AuthenticationAlgorithms(const Dot11AccessPointConfiguration& dot11AccessPointConfiguration) noexcept;
 
 /**
  * @brief Convert the specified Dot11AuthenticationAlgorithm to the equivalent IEEE 802.11 authentication algorithm.
  *
  * @param dot11AuthenticationAlgorithm The Dot11AuthenticationAlgorithm to convert.
- * @return Microsoft::Net::Wifi::Ieee80211AuthenticationAlgorithm
+ * @return Ieee80211AuthenticationAlgorithm
  */
-Microsoft::Net::Wifi::Ieee80211AuthenticationAlgorithm
-FromDot11AuthenticationAlgorithm(Microsoft::Net::Wifi::Dot11AuthenticationAlgorithm dot11AuthenticationAlgorithm) noexcept;
+Ieee80211AuthenticationAlgorithm
+FromDot11AuthenticationAlgorithm(Dot11AuthenticationAlgorithm dot11AuthenticationAlgorithm) noexcept;
 
 /**
  * @brief Convert the specified IEEE 802.11 AKM suite algorithm to the equivalent Dot11CipherAlgorithm.
  *
  * @param ieee80211AkmSuite The IEEE 802.11 AKM suite algorithm to convert.
- * @return Microsoft::Net::Wifi::Dot11AkmSuite
+ * @return Dot11AkmSuite
  */
-Microsoft::Net::Wifi::Dot11AkmSuite
-ToDot11AkmSuite(Microsoft::Net::Wifi::Ieee80211AkmSuite ieee80211AkmSuite) noexcept;
+Dot11AkmSuite
+ToDot11AkmSuite(Ieee80211AkmSuite ieee80211AkmSuite) noexcept;
 
 /**
  * @brief Convert the specified Dot11AkmSuite to the equivalent IEEE 802.11 AKM suite algorithm.
  *
  * @param dot11AkmSuite The Dot11AkmSuite to convert.
- * @return Microsoft::Net::Wifi::Ieee80211AkmSuite
+ * @return Ieee80211AkmSuite
  */
-Microsoft::Net::Wifi::Ieee80211AkmSuite
-FromDot11AkmSuite(Microsoft::Net::Wifi::Dot11AkmSuite dot11AkmSuite) noexcept;
+Ieee80211AkmSuite
+FromDot11AkmSuite(Dot11AkmSuite dot11AkmSuite) noexcept;
 
 /**
  * @brief Convert the specified IEEE 802.11 cipher suite algorithm to the equivalent Dot11CipherSuite.
  *
  * @param ieee80211CipherSuite The IEEE 802.11 cipher suite algorithm to convert.
- * @return Microsoft::Net::Wifi::Dot11CipherSuite
+ * @return Dot11CipherSuite
  */
-Microsoft::Net::Wifi::Dot11CipherSuite
-ToDot11CipherSuite(Microsoft::Net::Wifi::Ieee80211CipherSuite ieee80211CipherSuite) noexcept;
+Dot11CipherSuite
+ToDot11CipherSuite(Ieee80211CipherSuite ieee80211CipherSuite) noexcept;
 
 /**
  * @brief Convert the specified Dot11CipherSuite to the equivalent IEEE 802.11 cipher suite algorithm.
  *
  * @param dot11CipherSuite The Dot11CipherSuite to convert.
- * @return Microsoft::Net::Wifi::Ieee80211CipherSuite
+ * @return Ieee80211CipherSuite
  */
-Microsoft::Net::Wifi::Ieee80211CipherSuite
-FromDot11CipherSuite(Microsoft::Net::Wifi::Dot11CipherSuite dot11CipherSuite) noexcept;
+Ieee80211CipherSuite
+FromDot11CipherSuite(Dot11CipherSuite dot11CipherSuite) noexcept;
 
 /**
  * @brief Convert the specified repeated field of Dot11CipherSuiteConfigurations to the equivalent map of Dot11SecurityProtocol to Dot11CipherSuite.
  *
  * @param dot11CipherSuiteConfigurations The repeated field of Dot11CipherSuiteConfigurations to convert.
- * @return std::unordered_map<Microsoft::Net::Wifi::Dot11SecurityProtocol, std::vector<Microsoft::Net::Wifi::Dot11CipherSuite>>
+ * @return std::unordered_map<Dot11SecurityProtocol, std::vector<Dot11CipherSuite>>
  */
-std::unordered_map<Microsoft::Net::Wifi::Dot11SecurityProtocol, std::vector<Microsoft::Net::Wifi::Dot11CipherSuite>>
-ToDot11CipherSuiteConfigurations(const google::protobuf::RepeatedPtrField<Microsoft::Net::Wifi::Dot11CipherSuiteConfiguration>& dot11CipherSuiteConfigurations) noexcept;
+std::unordered_map<Dot11SecurityProtocol, std::vector<Dot11CipherSuite>>
+ToDot11CipherSuiteConfigurations(const google::protobuf::RepeatedPtrField<Dot11CipherSuiteConfiguration>& dot11CipherSuiteConfigurations) noexcept;
 
 /**
  * @brief Convert the specified map of Ieee80211SecurityProtocol to Ieee80211CipherSuite to the equivalent vector of Dot11CipherSuiteConfiguratios.
  *
  * @param ieee80211CipherSuiteConfigurations The map of Ieee80211SecurityProtocol to Ieee80211CipherSuite to convert.
- * @return std::vector<Microsoft::Net::Wifi::Dot11CipherSuiteConfiguration>
+ * @return std::vector<Dot11CipherSuiteConfiguration>
  */
-std::vector<Microsoft::Net::Wifi::Dot11CipherSuiteConfiguration>
+std::vector<Dot11CipherSuiteConfiguration>
 ToDot11CipherSuiteConfigurations(const std::unordered_map<Ieee80211SecurityProtocol, std::vector<Ieee80211CipherSuite>>& ieee80211CipherSuiteConfigurations) noexcept;
 
 /**
  * @brief Convert the specified map of Dot11SecurityProtocol to Dot11CipherSuite to the equivalent map of IEEE 802.11 security protocol to cipher suite.
  *
  * @param dot11CipherSuiteConfigurations The map of Dot11SecurityProtocol to Dot11CipherSuite to convert.
- * @return std::unordered_map<Microsoft::Net::Wifi::Ieee80211SecurityProtocol, std::vector<Microsoft::Net::Wifi::Ieee80211CipherSuite>>
+ * @return std::unordered_map<Ieee80211SecurityProtocol, std::vector<Ieee80211CipherSuite>>
  */
-std::unordered_map<Microsoft::Net::Wifi::Ieee80211SecurityProtocol, std::vector<Microsoft::Net::Wifi::Ieee80211CipherSuite>>
-FromDot11CipherSuiteConfigurations(const std::unordered_map<Microsoft::Net::Wifi::Dot11SecurityProtocol, std::vector<Microsoft::Net::Wifi::Dot11CipherSuite>>& dot11CipherSuiteConfigurations) noexcept;
+std::unordered_map<Ieee80211SecurityProtocol, std::vector<Ieee80211CipherSuite>>
+FromDot11CipherSuiteConfigurations(const std::unordered_map<Dot11SecurityProtocol, std::vector<Dot11CipherSuite>>& dot11CipherSuiteConfigurations) noexcept;
 
 /**
  * @brief Convert the specified IEEE 802.11 access point capabilities to the equivalent Dot11AccessPointCapabilities.
  *
  * @param ieee80211AccessPointCapabilities The IEEE 802.11 access point capabilities to convert.
- * @return Microsoft::Net::Wifi::Dot11AccessPointCapabilities
+ * @return Dot11AccessPointCapabilities
  */
-Microsoft::Net::Wifi::Dot11AccessPointCapabilities
-ToDot11AccessPointCapabilities(const Microsoft::Net::Wifi::Ieee80211AccessPointCapabilities& ieee80211AccessPointCapabilities) noexcept;
+Dot11AccessPointCapabilities
+ToDot11AccessPointCapabilities(const Ieee80211AccessPointCapabilities& ieee80211AccessPointCapabilities) noexcept;
 
 } // namespace Microsoft::Net::Wifi