diff --git a/Makefile b/Makefile
index 796b98a4..8a99a7a5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 EXTRA_CFLAGS += -Werror
 
-obj-m := mt76pci.o
+obj-m := mt76x2e.o
 
-mt76pci-y := \
-	pci.o dma.o \
-	main.o init.o debugfs.o tx.o util.o \
-	core.o mac.o eeprom.o mcu.o phy.o \
-	trace.o
+mt76x2e-y := \
+	mt76x2_pci.o mt76x2_dma.o \
+	mt76x2_main.o mt76x2_init.o mt76x2_debugfs.o mt76x2_tx.o mt76x2_util.o \
+	mt76x2_core.o mt76x2_mac.o mt76x2_eeprom.o mt76x2_mcu.o mt76x2_phy.o \
+	mt76x2_trace.o
 
-mt76pci-$(CONFIG_OF) += of.o
+mt76x2e-$(CONFIG_OF) += mt76x2_of.o
diff --git a/mt76.h b/mt76x2.h
similarity index 99%
rename from mt76.h
rename to mt76x2.h
index 66b48f3b..6ec3e2d8 100644
--- a/mt76.h
+++ b/mt76x2.h
@@ -44,9 +44,9 @@
 
 #define MT_CALIBRATE_INTERVAL	HZ
 
