diff --git a/3.x/Makefile b/3.x/Makefile
index c55c8c6..1e3d67e 100644
--- a/3.x/Makefile
+++ b/3.x/Makefile
@@ -24,7 +24,7 @@ SERIAL_FLAGS:= $(SERIAL_FLAGS)
 ifneq ($(KERNELRELEASE),)
 EXTRA_CFLAGS  = $(SERIAL_FLAGS)
 obj-m := adv950.o
-adv950-objs := 8250.o 8250_pci.o serial_core.o  
+adv950-objs := adv950_base.o adv950_pci.o adv950_core.o
 else
 	KDIR := /lib/modules/$(shell uname -r)/build/
 	PWD  := $(shell pwd)
diff --git a/3.x/8250.c b/3.x/adv950_base.c
similarity index 99%
rename from 3.x/8250.c
rename to 3.x/adv950_base.c
index 03e60db..7247b1a 100644
--- a/3.x/8250.c
+++ b/3.x/adv950_base.c
@@ -45,7 +45,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include "8250.h"
+#include "adv950_base.h"
 
 #ifdef CONFIG_SPARC
 #include "suncore.h"
diff --git a/3.x/8250.h b/3.x/adv950_base.h
similarity index 100%
rename from 3.x/8250.h
rename to 3.x/adv950_base.h
diff --git a/3.x/serial_core.c b/3.x/adv950_core.c
similarity index 100%
rename from 3.x/serial_core.c
rename to 3.x/adv950_core.c
diff --git a/3.x/8250_pci.c b/3.x/adv950_pci.c
similarity index 99%
rename from 3.x/8250_pci.c
rename to 3.x/adv950_pci.c
index 51e8004..291df05 100644
--- a/3.x/8250_pci.c
+++ b/3.x/adv950_pci.c
@@ -42,7 +42,7 @@
 #include <asm/byteorder.h>
 #include <asm/io.h>
 
-#include "8250.h"
+#include "adv950_base.h"
 
 #undef SERIAL_DEBUG_PCI
 /*