diff --git a/llvm/lib/CodeGen/MachineInstr.cpp b/llvm/lib/CodeGen/MachineInstr.cpp
index 4e340d3439d7..6371d8dbc7ee 100644
--- a/llvm/lib/CodeGen/MachineInstr.cpp
+++ b/llvm/lib/CodeGen/MachineInstr.cpp
@@ -157,7 +157,7 @@ OutputReg(std::ostream &os, unsigned int regNum)
 
 std::ostream &operator<<(std::ostream& os, const MachineInstr& minstr)
 {
-  os << TargetInstrDescriptors[minstr.opCode].opCodeString;
+  os << TargetInstrDescriptors[minstr.opCode].Name;
   
   for (unsigned i=0, N=minstr.getNumOperands(); i < N; i++) {
     os << "\t" << minstr.getOperand(i);
diff --git a/llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp b/llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
index c569a29e8efd..42698adc544b 100644
--- a/llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
+++ b/llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
@@ -954,10 +954,10 @@ void PhyRegAlloc::printMachineCode()
 
     // iterate over all the machine instructions in BB
     for ( ; MII != MBB.end(); ++MII) {  
-      MachineInstr *const MInst = *MII; 
+      MachineInstr *MInst = *MII; 
 
       cerr << "\n\t";
-      cerr << TargetInstrDescriptors[MInst->getOpCode()].opCodeString;
+      cerr << TM.getInstrInfo().getName(MInst->getOpCode());
 
       for (unsigned OpNum=0; OpNum < MInst->getNumOperands(); ++OpNum) {
 	MachineOperand& Op = MInst->getOperand(OpNum);