diff --git a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
index 1c6196c..670bc78 100644
--- a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
+++ b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
@@ -18,7 +18,7 @@
 
 #define DEBUG_TYPE "asmprinter"
 #include "PPC.h"
-#include "PPC32TargetMachine.h"
+#include "PPCTargetMachine.h"
 #include "PPCSubtarget.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
diff --git a/llvm/lib/Target/PowerPC/PPCBranchSelector.cpp b/llvm/lib/Target/PowerPC/PPCBranchSelector.cpp
index e4b65c4..0c07d81 100644
--- a/llvm/lib/Target/PowerPC/PPCBranchSelector.cpp
+++ b/llvm/lib/Target/PowerPC/PPCBranchSelector.cpp
@@ -18,7 +18,7 @@
 #define DEBUG_TYPE "bsel"
 #include "PPC.h"
 #include "PPCInstrBuilder.h"
-#include "PPC32InstrInfo.h"
+#include "PPCInstrInfo.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/Support/Debug.h"
 #include <map>
diff --git a/llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp b/llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp
similarity index 99%
rename from llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp
rename to llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp
index ad7ff49..5045c68e 100644
--- a/llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp
+++ b/llvm/lib/Target/PowerPC/PPCCodeEmitter.cpp
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PPC32TargetMachine.h"
-#include "PPC32Relocations.h"
+#include "PPCTargetMachine.h"
+#include "PPCRelocations.h"
 #include "PPC.h"
 #include "llvm/Module.h"
 #include "llvm/CodeGen/MachineCodeEmitter.h"
diff --git a/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp b/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
index 8c566ab..8396da6 100644
--- a/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
+++ b/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "PPC.h"
-#include "PPC32TargetMachine.h"
-#include "PPC32ISelLowering.h"
+#include "PPCTargetMachine.h"
+#include "PPCISelLowering.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/SSARegMap.h"
diff --git a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
index 9bab6ed..604ff2f 100644
--- a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
+++ b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PPC32ISelLowering.h"
-#include "PPC32TargetMachine.h"
+#include "PPCISelLowering.h"
+#include "PPCTargetMachine.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
diff --git a/llvm/lib/Target/PowerPC/PPC32ISelPattern.cpp b/llvm/lib/Target/PowerPC/PPCISelPattern.cpp
similarity index 99%
rename from llvm/lib/Target/PowerPC/PPC32ISelPattern.cpp
rename to llvm/lib/Target/PowerPC/PPCISelPattern.cpp
index a1f6b1c..6fb119c 100644
--- a/llvm/lib/Target/PowerPC/PPC32ISelPattern.cpp
+++ b/llvm/lib/Target/PowerPC/PPCISelPattern.cpp
@@ -15,9 +15,8 @@
 
 #include "PPC.h"
 #include "PPCInstrBuilder.h"
-#include "PPC32InstrInfo.h"
-#include "PPC32TargetMachine.h"
-#include "PPC32ISelLowering.h"
+#include "PPCTargetMachine.h"
+#include "PPCISelLowering.h"
 #include "llvm/Constants.h"
 #include "llvm/Function.h"
 #include "llvm/CodeGen/MachineConstantPool.h"
diff --git a/llvm/lib/Target/PowerPC/PPC32InstrInfo.cpp b/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp
similarity index 99%
rename from llvm/lib/Target/PowerPC/PPC32InstrInfo.cpp
rename to llvm/lib/Target/PowerPC/PPCInstrInfo.cpp
index 46f8a72..314b748 100644
--- a/llvm/lib/Target/PowerPC/PPC32InstrInfo.cpp
+++ b/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PPC32InstrInfo.h"
+#include "PPCInstrInfo.h"
 #include "PPCGenInstrInfo.inc"
 #include "PPC.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
