diff --git a/lib/Target/X86/InstSelectSimple.cpp b/lib/Target/X86/InstSelectSimple.cpp
index 7ffbdb0..083c88b 100644
--- a/lib/Target/X86/InstSelectSimple.cpp
+++ b/lib/Target/X86/InstSelectSimple.cpp
@@ -36,9 +36,9 @@
     }
 
     /// visitBasicBlock - This method is called when we are visiting a new basic
-    /// block.  This simply creates a new MBasicBlock to emit code into and adds
-    /// it to the current MFunction.  Subsequent visit* for instructions will be
-    /// invoked for all instructions in the basic block.
+    /// block.  This simply creates a new MachineBasicBlock to emit code into
+    /// and adds it to the current MachineFunction.  Subsequent visit* for
+    /// instructions will be invoked for all instructions in the basic block.
     ///
     void visitBasicBlock(BasicBlock &LLVM_BB) {
       BB = new MachineBasicBlock();
diff --git a/lib/Target/X86/X86ISelSimple.cpp b/lib/Target/X86/X86ISelSimple.cpp
index 7ffbdb0..083c88b 100644
--- a/lib/Target/X86/X86ISelSimple.cpp
+++ b/lib/Target/X86/X86ISelSimple.cpp
@@ -36,9 +36,9 @@
     }
 
     /// visitBasicBlock - This method is called when we are visiting a new basic
-    /// block.  This simply creates a new MBasicBlock to emit code into and adds
-    /// it to the current MFunction.  Subsequent visit* for instructions will be
-    /// invoked for all instructions in the basic block.
+    /// block.  This simply creates a new MachineBasicBlock to emit code into
+    /// and adds it to the current MachineFunction.  Subsequent visit* for
+    /// instructions will be invoked for all instructions in the basic block.
     ///
     void visitBasicBlock(BasicBlock &LLVM_BB) {
       BB = new MachineBasicBlock();
diff --git a/lib/Target/X86/X86InstrInfo.cpp b/lib/Target/X86/X86InstrInfo.cpp
index 06abb4d..012453d 100644
--- a/lib/Target/X86/X86InstrInfo.cpp
+++ b/lib/Target/X86/X86InstrInfo.cpp
@@ -1,6 +1,6 @@
 //===- X86InstructionInfo.cpp - X86 Instruction Information ---------------===//
 //
-// This file contains the X86 implementation of the MInstructionInfo class.
+// This file contains the X86 implementation of the MachineInstrInfo class.
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lib/Target/X86/X86InstrInfo.def b/lib/Target/X86/X86InstrInfo.def
index da04e1f..0fd18f4 100644
--- a/lib/Target/X86/X86InstrInfo.def
+++ b/lib/Target/X86/X86InstrInfo.def
@@ -17,7 +17,7 @@
 //  #1: Enum name - This ends up being the opcode symbol in the X86 namespace
 //  #2: Opcode name, as used by the gnu assembler
 //  #3: Instruction Flags - This should be a field or'd together that contains
-//      constants from the MInstructionInfo.h file.
+//      constants from the MachineInstrInfo.h file.
 //  #4: Target Specific Flags - Another bitfield containing X86 specific flags
 //      that we are interested in for each instruction
 //
diff --git a/lib/Target/X86/X86InstrInfo.h b/lib/Target/X86/X86InstrInfo.h
index d9a9de1..c87ed33 100644
--- a/lib/Target/X86/X86InstrInfo.h
+++ b/lib/Target/X86/X86InstrInfo.h
@@ -1,6 +1,6 @@
 //===- X86InstructionInfo.h - X86 Instruction Information ---------*-C++-*-===//
 //
-// This file contains the X86 implementation of the MInstructionInfo class.
+// This file contains the X86 implementation of the MachineInstrInfo class.
 //
 //===----------------------------------------------------------------------===//
 
@@ -15,7 +15,7 @@
 public:
   X86InstructionInfo();
 
-  /// getRegisterInfo - MInstructionInfo is a superset of MRegister info.  As
+  /// getRegisterInfo - MachineInstrInfo is a superset of MRegister info.  As
   /// such, whenever a client has an instance of instruction info, it should
   /// always be able to get register info as well (through this method).
   ///