-#include "regs.h"
-#include "util.h"
-#include "mac.h"
+#include "mt76x2_regs.h"
+#include "mt76x2_util.h"
+#include "mt76x2_mac.h"
 
 struct mt76x2_queue_entry {
 	struct sk_buff *skb;
diff --git a/core.c b/mt76x2_core.c
similarity index 98%
rename from core.c
rename to mt76x2_core.c
index 78fefdbc..34ea9183 100644
--- a/core.c
+++ b/mt76x2_core.c
@@ -12,8 +12,8 @@
  */
 
 #include <linux/delay.h>
-#include "mt76.h"
-#include "trace.h"
+#include "mt76x2.h"
+#include "mt76x2_trace.h"
 
 bool mt76x2_poll(struct mt76x2_dev *dev, u32 offset, u32 mask, u32 val,
 			   int timeout)
diff --git a/debugfs.c b/mt76x2_debugfs.c
similarity index 99%
rename from debugfs.c
rename to mt76x2_debugfs.c
index 580c1301..ef0b7ba6 100644
--- a/debugfs.c
+++ b/mt76x2_debugfs.c
@@ -12,7 +12,7 @@
  */
 
 #include <linux/debugfs.h>
-#include "mt76.h"
+#include "mt76x2.h"
 
 static int
 mt76x2_reg_set(void *data, u64 val)
diff --git a/dma.c b/mt76x2_dma.c
similarity index 99%
rename from dma.c
rename to mt76x2_dma.c
index 118c703e..b3f6197c 100644
--- a/dma.c
+++ b/mt76x2_dma.c
@@ -11,8 +11,8 @@
  * GNU General Public License for more details.
  */
 
-#include "mt76.h"
-#include "dma.h"
+#include "mt76x2.h"
+#include "mt76x2_dma.h"
 
 struct mt76x2_txwi_cache {
 	struct mt76x2_txwi txwi;
diff --git a/dma.h b/mt76x2_dma.h
similarity index 100%
rename from dma.h
rename to mt76x2_dma.h
diff --git a/eeprom.c b/mt76x2_eeprom.c
similarity index 99%
rename from eeprom.c
rename to mt76x2_eeprom.c
index 1879eb88..ae186b53 100644
--- a/eeprom.c
+++ b/mt76x2_eeprom.c
@@ -13,9 +13,9 @@
 
 #include <linux/etherdevice.h>
 #include <asm/unaligned.h>
-#include "mt76.h"
-#include "eeprom.h"
-#include "of.h"
+#include "mt76x2.h"
+#include "mt76x2_eeprom.h"
+#include "mt76x2_of.h"
 
 #define EE_FIELD(_name, _value) [MT_EE_##_name] = (_value) | 1
 
diff --git a/eeprom.h b/mt76x2_eeprom.h
similarity index 99%
rename from eeprom.h
rename to mt76x2_eeprom.h
index 12e22268..959d4d16 100644
--- a/eeprom.h
+++ b/mt76x2_eeprom.h
@@ -14,7 +14,7 @@
 #ifndef __MT76_EEPROM_H
 #define __MT76_EEPROM_H
 
-#include "mt76.h"
+#include "mt76x2.h"
 
 enum mt76x2_eeprom_field {
 	MT_EE_CHIP_ID =				0x000,
diff --git a/init.c b/mt76x2_init.c
similarity index 99%
rename from init.c
rename to mt76x2_init.c
index 6febd330..daf1c129 100644
--- a/init.c
+++ b/mt76x2_init.c
@@ -12,9 +12,9 @@
  */
 
 #include <linux/delay.h>
-#include "mt76.h"
-#include "eeprom.h"
-#include "mcu.h"
+#include "mt76x2.h"
+#include "mt76x2_eeprom.h"
+#include "mt76x2_mcu.h"
 
 static bool
 mt76x2_wait_for_mac(struct mt76x2_dev *dev)
diff --git a/mac.c b/mt76x2_mac.c
similarity index 99%
rename from mac.c
rename to mt76x2_mac.c
index 8b4f5667..879af3d0 100644
--- a/mac.c
+++ b/mt76x2_mac.c
@@ -12,10 +12,10 @@
  */
 
 #include <linux/delay.h>
-#include "mt76.h"
-#include "mcu.h"
-#include "eeprom.h"
-#include "trace.h"
+#include "mt76x2.h"
+#include "mt76x2_mcu.h"
+#include "mt76x2_eeprom.h"
+#include "mt76x2_trace.h"
 
 void mt76x2_mac_set_bssid(struct mt76x2_dev *dev, u8 idx, const u8 *addr)
 {
diff --git a/mac.h b/mt76x2_mac.h
similarity index 100%
rename from mac.h
rename to mt76x2_mac.h
diff --git a/main.c b/mt76x2_main.c
similarity index 99%
rename from main.c
rename to mt76x2_main.c
index a997bd08..da1199b2 100644
--- a/main.c
+++ b/mt76x2_main.c
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-#include "mt76.h"
+#include "mt76x2.h"
 
 static int
 mt76x2_start(struct ieee80211_hw *hw)
diff --git a/mcu.c b/mt76x2_mcu.c
similarity index 99%
rename from mcu.c
rename to mt76x2_mcu.c
index c82f08cd..168f06da 100644
--- a/mcu.c
+++ b/mt76x2_mcu.c
@@ -15,10 +15,10 @@
 #include <linux/firmware.h>
 #include <linux/delay.h>
 
-#include "mt76.h"
-#include "mcu.h"
-#include "dma.h"
-#include "eeprom.h"
+#include "mt76x2.h"
+#include "mt76x2_mcu.h"
+#include "mt76x2_dma.h"
+#include "mt76x2_eeprom.h"
 
 struct mt76x2_fw_header {
 	__le32 ilm_len;
diff --git a/mcu.h b/mt76x2_mcu.h
similarity index 100%
rename from mcu.h
rename to mt76x2_mcu.h
diff --git a/of.c b/mt76x2_of.c
similarity index 96%
rename from of.c
rename to mt76x2_of.c
index 95dc14f9..3a85b5e9 100644
--- a/of.c
+++ b/mt76x2_of.c
@@ -14,9 +14,9 @@
 #include <linux/of.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include "mt76.h"
-#include "eeprom.h"
-#include "of.h"
+#include "mt76x2.h"
+#include "mt76x2_eeprom.h"
+#include "mt76x2_of.h"
 
 static int mt76x2_check_eeprom(struct mt76x2_dev *dev, const char *type)
 {
diff --git a/of.h b/mt76x2_of.h
similarity index 97%
rename from of.h
rename to mt76x2_of.h
index 8bed4d7e..94857285 100644
--- a/of.h
+++ b/mt76x2_of.h
@@ -14,7 +14,7 @@
 #ifndef __MT76_OF_H
 #define __MT76_OF_H
 
-#include "mt76.h"
+#include "mt76x2.h"
 
 #ifdef CONFIG_OF
 
diff --git a/pci.c b/mt76x2_pci.c
similarity index 98%
rename from pci.c
rename to mt76x2_pci.c
index a085436e..fae01131 100644
--- a/pci.c
+++ b/mt76x2_pci.c
@@ -15,8 +15,8 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 
-#include "mt76.h"
-#include "trace.h"
+#include "mt76x2.h"
+#include "mt76x2_trace.h"
 
 static const struct pci_device_id mt76pci_device_table[] = {
 	{ PCI_DEVICE(0x14c3, 0x7662) },
diff --git a/phy.c b/mt76x2_phy.c
similarity index 99%
rename from phy.c
rename to mt76x2_phy.c
index fcf9f310..02c96b3a 100644
--- a/phy.c
+++ b/mt76x2_phy.c
@@ -12,9 +12,9 @@
  */
 
 #include <linux/delay.h>
-#include "mt76.h"
-#include "mcu.h"
-#include "eeprom.h"
+#include "mt76x2.h"
+#include "mt76x2_mcu.h"
+#include "mt76x2_eeprom.h"
 
 static bool
 mt76x2_phy_rf_op(struct mt76x2_dev *dev, bool idx, u16 offset, bool write)
diff --git a/regs.h b/mt76x2_regs.h
similarity index 100%
rename from regs.h
rename to mt76x2_regs.h
diff --git a/trace.c b/mt76x2_trace.c
similarity index 95%
rename from trace.c
rename to mt76x2_trace.c
index 48c4ca2d..fd69e248 100644
--- a/trace.c
+++ b/mt76x2_trace.c
@@ -15,6 +15,6 @@
 
 #ifndef __CHECKER__
 #define CREATE_TRACE_POINTS
-#include "trace.h"
+#include "mt76x2_trace.h"
 
 #endif
diff --git a/trace.h b/mt76x2_trace.h
similarity index 97%
rename from trace.h
rename to mt76x2_trace.h
index bce43c16..2e4061a3 100644
--- a/trace.h
+++ b/mt76x2_trace.h
@@ -15,10 +15,10 @@
 #define __MT76_TRACE_H
 
 #include <linux/tracepoint.h>
-#include "mt76.h"
+#include "mt76x2.h"
 
 #undef TRACE_SYSTEM
-#define TRACE_SYSTEM mt76
+#define TRACE_SYSTEM mt76x2
 
 #define MAXNAME		32
 #define DEV_ENTRY	__array(char, wiphy_name, 32)
@@ -168,6 +168,6 @@ TRACE_EVENT(dev_irq,
 #undef TRACE_INCLUDE_PATH
 #define TRACE_INCLUDE_PATH .
 #undef TRACE_INCLUDE_FILE
-#define TRACE_INCLUDE_FILE trace
+#define TRACE_INCLUDE_FILE mt76x2_trace
 
 #include <trace/define_trace.h>
diff --git a/tx.c b/mt76x2_tx.c
similarity index 99%
rename from tx.c
rename to mt76x2_tx.c
index 506179bf..a8622e68 100644
--- a/tx.c
+++ b/mt76x2_tx.c
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-#include "mt76.h"
+#include "mt76x2.h"
 
 struct beacon_bc_data {
 	struct mt76x2_dev *dev;
diff --git a/util.c b/mt76x2_util.c
similarity index 97%
rename from util.c
rename to mt76x2_util.c
index cf08f882..3269c069 100644
--- a/util.c
+++ b/mt76x2_util.c
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-#include "mt76.h"
+#include "mt76x2.h"
 
 void mt76x2_remove_hdr_pad(struct sk_buff *skb)
 {
diff --git a/util.h b/mt76x2_util.h
similarity index 100%
rename from util.h
rename to mt76x2_util.h