diff --git a/src/add-ons/kernel/drivers/network/Jamfile b/src/add-ons/kernel/drivers/network/Jamfile
index 147cdaab6d..5bd657ea13 100644
--- a/src/add-ons/kernel/drivers/network/Jamfile
+++ b/src/add-ons/kernel/drivers/network/Jamfile
@@ -37,5 +37,4 @@ SubInclude HAIKU_TOP src add-ons kernel drivers network dec21xxx ;
 SubInclude HAIKU_TOP src add-ons kernel drivers network rtl8139 ;
 
 SubInclude HAIKU_TOP src add-ons kernel drivers network wlan ;
-
-SubInclude HAIKU_TOP src add-ons kernel drivers network wimax ;
+SubInclude HAIKU_TOP src add-ons kernel drivers network wwan ;
diff --git a/src/add-ons/kernel/drivers/network/wimax/Jamfile b/src/add-ons/kernel/drivers/network/wimax/Jamfile
deleted file mode 100644
index ed4175c363..0000000000
--- a/src/add-ons/kernel/drivers/network/wimax/Jamfile
+++ /dev/null
@@ -1,3 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network wimax ;
-
-SubIncludeGPL HAIKU_TOP src add-ons kernel drivers network wimax usb_beceemwmx ;
diff --git a/src/add-ons/kernel/drivers/network/wwan/Jamfile b/src/add-ons/kernel/drivers/network/wwan/Jamfile
new file mode 100644
index 0000000000..4108d65fda
--- /dev/null
+++ b/src/add-ons/kernel/drivers/network/wwan/Jamfile
@@ -0,0 +1,3 @@
+SubDir HAIKU_TOP src add-ons kernel drivers network wwan ;
+
+SubIncludeGPL HAIKU_TOP src add-ons kernel drivers network wwan usb_beceemwmx ;
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemCPU.cpp b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemCPU.cpp
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemCPU.cpp
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemCPU.cpp
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemCPU.h b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemCPU.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemCPU.h
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemCPU.h
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemDDR.cpp b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemDDR.cpp
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemDDR.cpp
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemDDR.cpp
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemDDR.h b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemDDR.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemDDR.h
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemDDR.h
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemDevice.cpp b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemDevice.cpp
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemDevice.cpp
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemDevice.cpp
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemDevice.h b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemDevice.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemDevice.h
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemDevice.h
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemLED.cpp b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemLED.cpp
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemLED.cpp
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemLED.cpp
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemLED.h b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemLED.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemLED.h
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemLED.h
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemNVM.cpp b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemNVM.cpp
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemNVM.cpp
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemNVM.cpp
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemNVM.h b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemNVM.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/BeceemNVM.h
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/BeceemNVM.h
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/DeviceStruct.h b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/DeviceStruct.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/DeviceStruct.h
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/DeviceStruct.h
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/Driver.cpp b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/Driver.cpp
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/Driver.cpp
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/Driver.cpp
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/Driver.h b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/Driver.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/Driver.h
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/Driver.h
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/Jamfile b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/Jamfile
similarity index 75%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/Jamfile
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/Jamfile
index 082adfe93c..ec19bd901e 100644
--- a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/Jamfile
+++ b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network wimax usb_beceemwmx ;
+SubDir HAIKU_TOP src add-ons kernel drivers network wwan usb_beceemwmx ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/README b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/README
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/README
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/README
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/Settings.cpp b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/Settings.cpp
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/Settings.cpp
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/Settings.cpp
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/Settings.h b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/Settings.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/Settings.h
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/Settings.h
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/usb_beceemwmx.settings b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/usb_beceemwmx.settings
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/usb_beceemwmx.settings
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/usb_beceemwmx.settings
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/util.cpp b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/util.cpp
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/util.cpp
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/util.cpp
diff --git a/src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/util.h b/src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/util.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wimax/usb_beceemwmx/util.h
rename to src/add-ons/kernel/drivers/network/wwan/usb_beceemwmx/util.h