diff --git a/llvm/lib/Target/PowerPC/PPC32InstrInfo.h b/llvm/lib/Target/PowerPC/PPCInstrInfo.h
similarity index 98%
rename from llvm/lib/Target/PowerPC/PPC32InstrInfo.h
rename to llvm/lib/Target/PowerPC/PPCInstrInfo.h
index a6cf5ad..631bce1 100644
--- a/llvm/lib/Target/PowerPC/PPC32InstrInfo.h
+++ b/llvm/lib/Target/PowerPC/PPCInstrInfo.h
@@ -16,7 +16,7 @@
 
 #include "PPC.h"
 #include "llvm/Target/TargetInstrInfo.h"
-#include "PPC32RegisterInfo.h"
+#include "PPCRegisterInfo.h"
 
 namespace llvm {
   
diff --git a/llvm/lib/Target/PowerPC/PPC32JITInfo.cpp b/llvm/lib/Target/PowerPC/PPCJITInfo.cpp
similarity index 99%
rename from llvm/lib/Target/PowerPC/PPC32JITInfo.cpp
rename to llvm/lib/Target/PowerPC/PPCJITInfo.cpp
index c17dd26..3045560 100644
--- a/llvm/lib/Target/PowerPC/PPC32JITInfo.cpp
+++ b/llvm/lib/Target/PowerPC/PPCJITInfo.cpp
@@ -13,7 +13,7 @@
 
 #define DEBUG_TYPE "jit"
 #include "PPCJITInfo.h"
-#include "PPC32Relocations.h"
+#include "PPCRelocations.h"
 #include "llvm/CodeGen/MachineCodeEmitter.h"
 #include "llvm/Config/alloca.h"
 #include <set>
diff --git a/llvm/lib/Target/PowerPC/PPC32RegisterInfo.cpp b/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp
similarity index 99%
rename from llvm/lib/Target/PowerPC/PPC32RegisterInfo.cpp
rename to llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp
index aad9861..8e2e19f 100644
--- a/llvm/lib/Target/PowerPC/PPC32RegisterInfo.cpp
+++ b/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp
@@ -14,7 +14,7 @@
 #define DEBUG_TYPE "reginfo"
 #include "PPC.h"
 #include "PPCInstrBuilder.h"
-#include "PPC32RegisterInfo.h"
+#include "PPCRegisterInfo.h"
 #include "llvm/Constants.h"
 #include "llvm/Type.h"
 #include "llvm/CodeGen/ValueTypes.h"
diff --git a/llvm/lib/Target/PowerPC/PPC32RegisterInfo.h b/llvm/lib/Target/PowerPC/PPCRegisterInfo.h
similarity index 100%
rename from llvm/lib/Target/PowerPC/PPC32RegisterInfo.h
rename to llvm/lib/Target/PowerPC/PPCRegisterInfo.h
diff --git a/llvm/lib/Target/PowerPC/PPC32Relocations.h b/llvm/lib/Target/PowerPC/PPCRelocations.h
similarity index 100%
rename from llvm/lib/Target/PowerPC/PPC32Relocations.h
rename to llvm/lib/Target/PowerPC/PPCRelocations.h
diff --git a/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp b/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
index ce759d0..a222f8c 100644
--- a/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
+++ b/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
@@ -13,7 +13,7 @@
 
 #include "PPC.h"
 #include "PPCFrameInfo.h"
-#include "PPC32TargetMachine.h"
+#include "PPCTargetMachine.h"
 #include "PPCJITInfo.h"
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
diff --git a/llvm/lib/Target/PowerPC/PPC32TargetMachine.h b/llvm/lib/Target/PowerPC/PPCTargetMachine.h
similarity index 98%
rename from llvm/lib/Target/PowerPC/PPC32TargetMachine.h
rename to llvm/lib/Target/PowerPC/PPCTargetMachine.h
index 0df2ac7..33180cd 100644
--- a/llvm/lib/Target/PowerPC/PPC32TargetMachine.h
+++ b/llvm/lib/Target/PowerPC/PPCTargetMachine.h
@@ -17,7 +17,7 @@
 #include "PPCFrameInfo.h"
 #include "PPCSubtarget.h"
 #include "PPCJITInfo.h"
-#include "PPC32InstrInfo.h"
+#include "PPCInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetFrameInfo.h"
 #include "llvm/PassManager.h"