diff --git a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h
index 74cba32cd390..a968385b3c88 100644
--- a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h
+++ b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h
@@ -47,7 +47,7 @@ class CoreEngine {
 
 public:
   typedef std::vector<std::pair<BlockEdge, const ExplodedNode*> >
-            BlocksAborted;
+            BlocksExhausted;
 private:
 
   SubEngine& SubEng;
@@ -67,7 +67,7 @@ private:
 
   /// The locations where we stopped doing work because we visited a location
   ///  too many times.
-  BlocksAborted blocksAborted;
+  BlocksExhausted blocksExhausted;
 
   void generateNode(const ProgramPoint& Loc, const GRState* State,
                     ExplodedNode* Pred);
@@ -122,16 +122,16 @@ public:
                                        ExplodedNodeSet &Dst);
 
   // Functions for external checking of whether we have unfinished work
-  bool wasBlockAborted() const { return !blocksAborted.empty(); }
+  bool wasBlockAborted() const { return !blocksExhausted.empty(); }
   bool hasWorkRemaining() const { return wasBlockAborted() || WList->hasWork(); }
 
   WorkList *getWorkList() const { return WList; }
 
-  BlocksAborted::const_iterator blocks_aborted_begin() const {
-    return blocksAborted.begin();
+  BlocksExhausted::const_iterator blocks_aborted_begin() const {
+    return blocksExhausted.begin();
   }
-  BlocksAborted::const_iterator blocks_aborted_end() const {
-    return blocksAborted.end();
+  BlocksExhausted::const_iterator blocks_aborted_end() const {
+    return blocksExhausted.end();
   }
 };
 
diff --git a/clang/lib/StaticAnalyzer/Checkers/AnalyzerStatsChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/AnalyzerStatsChecker.cpp
index 99398cc26b18..07d56b5f6e9e 100644
--- a/clang/lib/StaticAnalyzer/Checkers/AnalyzerStatsChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/AnalyzerStatsChecker.cpp
@@ -97,7 +97,7 @@ void AnalyzerStatsChecker::checkEndAnalysis(ExplodedGraph &G,
       D->getLocation());
 
   // Emit warning for each block we bailed out on
-  typedef CoreEngine::BlocksAborted::const_iterator AbortedIterator;
+  typedef CoreEngine::BlocksExhausted::const_iterator AbortedIterator;
   const CoreEngine &CE = Eng.getCoreEngine();
   for (AbortedIterator I = CE.blocks_aborted_begin(),
       E = CE.blocks_aborted_end(); I != E; ++I) {
diff --git a/clang/lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp
index 8e4c6732c4aa..6190b02379ca 100644
--- a/clang/lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp
@@ -534,7 +534,7 @@ IdempotentOperationChecker::pathWasCompletelyAnalyzed(AnalysisContext *AC,
   CFGReverseBlockReachabilityAnalysis *CRA = AC->getCFGReachablityAnalysis();
   
   // Test for reachability from any aborted blocks to this block
-  typedef CoreEngine::BlocksAborted::const_iterator AbortedIterator;
+  typedef CoreEngine::BlocksExhausted::const_iterator AbortedIterator;
   for (AbortedIterator I = CE.blocks_aborted_begin(),
       E = CE.blocks_aborted_end(); I != E; ++I) {
     const BlockEdge &BE =  I->first;
diff --git a/clang/lib/StaticAnalyzer/Core/CoreEngine.cpp b/clang/lib/StaticAnalyzer/Core/CoreEngine.cpp
index 08a2068c0106..73709e39d0d0 100644
--- a/clang/lib/StaticAnalyzer/Core/CoreEngine.cpp
+++ b/clang/lib/StaticAnalyzer/Core/CoreEngine.cpp
@@ -310,7 +310,7 @@ void CoreEngine::HandleBlockEdge(const BlockEdge& L, ExplodedNode* Pred) {
   for (llvm::SmallVectorImpl<ExplodedNode*>::const_iterator
        I = nodeBuilder.sinks().begin(), E = nodeBuilder.sinks().end();
        I != E; ++I) {
-    blocksAborted.push_back(std::make_pair(L, *I));
+    blocksExhausted.push_back(std::make_pair(L, *I));
   }
 }