diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index c9911e4a38..e09144a71b 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -169,7 +169,7 @@ SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x
 	usb_ecm usb_asix
 	
 	#WLAN drivers
-	$(X86_ONLY)atheros
+	$(X86_ONLY)atheroswifi
 ;
 #SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ;
 SYSTEM_ADD_ONS_BUS_MANAGERS =  $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa
diff --git a/src/add-ons/kernel/drivers/network/wlan/Jamfile b/src/add-ons/kernel/drivers/network/wlan/Jamfile
index 7cad356caa..841f9031c3 100644
--- a/src/add-ons/kernel/drivers/network/wlan/Jamfile
+++ b/src/add-ons/kernel/drivers/network/wlan/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers network wlan ;
 
 #FreeBSD 8 WLAN drivers
 SubInclude HAIKU_TOP src add-ons kernel drivers network wlan aironetwifi ;
-SubInclude HAIKU_TOP src add-ons kernel drivers network wlan atheros ;
+SubInclude HAIKU_TOP src add-ons kernel drivers network wlan atheroswifi ;
 SubInclude HAIKU_TOP src add-ons kernel drivers network wlan broadcom43xx ;
 SubInclude HAIKU_TOP src add-ons kernel drivers network wlan iprowifi2100 ;
 SubInclude HAIKU_TOP src add-ons kernel drivers network wlan iprowifi2200 ;
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/Jamfile b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/Jamfile
similarity index 90%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/Jamfile
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/Jamfile
index 4962d34214..e068b4d9b8 100644
--- a/src/add-ons/kernel/drivers/network/wlan/atheros/Jamfile
+++ b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network wlan atheros ;
+SubDir HAIKU_TOP src add-ons kernel drivers network wlan atheroswifi ;
 
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
@@ -15,15 +15,15 @@ UseHeaders [ FDirName $(SUBDIR) dev ath ath_hal ] ;
 
 SEARCH_SOURCE += [ FDirName $(SUBDIR) dev ath ] ;
 
-Depends atheros : atheros_hal.o ;
-Depends atheros : atheros_rate.o ;
+Depends atheroswifi : atheroswifi_hal.o ;
+Depends atheroswifi : atheroswifi_rate.o ;
 
-KernelAddon atheros :
+KernelAddon atheroswifi :
 	if_ath.c
 	if_ath_pci.c
 	glue.c
-	atheros_hal.o
-	atheros_rate.o
+	atheroswifi_hal.o
+	atheroswifi_rate.o
 	:
 	libfreebsd_wlan.a
 	libfreebsd_network.a
@@ -36,7 +36,7 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) dev ath ath_hal ar5212 ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) dev ath ath_hal ar5312 ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) dev ath ath_hal ar5416 ] ;
 
-KernelMergeObject atheros_hal.o :
+KernelMergeObject atheroswifi_hal.o :
 	ah_osdep.c
 	ah.c
 	ah_regdomain.c
@@ -119,6 +119,6 @@ KernelMergeObject atheros_hal.o :
 
 SEARCH_SOURCE += [ FDirName $(SUBDIR) dev ath ath_rate sample ] ;
 
