diff --git a/lib/Target/CellSPU/CellSPUSelectionDAGInfo.cpp b/lib/Target/CellSPU/SPUSelectionDAGInfo.cpp
similarity index 62%
rename from lib/Target/CellSPU/CellSPUSelectionDAGInfo.cpp
rename to lib/Target/CellSPU/SPUSelectionDAGInfo.cpp
index 86ceb59..ca2a4bf 100644
--- a/lib/Target/CellSPU/CellSPUSelectionDAGInfo.cpp
+++ b/lib/Target/CellSPU/SPUSelectionDAGInfo.cpp
@@ -1,4 +1,4 @@
-//===-- CellSPUSelectionDAGInfo.cpp - CellSPU SelectionDAG Info -----------===//
+//===-- SPUSelectionDAGInfo.cpp - CellSPU SelectionDAG Info ---------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,16 +7,16 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This file implements the CellSPUSelectionDAGInfo class.
+// This file implements the SPUSelectionDAGInfo class.
 //
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "cellspu-selectiondag-info"
-#include "CellSPUSelectionDAGInfo.h"
+#include "SPUSelectionDAGInfo.h"
 using namespace llvm;
 
-CellSPUSelectionDAGInfo::CellSPUSelectionDAGInfo() {
+SPUSelectionDAGInfo::SPUSelectionDAGInfo() {
 }
 
-CellSPUSelectionDAGInfo::~CellSPUSelectionDAGInfo() {
+SPUSelectionDAGInfo::~SPUSelectionDAGInfo() {
 }
diff --git a/lib/Target/CellSPU/CellSPUSelectionDAGInfo.h b/lib/Target/CellSPU/SPUSelectionDAGInfo.h
similarity index 76%
rename from lib/Target/CellSPU/CellSPUSelectionDAGInfo.h
rename to lib/Target/CellSPU/SPUSelectionDAGInfo.h
index 25e3aa0..0a6b4c1 100644
--- a/lib/Target/CellSPU/CellSPUSelectionDAGInfo.h
+++ b/lib/Target/CellSPU/SPUSelectionDAGInfo.h
@@ -1,4 +1,4 @@
-//===-- CellSPUSelectionDAGInfo.h - CellSPU SelectionDAG Info ---*- C++ -*-===//
+//===-- SPUSelectionDAGInfo.h - CellSPU SelectionDAG Info -------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -18,10 +18,10 @@
 
 namespace llvm {
 
-class CellSPUSelectionDAGInfo : public TargetSelectionDAGInfo {
+class SPUSelectionDAGInfo : public TargetSelectionDAGInfo {
 public:
-  CellSPUSelectionDAGInfo();
-  ~CellSPUSelectionDAGInfo();
+  SPUSelectionDAGInfo();
+  ~SPUSelectionDAGInfo();
 };
 
 }
diff --git a/lib/Target/PowerPC/PowerPCSelectionDAGInfo.cpp b/lib/Target/PowerPC/PPCSelectionDAGInfo.cpp
similarity index 62%
rename from lib/Target/PowerPC/PowerPCSelectionDAGInfo.cpp
rename to lib/Target/PowerPC/PPCSelectionDAGInfo.cpp
index b1f4a71..c0004a9 100644
--- a/lib/Target/PowerPC/PowerPCSelectionDAGInfo.cpp
+++ b/lib/Target/PowerPC/PPCSelectionDAGInfo.cpp
@@ -1,4 +1,4 @@
-//===-- PowerPCSelectionDAGInfo.cpp - PowerPC SelectionDAG Info -----------===//
+//===-- PPCSelectionDAGInfo.cpp - PowerPC SelectionDAG Info ---------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,16 +7,16 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This file implements the PowerPCSelectionDAGInfo class.
+// This file implements the PPCSelectionDAGInfo class.
 //
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "powerpc-selectiondag-info"
-#include "PowerPCSelectionDAGInfo.h"
+#include "PPCSelectionDAGInfo.h"
 using namespace llvm;
 
-PowerPCSelectionDAGInfo::PowerPCSelectionDAGInfo() {
+PPCSelectionDAGInfo::PPCSelectionDAGInfo() {
 }
 
-PowerPCSelectionDAGInfo::~PowerPCSelectionDAGInfo() {
+PPCSelectionDAGInfo::~PPCSelectionDAGInfo() {
 }
diff --git a/lib/Target/PowerPC/PowerPCSelectionDAGInfo.h b/lib/Target/PowerPC/PPCSelectionDAGInfo.h
similarity index 76%
rename from lib/Target/PowerPC/PowerPCSelectionDAGInfo.h
rename to lib/Target/PowerPC/PPCSelectionDAGInfo.h
index e40b02c..3ad3418 100644
--- a/lib/Target/PowerPC/PowerPCSelectionDAGInfo.h
+++ b/lib/Target/PowerPC/PPCSelectionDAGInfo.h
@@ -1,4 +1,4 @@
-//===-- PowerPCSelectionDAGInfo.h - PowerPC SelectionDAG Info ---*- C++ -*-===//
+//===-- PPCSelectionDAGInfo.h - PowerPC SelectionDAG Info -------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -18,10 +18,10 @@
 
 namespace llvm {
 
-class PowerPCSelectionDAGInfo : public TargetSelectionDAGInfo {
+class PPCSelectionDAGInfo : public TargetSelectionDAGInfo {
 public:
-  PowerPCSelectionDAGInfo();
-  ~PowerPCSelectionDAGInfo();
+  PPCSelectionDAGInfo();
+  ~PPCSelectionDAGInfo();
 };
 
 }