2 files changed, 5 insertions, 5 deletions
diff --git a/include/clang/Analysis/PathSensitive/GRState.h b/include/clang/Analysis/PathSensitive/GRState.h
index 334fc9adeb..1b3b4a599e 100644
--- a/include/clang/Analysis/PathSensitive/GRState.h
+++ b/include/clang/Analysis/PathSensitive/GRState.h
@@ -422,7 +422,7 @@ public:
     
   
   SVal GetSVal(const GRState* St, Loc LV, QualType T = QualType()) {
-    return StoreMgr->GetSVal(St->getStore(), LV, T);
+    return StoreMgr->Retrieve(St->getStore(), LV, T);
   }
   
   SVal GetSVal(const GRState* St, const MemRegion* R) {
@@ -430,7 +430,7 @@ public:
   }  
   
   void SetSVal(GRState& St, Loc LV, SVal V) {
-    St.St = StoreMgr->SetSVal(St.St, LV, V);
+    St.St = StoreMgr->Bind(St.St, LV, V);
   }
   
   const GRState* SetSVal(const GRState* St, Loc LV, SVal V);  
diff --git a/include/clang/Analysis/PathSensitive/Store.h b/include/clang/Analysis/PathSensitive/Store.h
index d4f152dea7..e6599ef078 100644
--- a/include/clang/Analysis/PathSensitive/Store.h
+++ b/include/clang/Analysis/PathSensitive/Store.h
@@ -39,13 +39,13 @@ public:
   typedef llvm::DenseSet<SymbolID>          DeadSymbolsTy;
   
   virtual ~StoreManager() {}
-  virtual SVal GetSVal(Store St, Loc LV, QualType T = QualType()) = 0;  
+  virtual SVal Retrieve(Store St, Loc LV, QualType T = QualType()) = 0;  
 
   virtual SVal GetRegionSVal(Store St, const MemRegion* R) {
-    return GetSVal(St, loc::MemRegionVal(R));
+    return Retrieve(St, loc::MemRegionVal(R));
   }
   
-  virtual Store SetSVal(Store St, Loc LV, SVal V) = 0;
+  virtual Store Bind(Store St, Loc LV, SVal V) = 0;
   virtual Store Remove(Store St, Loc LV) = 0;
   virtual Store getInitialStore() = 0;
   virtual MemRegionManager& getRegionManager() = 0;