diff --git a/arch/powerpc/platforms/powermac/Makefile b/arch/powerpc/platforms/powermac/Makefile
index 37b7341396e4..74712ede16df 100644
--- a/arch/powerpc/platforms/powermac/Makefile
+++ b/arch/powerpc/platforms/powermac/Makefile
@@ -1,9 +1,8 @@
-obj-$(CONFIG_PPC_PMAC)		+= pmac_pic.o pmac_setup.o pmac_time.o \
-				   pmac_feature.o pmac_pci.o pmac_sleep.o \
-				   pmac_low_i2c.o pmac_cache.o
-obj-$(CONFIG_PMAC_BACKLIGHT)	+= pmac_backlight.o
-obj-$(CONFIG_CPU_FREQ_PMAC)	+= pmac_cpufreq.o
+obj-$(CONFIG_PPC_PMAC)		+= pic.o setup.o time.o feature.o pci.o \
+				   sleep.o low_i2c.o cache.o
+obj-$(CONFIG_PMAC_BACKLIGHT)	+= backlight.o
+obj-$(CONFIG_CPU_FREQ_PMAC)	+= cpufreq.o
 ifeq ($(CONFIG_PPC_PMAC),y)
-obj-$(CONFIG_NVRAM)		+= pmac_nvram.o
-obj-$(CONFIG_SMP)		+= pmac_smp.o
+obj-$(CONFIG_NVRAM)		+= nvram.o
+obj-$(CONFIG_SMP)		+= smp.o
 endif
diff --git a/arch/powerpc/platforms/powermac/pmac_backlight.c b/arch/powerpc/platforms/powermac/backlight.c
similarity index 100%
rename from arch/powerpc/platforms/powermac/pmac_backlight.c
rename to arch/powerpc/platforms/powermac/backlight.c
diff --git a/arch/powerpc/platforms/powermac/pmac_cache.S b/arch/powerpc/platforms/powermac/cache.S
similarity index 100%
rename from arch/powerpc/platforms/powermac/pmac_cache.S
rename to arch/powerpc/platforms/powermac/cache.S
diff --git a/arch/powerpc/platforms/powermac/pmac_cpufreq.c b/arch/powerpc/platforms/powermac/cpufreq.c
similarity index 100%
rename from arch/powerpc/platforms/powermac/pmac_cpufreq.c
rename to arch/powerpc/platforms/powermac/cpufreq.c
diff --git a/arch/powerpc/platforms/powermac/pmac_feature.c b/arch/powerpc/platforms/powermac/feature.c
similarity index 100%
rename from arch/powerpc/platforms/powermac/pmac_feature.c
rename to arch/powerpc/platforms/powermac/feature.c
diff --git a/arch/powerpc/platforms/powermac/pmac_low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c
similarity index 100%
rename from arch/powerpc/platforms/powermac/pmac_low_i2c.c
rename to arch/powerpc/platforms/powermac/low_i2c.c
diff --git a/arch/powerpc/platforms/powermac/pmac_nvram.c b/arch/powerpc/platforms/powermac/nvram.c
similarity index 100%
rename from arch/powerpc/platforms/powermac/pmac_nvram.c
rename to arch/powerpc/platforms/powermac/nvram.c
diff --git a/arch/powerpc/platforms/powermac/pmac_pci.c b/arch/powerpc/platforms/powermac/pci.c
similarity index 100%
rename from arch/powerpc/platforms/powermac/pmac_pci.c
rename to arch/powerpc/platforms/powermac/pci.c
diff --git a/arch/powerpc/platforms/powermac/pmac_pic.c b/arch/powerpc/platforms/powermac/pic.c
similarity index 100%
rename from arch/powerpc/platforms/powermac/pmac_pic.c
rename to arch/powerpc/platforms/powermac/pic.c
diff --git a/arch/powerpc/platforms/powermac/pmac_pic.h b/arch/powerpc/platforms/powermac/pic.h
similarity index 100%
rename from arch/powerpc/platforms/powermac/pmac_pic.h
rename to arch/powerpc/platforms/powermac/pic.h
diff --git a/arch/powerpc/platforms/powermac/pmac_setup.c b/arch/powerpc/platforms/powermac/setup.c
similarity index 100%
rename from arch/powerpc/platforms/powermac/pmac_setup.c
rename to arch/powerpc/platforms/powermac/setup.c
diff --git a/arch/powerpc/platforms/powermac/pmac_sleep.S b/arch/powerpc/platforms/powermac/sleep.S
similarity index 100%
rename from arch/powerpc/platforms/powermac/pmac_sleep.S
rename to arch/powerpc/platforms/powermac/sleep.S
diff --git a/arch/powerpc/platforms/powermac/pmac_smp.c b/arch/powerpc/platforms/powermac/smp.c
similarity index 100%
rename from arch/powerpc/platforms/powermac/pmac_smp.c
rename to arch/powerpc/platforms/powermac/smp.c
diff --git a/arch/powerpc/platforms/powermac/pmac_time.c b/arch/powerpc/platforms/powermac/time.c
similarity index 100%
rename from arch/powerpc/platforms/powermac/pmac_time.c
rename to arch/powerpc/platforms/powermac/time.c