diff --git a/internal/platform/implementation/apple/Mediums/BUILD b/internal/platform/implementation/apple/Mediums/BUILD
index 2059d42d..705c492d 100644
--- a/internal/platform/implementation/apple/Mediums/BUILD
+++ b/internal/platform/implementation/apple/Mediums/BUILD
@@ -35,12 +35,12 @@ objc_library(
         "GNCLeaks.h",
         "GNCLeaks.m",
         "GNCMConnection.m",
-        "NWFramework/GNCIPv4Address.m",
-        "NWFramework/GNCNWFramework.m",
-        "NWFramework/GNCNWFrameworkError.m",
-        "NWFramework/GNCNWFrameworkServerSocket.m",
-        "NWFramework/GNCNWFrameworkServerSocket+Internal.h",
-        "NWFramework/GNCNWFrameworkSocket.m",
+        "WiFiCommon/GNCIPv4Address.m",
+        "WiFiCommon/GNCNWFramework.m",
+        "WiFiCommon/GNCNWFrameworkError.m",
+        "WiFiCommon/GNCNWFrameworkServerSocket.m",
+        "WiFiCommon/GNCNWFrameworkServerSocket+Internal.h",
+        "WiFiCommon/GNCNWFrameworkSocket.m",
     ],
     hdrs = [
         "BLEv2/GNCBLEError.h",
@@ -55,11 +55,11 @@ objc_library(
         "Ble/GNCMBleConnection.h",
         "Ble/GNCMBleUtils.h",
         "GNCMConnection.h",
-        "NWFramework/GNCIPv4Address.h",
-        "NWFramework/GNCNWFramework.h",
-        "NWFramework/GNCNWFrameworkError.h",
-        "NWFramework/GNCNWFrameworkServerSocket.h",
-        "NWFramework/GNCNWFrameworkSocket.h",
+        "WiFiCommon/GNCIPv4Address.h",
+        "WiFiCommon/GNCNWFramework.h",
+        "WiFiCommon/GNCNWFrameworkError.h",
+        "WiFiCommon/GNCNWFrameworkServerSocket.h",
+        "WiFiCommon/GNCNWFrameworkSocket.h",
     ],
     deps = [
         "//internal/platform/implementation/apple:Shared",
diff --git a/internal/platform/implementation/apple/Mediums/NWFramework/GNCIPv4Address.h b/internal/platform/implementation/apple/Mediums/WiFiCommon/GNCIPv4Address.h
similarity index 100%
rename from internal/platform/implementation/apple/Mediums/NWFramework/GNCIPv4Address.h
rename to internal/platform/implementation/apple/Mediums/WiFiCommon/GNCIPv4Address.h
diff --git a/internal/platform/implementation/apple/Mediums/NWFramework/GNCIPv4Address.m b/internal/platform/implementation/apple/Mediums/WiFiCommon/GNCIPv4Address.m
similarity index 95%
rename from internal/platform/implementation/apple/Mediums/NWFramework/GNCIPv4Address.m
rename to internal/platform/implementation/apple/Mediums/WiFiCommon/GNCIPv4Address.m
index 6fc72996..9ae7961f 100644
--- a/internal/platform/implementation/apple/Mediums/NWFramework/GNCIPv4Address.m
+++ b/internal/platform/implementation/apple/Mediums/WiFiCommon/GNCIPv4Address.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCIPv4Address.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCIPv4Address.h"
 
 @implementation GNCIPv4Address
 
diff --git a/internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFramework.h b/internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFramework.h
similarity index 100%
rename from internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFramework.h
rename to internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFramework.h
diff --git a/internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFramework.m b/internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFramework.m
similarity index 96%
rename from internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFramework.m
rename to internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFramework.m
index 64e994dd..04d0cab6 100644
--- a/internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFramework.m
+++ b/internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFramework.m
@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFramework.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFramework.h"
 
 #import <Foundation/Foundation.h>
 #import <Network/Network.h>
 
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCIPv4Address.h"
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkError.h"
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkServerSocket+Internal.h"
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkServerSocket.h"
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkSocket.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCIPv4Address.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkError.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkServerSocket+Internal.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkServerSocket.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkSocket.h"
 #import "GoogleToolboxForMac/GTMLogger.h"
 
 // An arbitrary timeout that should be pretty lenient.
diff --git a/internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkError.h b/internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkError.h
similarity index 100%
rename from internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkError.h
rename to internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkError.h
diff --git a/internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkError.m b/internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkError.m
similarity index 88%
rename from internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkError.m
rename to internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkError.m
index 267b14f2..520d349a 100644
--- a/internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkError.m
+++ b/internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkError.m
@@ -12,6 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkError.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkError.h"
 
 NSErrorDomain const GNCNWFrameworkErrorDomain = @"com.google.nearby.network.error";
diff --git a/internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkServerSocket+Internal.h b/internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkServerSocket+Internal.h
similarity index 94%
rename from internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkServerSocket+Internal.h
rename to internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkServerSocket+Internal.h
index 1f569962..b34dc1f5 100644
--- a/internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkServerSocket+Internal.h
+++ b/internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkServerSocket+Internal.h
@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkServerSocket.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkServerSocket.h"
 
 @interface GNCNWFrameworkServerSocket (Internal)
 
diff --git a/internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkServerSocket.h b/internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkServerSocket.h
similarity index 100%
rename from internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkServerSocket.h
rename to internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkServerSocket.h
diff --git a/internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkServerSocket.m b/internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkServerSocket.m
similarity index 95%
rename from internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkServerSocket.m
rename to internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkServerSocket.m
index f50e8c31..078a0260 100644
--- a/internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkServerSocket.m
+++ b/internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkServerSocket.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkServerSocket.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkServerSocket.h"
 
 #import <Foundation/Foundation.h>
 #import <Network/Network.h>
@@ -22,10 +22,10 @@
 #include <netdb.h>
 #include <sys/socket.h>
 
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCIPv4Address.h"
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkError.h"
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkServerSocket+Internal.h"
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkSocket.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCIPv4Address.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkError.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkServerSocket+Internal.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkSocket.h"
 #import "GoogleToolboxForMac/GTMLogger.h"
 
 @interface GNCNWFrameworkServerSocket ()
diff --git a/internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkSocket.h b/internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkSocket.h
similarity index 100%
rename from internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkSocket.h
rename to internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkSocket.h
diff --git a/internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkSocket.m b/internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkSocket.m
similarity index 97%
rename from internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkSocket.m
rename to internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkSocket.m
index 2fca548c..55e7b925 100644
--- a/internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkSocket.m
+++ b/internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkSocket.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkSocket.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkSocket.h"
 
 #import <Foundation/Foundation.h>
 #import <Network/Network.h>
diff --git a/internal/platform/implementation/apple/Tests/GNCIPAddressTest.mm b/internal/platform/implementation/apple/Tests/GNCIPAddressTest.mm
index 70269658..75551ca9 100644
--- a/internal/platform/implementation/apple/Tests/GNCIPAddressTest.mm
+++ b/internal/platform/implementation/apple/Tests/GNCIPAddressTest.mm
@@ -17,7 +17,7 @@
 
 #include <string>
 
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCIPv4Address.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCIPv4Address.h"
 
 @interface GNCIPv4AddressTest : XCTestCase
 @end
diff --git a/internal/platform/implementation/apple/wifi_lan.mm b/internal/platform/implementation/apple/wifi_lan.mm
index c5b32a5d..af2682c9 100644
--- a/internal/platform/implementation/apple/wifi_lan.mm
+++ b/internal/platform/implementation/apple/wifi_lan.mm
@@ -19,10 +19,10 @@
 #include <string>
 #include <utility>
 
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCIPv4Address.h"
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFramework.h"
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkServerSocket.h"
-#import "internal/platform/implementation/apple/Mediums/NWFramework/GNCNWFrameworkSocket.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCIPv4Address.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFramework.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkServerSocket.h"
+#import "internal/platform/implementation/apple/Mediums/WiFiCommon/GNCNWFrameworkSocket.h"
 #import "GoogleToolboxForMac/GTMLogger.h"
 
 namespace nearby {