diff --git a/llvm/lib/Target/X86/InstSelectSimple.cpp b/llvm/lib/Target/X86/InstSelectSimple.cpp
index 083c88b..4491fdf 100644
--- a/llvm/lib/Target/X86/InstSelectSimple.cpp
+++ b/llvm/lib/Target/X86/InstSelectSimple.cpp
@@ -5,7 +5,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "X86.h"
-#include "X86InstructionInfo.h"
+#include "X86InstrInfo.h"
 #include "llvm/Function.h"
 #include "llvm/iTerminators.h"
 #include "llvm/Type.h"
diff --git a/llvm/lib/Target/X86/X86.h b/llvm/lib/Target/X86/X86.h
index d516bf1..5c5133e 100644
--- a/llvm/lib/Target/X86/X86.h
+++ b/llvm/lib/Target/X86/X86.h
@@ -55,7 +55,7 @@
   // This defines a large number of symbolic names for X86 instruction opcodes.
   enum Opcode {
 #define I(ENUM, NAME, FLAGS, TSFLAGS) ENUM,
-#include "X86InstructionInfo.def"
+#include "X86InstrInfo.def"
   };
 }
 
diff --git a/llvm/lib/Target/X86/X86InstrInfo.cpp b/llvm/lib/Target/X86/X86InstrInfo.cpp
index 012453d..6d2bf1d 100644
--- a/llvm/lib/Target/X86/X86InstrInfo.cpp
+++ b/llvm/lib/Target/X86/X86InstrInfo.cpp
@@ -1,29 +1,29 @@
-//===- X86InstructionInfo.cpp - X86 Instruction Information ---------------===//
+//===- X86InstrInfo.cpp - X86 Instruction Information ---------------===//
 //
 // This file contains the X86 implementation of the MachineInstrInfo class.
 //
 //===----------------------------------------------------------------------===//
 
-#include "X86InstructionInfo.h"
+#include "X86InstrInfo.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include <iostream>
 
-// X86Insts - Turn the InstructionInfo.def file into a bunch of instruction
+// X86Insts - Turn the InstrInfo.def file into a bunch of instruction
 // descriptors
 //
 static const MachineInstrDescriptor X86Insts[] = {
 #define I(ENUM, NAME, FLAGS, TSFLAGS) \
              { NAME, -1, -1, 0, false, 0, 0, TSFLAGS, FLAGS },
-#include "X86InstructionInfo.def"
+#include "X86InstrInfo.def"
 };
 
-X86InstructionInfo::X86InstructionInfo()
+X86InstrInfo::X86InstrInfo()
   : MachineInstrInfo(X86Insts, sizeof(X86Insts)/sizeof(X86Insts[0]), 0) {
 }
 
 
 // print - Print out an x86 instruction in GAS syntax
-void X86InstructionInfo::print(const MachineInstr *MI, std::ostream &O) const {
+void X86InstrInfo::print(const MachineInstr *MI, std::ostream &O) const {
   // FIXME: This sucks.
   O << getName(MI->getOpCode()) << "\n";
 }
diff --git a/llvm/lib/Target/X86/X86InstrInfo.h b/llvm/lib/Target/X86/X86InstrInfo.h
index c87ed33..db5372f 100644
--- a/llvm/lib/Target/X86/X86InstrInfo.h
+++ b/llvm/lib/Target/X86/X86InstrInfo.h
@@ -10,10 +10,10 @@
 #include "llvm/Target/MachineInstrInfo.h"
 #include "X86RegisterInfo.h"
 
-class X86InstructionInfo : public MachineInstrInfo {
+class X86InstrInfo : public MachineInstrInfo {
   const X86RegisterInfo RI;
 public:
-  X86InstructionInfo();
+  X86InstrInfo();
 
   /// getRegisterInfo - MachineInstrInfo is a superset of MRegister info.  As
   /// such, whenever a client has an instance of instruction info, it should