diff --git a/llvm/lib/CodeGen/SplitKit.cpp b/llvm/lib/CodeGen/SplitKit.cpp
index f089967a0e96..7b02b2662329 100644
--- a/llvm/lib/CodeGen/SplitKit.cpp
+++ b/llvm/lib/CodeGen/SplitKit.cpp
@@ -549,7 +549,7 @@ SplitEditor::SplitEditor(SplitAnalysis &sa,
                          VirtRegMap &vrm,
                          MachineDominatorTree &mdt,
                          LiveRangeEdit &edit)
-  : sa_(sa), LIS(lis), VRM(vrm),
+  : SA(sa), LIS(lis), VRM(vrm),
     MRI(vrm.getMachineFunction().getRegInfo()),
     MDT(mdt),
     TII(*vrm.getMachineFunction().getTarget().getInstrInfo()),
@@ -898,7 +898,7 @@ void SplitEditor::finish() {
   }
 
   // Calculate spill weight and allocation hints for new intervals.
-  VirtRegAuxInfo vrai(VRM.getMachineFunction(), LIS, sa_.Loops);
+  VirtRegAuxInfo vrai(VRM.getMachineFunction(), LIS, SA.Loops);
   for (LiveRangeEdit::iterator I = Edit.begin(), E = Edit.end(); I != E; ++I){
     LiveInterval &li = **I;
     vrai.CalculateRegClass(li.reg);
@@ -939,8 +939,8 @@ bool SplitAnalysis::getMultiUseBlocks(BlockPtrSet &Blocks) {
 void SplitEditor::splitSingleBlocks(const SplitAnalysis::BlockPtrSet &Blocks) {
   DEBUG(dbgs() << "  splitSingleBlocks for " << Blocks.size() << " blocks.\n");
 
-  for (unsigned i = 0, e = sa_.LiveBlocks.size(); i != e; ++i) {
-    const SplitAnalysis::BlockInfo &BI = sa_.LiveBlocks[i];
+  for (unsigned i = 0, e = SA.LiveBlocks.size(); i != e; ++i) {
+    const SplitAnalysis::BlockInfo &BI = SA.LiveBlocks[i];
     if (!BI.Uses || !Blocks.count(BI.MBB))
       continue;
 
@@ -982,9 +982,9 @@ const MachineBasicBlock *SplitAnalysis::getBlockForInsideSplit() {
 /// splitInsideBlock - Split CurLI into multiple intervals inside MBB.
 void SplitEditor::splitInsideBlock(const MachineBasicBlock *MBB) {
   SmallVector<SlotIndex, 32> Uses;
-  Uses.reserve(sa_.UsingInstrs.size());
-  for (SplitAnalysis::InstrPtrSet::const_iterator I = sa_.UsingInstrs.begin(),
-       E = sa_.UsingInstrs.end(); I != E; ++I)
+  Uses.reserve(SA.UsingInstrs.size());
+  for (SplitAnalysis::InstrPtrSet::const_iterator I = SA.UsingInstrs.begin(),
+       E = SA.UsingInstrs.end(); I != E; ++I)
     if ((*I)->getParent() == MBB)
       Uses.push_back(LIS.getInstructionIndex(*I));
   DEBUG(dbgs() << "  splitInsideBlock BB#" << MBB->getNumber() << " for "
diff --git a/llvm/lib/CodeGen/SplitKit.h b/llvm/lib/CodeGen/SplitKit.h
index 6f771b65525a..7adc0be10de4 100644
--- a/llvm/lib/CodeGen/SplitKit.h
+++ b/llvm/lib/CodeGen/SplitKit.h
@@ -260,7 +260,7 @@ public:
 /// - Rewrite instructions with finish().
 ///
 class SplitEditor {
-  SplitAnalysis &sa_;
+  SplitAnalysis &SA;
   LiveIntervals &LIS;
   VirtRegMap &VRM;
   MachineRegisterInfo &MRI;
@@ -315,7 +315,7 @@ public:
               MachineDominatorTree&, LiveRangeEdit&);
 
   /// getAnalysis - Get the corresponding analysis.
-  SplitAnalysis &getAnalysis() { return sa_; }
+  SplitAnalysis &getAnalysis() { return SA; }
 
   /// Create a new virtual register and live interval.
   void openIntv();