-KernelMergeObject atheros_rate.o :
+KernelMergeObject atheroswifi_rate.o :
 	sample.c
 	;
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ah_osdep.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ah_osdep.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ah_osdep.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ah_osdep.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ah_osdep.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ah_osdep.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ah_osdep.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ah_osdep.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_debug.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_debug.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_debug.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_debug.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_decode.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_decode.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_decode.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_decode.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_desc.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_desc.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_desc.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_desc.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_devid.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_devid.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_devid.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_devid.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_eeprom.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_eeprom.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_eeprom.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_eeprom.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_eeprom_v1.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_eeprom_v1.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_eeprom_v1.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_eeprom_v1.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_eeprom_v1.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_eeprom_v1.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_eeprom_v1.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_eeprom_v1.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_eeprom_v14.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_eeprom_v14.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_eeprom_v14.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_eeprom_v14.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_eeprom_v14.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_eeprom_v14.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_eeprom_v14.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_eeprom_v14.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_eeprom_v3.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_eeprom_v3.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_eeprom_v3.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_eeprom_v3.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_eeprom_v3.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_eeprom_v3.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_eeprom_v3.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_eeprom_v3.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_internal.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_internal.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_internal.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_internal.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_regdomain.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_regdomain.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_regdomain.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_regdomain.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_soc.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_soc.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ah_soc.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ah_soc.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_attach.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_attach.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_attach.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_attach.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_beacon.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_beacon.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_beacon.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_beacon.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_interrupts.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_interrupts.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_interrupts.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_interrupts.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_keycache.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_keycache.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_keycache.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_keycache.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_misc.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_misc.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_misc.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_misc.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_phy.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_phy.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_phy.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_phy.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_power.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_power.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_power.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_power.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_recv.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_recv.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_recv.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_recv.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_reset.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_reset.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_reset.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_reset.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_xmit.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_xmit.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210_xmit.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210_xmit.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210desc.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210desc.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210desc.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210desc.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210phy.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210phy.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210phy.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210phy.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210reg.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210reg.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5210reg.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5210reg.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5k_0007.ini b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5k_0007.ini
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5210/ar5k_0007.ini
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5210/ar5k_0007.ini
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_attach.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_attach.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_attach.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_attach.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_beacon.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_beacon.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_beacon.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_beacon.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_interrupts.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_interrupts.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_interrupts.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_interrupts.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_keycache.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_keycache.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_keycache.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_keycache.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_misc.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_misc.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_misc.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_misc.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_phy.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_phy.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_phy.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_phy.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_power.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_power.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_power.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_power.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_recv.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_recv.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_recv.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_recv.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_reset.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_reset.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_reset.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_reset.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_xmit.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_xmit.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211_xmit.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211_xmit.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211desc.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211desc.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211desc.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211desc.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211phy.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211phy.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211phy.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211phy.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211reg.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211reg.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/ar5211reg.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/ar5211reg.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/boss.ini b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/boss.ini
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5211/boss.ini
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5211/boss.ini
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar2316.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar2316.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar2316.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar2316.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar2317.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar2317.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar2317.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar2317.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar2413.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar2413.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar2413.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar2413.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar2425.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar2425.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar2425.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar2425.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5111.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5111.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5111.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5111.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5112.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5112.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5112.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5112.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212.ini b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212.ini
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212.ini
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212.ini
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_ani.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_ani.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_ani.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_ani.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_attach.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_attach.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_attach.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_attach.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_beacon.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_beacon.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_beacon.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_beacon.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_eeprom.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_eeprom.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_eeprom.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_eeprom.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_gpio.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_gpio.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_gpio.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_gpio.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_interrupts.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_interrupts.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_interrupts.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_interrupts.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_keycache.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_keycache.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_keycache.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_keycache.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_misc.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_misc.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_misc.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_misc.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_phy.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_phy.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_phy.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_phy.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_power.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_power.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_power.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_power.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_recv.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_recv.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_recv.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_recv.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_reset.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_reset.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_reset.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_reset.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_rfgain.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_rfgain.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_rfgain.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_rfgain.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_xmit.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_xmit.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212_xmit.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212_xmit.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212desc.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212desc.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212desc.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212desc.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212phy.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212phy.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212phy.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212phy.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212reg.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212reg.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5212reg.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5212reg.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5311reg.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5311reg.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5311reg.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5311reg.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5413.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5413.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5212/ar5413.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5212/ar5413.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312_attach.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312_attach.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312_attach.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312_attach.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312_eeprom.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312_eeprom.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312_eeprom.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312_eeprom.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312_gpio.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312_gpio.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312_gpio.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312_gpio.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312_interrupts.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312_interrupts.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312_interrupts.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312_interrupts.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312_misc.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312_misc.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312_misc.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312_misc.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312_power.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312_power.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312_power.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312_power.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312_reset.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312_reset.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312_reset.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312_reset.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312phy.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312phy.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312phy.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312phy.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312reg.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312reg.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5312reg.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5312reg.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5315_gpio.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5315_gpio.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5312/ar5315_gpio.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5312/ar5315_gpio.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar2133.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar2133.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar2133.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar2133.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416.ini b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416.ini
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416.ini
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416.ini
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_ani.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_ani.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_ani.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_ani.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_attach.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_attach.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_attach.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_attach.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_beacon.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_beacon.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_beacon.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_beacon.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_cal.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_cal.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_cal.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_cal.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_cal.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_cal.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_cal.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_cal.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_eeprom.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_eeprom.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_eeprom.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_eeprom.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_gpio.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_gpio.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_gpio.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_gpio.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_interrupts.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_interrupts.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_interrupts.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_interrupts.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_keycache.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_keycache.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_keycache.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_keycache.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_misc.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_misc.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_misc.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_misc.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_phy.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_phy.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_phy.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_phy.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_power.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_power.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_power.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_power.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_recv.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_recv.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_recv.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_recv.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_reset.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_reset.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_reset.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_reset.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_xmit.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_xmit.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416_xmit.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416_xmit.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416desc.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416desc.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416desc.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416desc.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416phy.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416phy.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416phy.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416phy.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416reg.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416reg.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar5416reg.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar5416reg.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar9160.ini b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar9160.ini
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar9160.ini
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar9160.ini
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar9160_attach.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar9160_attach.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar9160_attach.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar9160_attach.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar9280.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar9280.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar9280.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar9280.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar9280.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar9280.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar9280.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar9280.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar9280_attach.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar9280_attach.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar9280_attach.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar9280_attach.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar9280v1.ini b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar9280v1.ini
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar9280v1.ini
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar9280v1.ini
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar9280v2.ini b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar9280v2.ini
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/ar5416/ar9280v2.ini
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/ar5416/ar9280v2.ini
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/opt_ah.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/opt_ah.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_hal/opt_ah.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_hal/opt_ah.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_rate/amrr/amrr.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_rate/amrr/amrr.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_rate/amrr/amrr.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_rate/amrr/amrr.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_rate/amrr/amrr.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_rate/amrr/amrr.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_rate/amrr/amrr.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_rate/amrr/amrr.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_rate/onoe/onoe.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_rate/onoe/onoe.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_rate/onoe/onoe.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_rate/onoe/onoe.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_rate/onoe/onoe.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_rate/onoe/onoe.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_rate/onoe/onoe.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_rate/onoe/onoe.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_rate/sample/sample.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_rate/sample/sample.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_rate/sample/sample.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_rate/sample/sample.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_rate/sample/sample.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_rate/sample/sample.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/ath_rate/sample/sample.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ath_rate/sample/sample.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/if_ath.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/if_ath.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/if_ath.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/if_ath.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/if_ath_pci.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/if_ath_pci.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/if_ath_pci.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/if_ath_pci.c
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/if_athioctl.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/if_athioctl.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/if_athioctl.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/if_athioctl.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/if_athrate.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/if_athrate.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/if_athrate.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/if_athrate.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/if_athvar.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/if_athvar.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/if_athvar.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/if_athvar.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/opt_ath.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/opt_ath.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/opt_ath.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/opt_ath.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/opt_inet.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/opt_inet.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/opt_inet.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/opt_inet.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/opt_wlan.h b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/opt_wlan.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/dev/ath/opt_wlan.h
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/opt_wlan.h
diff --git a/src/add-ons/kernel/drivers/network/wlan/atheros/glue.c b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/glue.c
similarity index 96%
rename from src/add-ons/kernel/drivers/network/wlan/atheros/glue.c
rename to src/add-ons/kernel/drivers/network/wlan/atheroswifi/glue.c
index 04fddbae97..569e917a28 100644
--- a/src/add-ons/kernel/drivers/network/wlan/atheros/glue.c
+++ b/src/add-ons/kernel/drivers/network/wlan/atheroswifi/glue.c
@@ -15,7 +15,7 @@
 #include <dev/ath/if_athvar.h>
 
 
-HAIKU_FBSD_WLAN_DRIVER_GLUE(atheros, ath, pci)
+HAIKU_FBSD_WLAN_DRIVER_GLUE(atheroswifi, ath, pci)
 NO_HAIKU_FBSD_MII_DRIVER();
 HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES|FBSD_WLAN);