diff --git a/examples/PrintFunctionNames/CMakeLists.txt b/examples/PrintFunctionNames/CMakeLists.txt
index f16dd2b695b6bdec79b449d9625cd9027ba5e196..ee451877c6ce639335ffcf053f958ca52bca6398 100644
--- a/examples/PrintFunctionNames/CMakeLists.txt
+++ b/examples/PrintFunctionNames/CMakeLists.txt
@@ -10,8 +10,8 @@ set( LLVM_USED_LIBS
   clangCodeGen
   clangParse
   clangSema
-  clangGRCheckers
-  clangGRCore
+  clangEntoCheckers
+  clangEntoCore
   clangAnalysis
   clangIndex
   clangRewrite
diff --git a/examples/clang-interpreter/CMakeLists.txt b/examples/clang-interpreter/CMakeLists.txt
index 8bdea4ca22356a7f542650756e46cdbd4d3b9dbf..c8c3c2be2d2e6d3edfca74bd2f65363784365d10 100644
--- a/examples/clang-interpreter/CMakeLists.txt
+++ b/examples/clang-interpreter/CMakeLists.txt
@@ -6,8 +6,8 @@ set(LLVM_USED_LIBS
     clangDriver
     clangCodeGen
     clangSema
-    clangGRCheckers
-    clangGRCore
+    clangEntoCheckers
+    clangEntoCore
     clangIndex
     clangAnalysis
     clangRewrite
diff --git a/examples/clang-interpreter/Makefile b/examples/clang-interpreter/Makefile
index 6a690b0bf8bde708e70ce084c95d3787d8d1dd68..86bc9ca142bcbe73837f5d98a731d686e426f111 100644
--- a/examples/clang-interpreter/Makefile
+++ b/examples/clang-interpreter/Makefile
@@ -18,7 +18,7 @@ TOOL_NO_EXPORTS = 1
 LINK_COMPONENTS := jit interpreter nativecodegen bitreader bitwriter ipo \
 	selectiondag asmparser
 USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a clangCodeGen.a \
-           clangSema.a clangGRCheckers.a clangGRCore.a clangAnalysis.a clangRewrite.a \
+           clangSema.a clangEntoCheckers.a clangEntoCore.a clangAnalysis.a clangRewrite.a \
            clangAST.a clangParse.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
diff --git a/examples/wpa/CMakeLists.txt b/examples/wpa/CMakeLists.txt
index 94719b2993e1d84cd4099eb4475eaf8bfce82806..0100aa2b982ae61305e0ca788e33d206b28070d1 100644
--- a/examples/wpa/CMakeLists.txt
+++ b/examples/wpa/CMakeLists.txt
@@ -7,8 +7,8 @@ set(LLVM_USED_LIBS
   clangSema
   clangAnalysis
   clangSerialization
-  clangGRCheckers
-  clangGRCore
+  clangEntoCheckers
+  clangEntoCore
   clangRewrite
   clangAST
   clangParse
diff --git a/examples/wpa/Makefile b/examples/wpa/Makefile
index f04fcb7e2d2077a00306031ba22c7fbfb2f43f5a..4fbba9d30f0605dbfb219e2a4b85af16dfc658c9 100644
--- a/examples/wpa/Makefile
+++ b/examples/wpa/Makefile
@@ -16,7 +16,7 @@ NO_INSTALL = 1
 TOOL_NO_EXPORTS = 1
 
 LINK_COMPONENTS := asmparser bitreader mc core
-USEDLIBS = clangGRCheckers.a clangGRCore.a clangIndex.a clangFrontend.a clangDriver.a \
+USEDLIBS = clangEntoCheckers.a clangEntoCore.a clangIndex.a clangFrontend.a clangDriver.a \
 	   clangSema.a clangAnalysis.a clangSerialization.a \
            clangAST.a clangParse.a clangLex.a clangBasic.a
 
diff --git a/include/clang/GR/AnalysisConsumer.h b/include/clang/EntoSA/AnalysisConsumer.h
similarity index 100%
rename from include/clang/GR/AnalysisConsumer.h
rename to include/clang/EntoSA/AnalysisConsumer.h
diff --git a/include/clang/GR/BugReporter/BugReporter.h b/include/clang/EntoSA/BugReporter/BugReporter.h
similarity index 99%
rename from include/clang/GR/BugReporter/BugReporter.h
rename to include/clang/EntoSA/BugReporter/BugReporter.h
index 7d2dffae75b5a497ba6ead47b30d32d3427420c3..c879d3c94eb10ab74ed859f2f164d9d836978c1f 100644
--- a/include/clang/GR/BugReporter/BugReporter.h
+++ b/include/clang/EntoSA/BugReporter/BugReporter.h
@@ -16,7 +16,7 @@
 #define LLVM_CLANG_GR_BUGREPORTER
 
 #include "clang/Basic/SourceLocation.h"
-#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/ImmutableList.h"
 #include "llvm/ADT/ImmutableSet.h"
diff --git a/include/clang/GR/BugReporter/BugType.h b/include/clang/EntoSA/BugReporter/BugType.h
similarity index 97%
rename from include/clang/GR/BugReporter/BugType.h
rename to include/clang/EntoSA/BugReporter/BugType.h
index 854094977acf0f9c8c5738f82e8889633cc82c4a..1eee141964f5e8d0d55ccbfab8e9605830a03bb2 100644
--- a/include/clang/GR/BugReporter/BugType.h
+++ b/include/clang/EntoSA/BugReporter/BugType.h
@@ -14,7 +14,7 @@
 #ifndef LLVM_CLANG_ANALYSIS_BUGTYPE
 #define LLVM_CLANG_ANALYSIS_BUGTYPE
 
-#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
 #include "llvm/ADT/FoldingSet.h"
 #include <string>
 
diff --git a/include/clang/GR/BugReporter/PathDiagnostic.h b/include/clang/EntoSA/BugReporter/PathDiagnostic.h
similarity index 100%
rename from include/clang/GR/BugReporter/PathDiagnostic.h
rename to include/clang/EntoSA/BugReporter/PathDiagnostic.h
diff --git a/include/clang/GR/Checkers/DereferenceChecker.h b/include/clang/EntoSA/Checkers/DereferenceChecker.h
similarity index 100%
rename from include/clang/GR/Checkers/DereferenceChecker.h
rename to include/clang/EntoSA/Checkers/DereferenceChecker.h
diff --git a/include/clang/GR/Checkers/LocalCheckers.h b/include/clang/EntoSA/Checkers/LocalCheckers.h
similarity index 100%
rename from include/clang/GR/Checkers/LocalCheckers.h
rename to include/clang/EntoSA/Checkers/LocalCheckers.h
diff --git a/include/clang/GR/FrontendActions.h b/include/clang/EntoSA/FrontendActions.h
similarity index 100%
rename from include/clang/GR/FrontendActions.h
rename to include/clang/EntoSA/FrontendActions.h
diff --git a/include/clang/GR/ManagerRegistry.h b/include/clang/EntoSA/ManagerRegistry.h
similarity index 97%
rename from include/clang/GR/ManagerRegistry.h
rename to include/clang/EntoSA/ManagerRegistry.h
index ff174c0b4aa694c475fe642b42973cb4ea430f37..43657a5471419af9d3ea750bbfff07c971071684 100644
--- a/include/clang/GR/ManagerRegistry.h
+++ b/include/clang/EntoSA/ManagerRegistry.h
@@ -14,7 +14,7 @@
 #ifndef LLVM_CLANG_GR_MANAGER_REGISTRY_H
 #define LLVM_CLANG_GR_MANAGER_REGISTRY_H
 
-#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
 
 namespace clang {
 
diff --git a/include/clang/GR/PathDiagnosticClients.h b/include/clang/EntoSA/PathDiagnosticClients.h
similarity index 100%
rename from include/clang/GR/PathDiagnosticClients.h
rename to include/clang/EntoSA/PathDiagnosticClients.h
diff --git a/include/clang/GR/PathSensitive/AnalysisManager.h b/include/clang/EntoSA/PathSensitive/AnalysisManager.h
similarity index 98%
rename from include/clang/GR/PathSensitive/AnalysisManager.h
rename to include/clang/EntoSA/PathSensitive/AnalysisManager.h
index c9deccc539ce9e1ea13595591e593bf613dc5ca9..95d954ec86320573b76e99bef9985368042b74ae 100644
--- a/include/clang/GR/PathSensitive/AnalysisManager.h
+++ b/include/clang/EntoSA/PathSensitive/AnalysisManager.h
@@ -16,8 +16,8 @@
 #define LLVM_CLANG_GR_ANALYSISMANAGER_H
 
 #include "clang/Analysis/AnalysisContext.h"
-#include "clang/GR/BugReporter/BugReporter.h"
-#include "clang/GR/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
 
 namespace clang {
 
diff --git a/include/clang/GR/PathSensitive/BasicValueFactory.h b/include/clang/EntoSA/PathSensitive/BasicValueFactory.h
similarity index 99%
rename from include/clang/GR/PathSensitive/BasicValueFactory.h
rename to include/clang/EntoSA/PathSensitive/BasicValueFactory.h
index 0a692ba9d6bbeca452fa278cda31748b2327ec58..061508ecbdd6d13d5d7798007fe089a10939a23d 100644
--- a/include/clang/GR/PathSensitive/BasicValueFactory.h
+++ b/include/clang/EntoSA/PathSensitive/BasicValueFactory.h
@@ -16,7 +16,7 @@
 #ifndef LLVM_CLANG_GR_BASICVALUEFACTORY_H
 #define LLVM_CLANG_GR_BASICVALUEFACTORY_H
 
-#include "clang/GR/PathSensitive/SVals.h"
+#include "clang/EntoSA/PathSensitive/SVals.h"
 #include "clang/AST/ASTContext.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/APSInt.h"
diff --git a/include/clang/GR/PathSensitive/BlockCounter.h b/include/clang/EntoSA/PathSensitive/BlockCounter.h
similarity index 100%
rename from include/clang/GR/PathSensitive/BlockCounter.h
rename to include/clang/EntoSA/PathSensitive/BlockCounter.h
diff --git a/include/clang/GR/PathSensitive/Checker.h b/include/clang/EntoSA/PathSensitive/Checker.h
similarity index 99%
rename from include/clang/GR/PathSensitive/Checker.h
rename to include/clang/EntoSA/PathSensitive/Checker.h
index 73fb37fc4ceb9095823d58f4478d4472693c0447..a536955c958ad3bed4db4cfcfefd677be55ad497 100644
--- a/include/clang/GR/PathSensitive/Checker.h
+++ b/include/clang/EntoSA/PathSensitive/Checker.h
@@ -16,7 +16,7 @@
 #define LLVM_CLANG_GR_CHECKER
 
 #include "clang/Analysis/Support/SaveAndRestore.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 
 //===----------------------------------------------------------------------===//
 // Checker interface.
diff --git a/include/clang/GR/PathSensitive/CheckerHelpers.h b/include/clang/EntoSA/PathSensitive/CheckerHelpers.h
similarity index 100%
rename from include/clang/GR/PathSensitive/CheckerHelpers.h
rename to include/clang/EntoSA/PathSensitive/CheckerHelpers.h
diff --git a/include/clang/GR/PathSensitive/CheckerVisitor.def b/include/clang/EntoSA/PathSensitive/CheckerVisitor.def
similarity index 100%
rename from include/clang/GR/PathSensitive/CheckerVisitor.def
rename to include/clang/EntoSA/PathSensitive/CheckerVisitor.def
diff --git a/include/clang/GR/PathSensitive/CheckerVisitor.h b/include/clang/EntoSA/PathSensitive/CheckerVisitor.h
similarity index 93%
rename from include/clang/GR/PathSensitive/CheckerVisitor.h
rename to include/clang/EntoSA/PathSensitive/CheckerVisitor.h
index 18ffa9fad30c094055b041a1ea870edaebf18645..62ce943cdbc35631d6a784cb27df0cd2ef6d9e68 100644
--- a/include/clang/GR/PathSensitive/CheckerVisitor.h
+++ b/include/clang/EntoSA/PathSensitive/CheckerVisitor.h
@@ -13,7 +13,7 @@
 
 #ifndef LLVM_CLANG_GR_CHECKERVISITOR
 #define LLVM_CLANG_GR_CHECKERVISITOR
-#include "clang/GR/PathSensitive/Checker.h"
+#include "clang/EntoSA/PathSensitive/Checker.h"
 
 namespace clang {
 
@@ -51,7 +51,7 @@ public:
 case Stmt::NAME ## Class:\
 static_cast<ImplClass*>(this)->PreVisit ## NAME(C,static_cast<const NAME*>(S));\
 break;
-#include "clang/GR/PathSensitive/CheckerVisitor.def"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.def"
     }
   }
   
@@ -70,7 +70,7 @@ case Stmt::NAME ## Class:\
 static_cast<ImplClass*>(this)->\
 PostVisit ## NAME(C,static_cast<const NAME*>(S));\
 break;
-#include "clang/GR/PathSensitive/CheckerVisitor.def"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.def"
     }
   }
 
@@ -101,7 +101,7 @@ void PreVisit ## NAME(CheckerContext &C, const NAME* S) {\
 void PostVisit ## NAME(CheckerContext &C, const NAME* S) {\
   static_cast<ImplClass*>(this)->PostVisit ## FALLBACK(C, S);\
 }
-#include "clang/GR/PathSensitive/CheckerVisitor.def"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.def"
 };
 
 } // end GR namespace
diff --git a/include/clang/GR/PathSensitive/ConstraintManager.h b/include/clang/EntoSA/PathSensitive/ConstraintManager.h
similarity index 98%
rename from include/clang/GR/PathSensitive/ConstraintManager.h
rename to include/clang/EntoSA/PathSensitive/ConstraintManager.h
index 3e73f4b225dfe256fbe4c96e80b570ebdcd22e48..b9e723ca4a6e16c8d96a054c0e6bf6d46883f088 100644
--- a/include/clang/GR/PathSensitive/ConstraintManager.h
+++ b/include/clang/EntoSA/PathSensitive/ConstraintManager.h
@@ -15,7 +15,7 @@
 #define LLVM_CLANG_GR_CONSTRAINT_MANAGER_H
 
 // FIXME: Typedef LiveSymbolsTy/DeadSymbolsTy at a more appropriate place.
-#include "clang/GR/PathSensitive/Store.h"
+#include "clang/EntoSA/PathSensitive/Store.h"
 
 namespace llvm {
 class APSInt;
diff --git a/include/clang/GR/PathSensitive/CoreEngine.h b/include/clang/EntoSA/PathSensitive/CoreEngine.h
similarity index 98%
rename from include/clang/GR/PathSensitive/CoreEngine.h
rename to include/clang/EntoSA/PathSensitive/CoreEngine.h
index eaaff521606c087d9085d9e8ffce7ce2339f3582..45e7fdc64504c27c8bccd3fe8b48c28114e80cac 100644
--- a/include/clang/GR/PathSensitive/CoreEngine.h
+++ b/include/clang/EntoSA/PathSensitive/CoreEngine.h
@@ -16,10 +16,10 @@
 #define LLVM_CLANG_GR_COREENGINE
 
 #include "clang/AST/Expr.h"
-#include "clang/GR/PathSensitive/ExplodedGraph.h"
-#include "clang/GR/PathSensitive/WorkList.h"
-#include "clang/GR/PathSensitive/BlockCounter.h"
-#include "clang/GR/PathSensitive/SubEngine.h"
+#include "clang/EntoSA/PathSensitive/ExplodedGraph.h"
+#include "clang/EntoSA/PathSensitive/WorkList.h"
+#include "clang/EntoSA/PathSensitive/BlockCounter.h"
+#include "clang/EntoSA/PathSensitive/SubEngine.h"
 #include "llvm/ADT/OwningPtr.h"
 
 namespace clang {
diff --git a/include/clang/GR/PathSensitive/Environment.h b/include/clang/EntoSA/PathSensitive/Environment.h
similarity index 96%
rename from include/clang/GR/PathSensitive/Environment.h
rename to include/clang/EntoSA/PathSensitive/Environment.h
index a8861cc0c2a2dfda94bc9d49d2075e762aec4827..1e88e1605ee8e94a10d3c42f4adab5998d632447 100644
--- a/include/clang/GR/PathSensitive/Environment.h
+++ b/include/clang/EntoSA/PathSensitive/Environment.h
@@ -14,8 +14,8 @@
 #ifndef LLVM_CLANG_GR_ENVIRONMENT_H
 #define LLVM_CLANG_GR_ENVIRONMENT_H
 
-#include "clang/GR/PathSensitive/Store.h"
-#include "clang/GR/PathSensitive/SVals.h"
+#include "clang/EntoSA/PathSensitive/Store.h"
+#include "clang/EntoSA/PathSensitive/SVals.h"
 #include "llvm/ADT/ImmutableMap.h"
 
 namespace clang {
diff --git a/include/clang/GR/PathSensitive/ExplodedGraph.h b/include/clang/EntoSA/PathSensitive/ExplodedGraph.h
similarity index 100%
rename from include/clang/GR/PathSensitive/ExplodedGraph.h
rename to include/clang/EntoSA/PathSensitive/ExplodedGraph.h
diff --git a/include/clang/GR/PathSensitive/ExprEngine.h b/include/clang/EntoSA/PathSensitive/ExprEngine.h
similarity index 98%
rename from include/clang/GR/PathSensitive/ExprEngine.h
rename to include/clang/EntoSA/PathSensitive/ExprEngine.h
index ed06b27f3054eb846e13272649c81743288adedf..d10e76b20271ee937fd3ea902f66d2b3be7b0861 100644
--- a/include/clang/GR/PathSensitive/ExprEngine.h
+++ b/include/clang/EntoSA/PathSensitive/ExprEngine.h
@@ -16,12 +16,12 @@
 #ifndef LLVM_CLANG_GR_EXPRENGINE
 #define LLVM_CLANG_GR_EXPRENGINE
 
-#include "clang/GR/PathSensitive/AnalysisManager.h"
-#include "clang/GR/PathSensitive/SubEngine.h"
-#include "clang/GR/PathSensitive/CoreEngine.h"
-#include "clang/GR/PathSensitive/GRState.h"
-#include "clang/GR/PathSensitive/TransferFuncs.h"
-#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/EntoSA/PathSensitive/AnalysisManager.h"
+#include "clang/EntoSA/PathSensitive/SubEngine.h"
+#include "clang/EntoSA/PathSensitive/CoreEngine.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/TransferFuncs.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
 #include "clang/AST/Type.h"
 #include "clang/AST/ExprObjC.h"
 #include "clang/AST/ExprCXX.h"
diff --git a/include/clang/GR/PathSensitive/ExprEngineBuilders.h b/include/clang/EntoSA/PathSensitive/ExprEngineBuilders.h
similarity index 97%
rename from include/clang/GR/PathSensitive/ExprEngineBuilders.h
rename to include/clang/EntoSA/PathSensitive/ExprEngineBuilders.h
index b3ccc299413f70169ccc3131f1949e55a1cad0b5..91df6121a7859f25129b746e372fab7768aaeb10 100644
--- a/include/clang/GR/PathSensitive/ExprEngineBuilders.h
+++ b/include/clang/EntoSA/PathSensitive/ExprEngineBuilders.h
@@ -14,7 +14,7 @@
 
 #ifndef LLVM_CLANG_GR_EXPRENGINE_BUILDERS
 #define LLVM_CLANG_GR_EXPRENGINE_BUILDERS
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 #include "clang/Analysis/Support/SaveAndRestore.h"
 
 namespace clang {
diff --git a/include/clang/GR/PathSensitive/GRState.h b/include/clang/EntoSA/PathSensitive/GRState.h
similarity index 99%
rename from include/clang/GR/PathSensitive/GRState.h
rename to include/clang/EntoSA/PathSensitive/GRState.h
index 914dadbdbd87365f2ce08f4369b42a436a185658..8e2ab072997b9d323c12eaf69b69bb20cedcc991 100644
--- a/include/clang/GR/PathSensitive/GRState.h
+++ b/include/clang/EntoSA/PathSensitive/GRState.h
@@ -14,10 +14,10 @@
 #ifndef LLVM_CLANG_GR_VALUESTATE_H
 #define LLVM_CLANG_GR_VALUESTATE_H
 
-#include "clang/GR/PathSensitive/ConstraintManager.h"
-#include "clang/GR/PathSensitive/Environment.h"
-#include "clang/GR/PathSensitive/Store.h"
-#include "clang/GR/PathSensitive/SValBuilder.h"
+#include "clang/EntoSA/PathSensitive/ConstraintManager.h"
+#include "clang/EntoSA/PathSensitive/Environment.h"
+#include "clang/EntoSA/PathSensitive/Store.h"
+#include "clang/EntoSA/PathSensitive/SValBuilder.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/ImmutableMap.h"
 #include "llvm/Support/Casting.h"
diff --git a/include/clang/GR/PathSensitive/GRStateTrait.h b/include/clang/EntoSA/PathSensitive/GRStateTrait.h
similarity index 100%
rename from include/clang/GR/PathSensitive/GRStateTrait.h
rename to include/clang/EntoSA/PathSensitive/GRStateTrait.h
diff --git a/include/clang/GR/PathSensitive/MemRegion.h b/include/clang/EntoSA/PathSensitive/MemRegion.h
similarity index 99%
rename from include/clang/GR/PathSensitive/MemRegion.h
rename to include/clang/EntoSA/PathSensitive/MemRegion.h
index 20e25cf44a656142732f4aa6eb915dbbefbb0091..c9c72ab33edccc521139001a06da8e915f56b007 100644
--- a/include/clang/GR/PathSensitive/MemRegion.h
+++ b/include/clang/EntoSA/PathSensitive/MemRegion.h
@@ -18,7 +18,7 @@
 
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclObjC.h"
-#include "clang/GR/PathSensitive/SVals.h"
+#include "clang/EntoSA/PathSensitive/SVals.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/ADT/FoldingSet.h"
diff --git a/include/clang/GR/PathSensitive/SValBuilder.h b/include/clang/EntoSA/PathSensitive/SValBuilder.h
similarity index 98%
rename from include/clang/GR/PathSensitive/SValBuilder.h
rename to include/clang/EntoSA/PathSensitive/SValBuilder.h
index b01f4305ef9c3a0655fc14efe8d005a5a01a6940..f4c168dc0bba3e27bf25ed064a5b662924a5709a 100644
--- a/include/clang/GR/PathSensitive/SValBuilder.h
+++ b/include/clang/EntoSA/PathSensitive/SValBuilder.h
@@ -17,9 +17,9 @@
 
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprCXX.h"
-#include "clang/GR/PathSensitive/SVals.h"
-#include "clang/GR/PathSensitive/BasicValueFactory.h"
-#include "clang/GR/PathSensitive/MemRegion.h"
+#include "clang/EntoSA/PathSensitive/SVals.h"
+#include "clang/EntoSA/PathSensitive/BasicValueFactory.h"
+#include "clang/EntoSA/PathSensitive/MemRegion.h"
 
 namespace clang {
 
diff --git a/include/clang/GR/PathSensitive/SVals.h b/include/clang/EntoSA/PathSensitive/SVals.h
similarity index 99%
rename from include/clang/GR/PathSensitive/SVals.h
rename to include/clang/EntoSA/PathSensitive/SVals.h
index 617b3948b75470d07b95aaaa2d600ce285e09048..acbf1d441381277bbaaba593e4b84d4d58e8e855 100644
--- a/include/clang/GR/PathSensitive/SVals.h
+++ b/include/clang/EntoSA/PathSensitive/SVals.h
@@ -15,7 +15,7 @@
 #ifndef LLVM_CLANG_GR_RVALUE_H
 #define LLVM_CLANG_GR_RVALUE_H
 
-#include "clang/GR/PathSensitive/SymbolManager.h"
+#include "clang/EntoSA/PathSensitive/SymbolManager.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/ADT/ImmutableList.h"
 
diff --git a/include/clang/GR/PathSensitive/Store.h b/include/clang/EntoSA/PathSensitive/Store.h
similarity index 98%
rename from include/clang/GR/PathSensitive/Store.h
rename to include/clang/EntoSA/PathSensitive/Store.h
index f82959b7dad0ed2e20ae5514ca3194b5aeeb997e..83b113834ec4f13909555323a27bb7aeecfd1409 100644
--- a/include/clang/GR/PathSensitive/Store.h
+++ b/include/clang/EntoSA/PathSensitive/Store.h
@@ -14,8 +14,8 @@
 #ifndef LLVM_CLANG_GR_STORE_H
 #define LLVM_CLANG_GR_STORE_H
 
-#include "clang/GR/PathSensitive/MemRegion.h"
-#include "clang/GR/PathSensitive/SValBuilder.h"
+#include "clang/EntoSA/PathSensitive/MemRegion.h"
+#include "clang/EntoSA/PathSensitive/SValBuilder.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/Optional.h"
 
diff --git a/include/clang/GR/PathSensitive/SubEngine.h b/include/clang/EntoSA/PathSensitive/SubEngine.h
similarity index 98%
rename from include/clang/GR/PathSensitive/SubEngine.h
rename to include/clang/EntoSA/PathSensitive/SubEngine.h
index 755dff703e8342f660c551848f1e59e77a4f7af0..bddd5e950f38692fbf9e9e25cf63fba4ca625628 100644
--- a/include/clang/GR/PathSensitive/SubEngine.h
+++ b/include/clang/EntoSA/PathSensitive/SubEngine.h
@@ -13,7 +13,7 @@
 #ifndef LLVM_CLANG_GR_SUBENGINE_H
 #define LLVM_CLANG_GR_SUBENGINE_H
 
-#include "clang/GR/PathSensitive/SVals.h"
+#include "clang/EntoSA/PathSensitive/SVals.h"
 
 namespace clang {
 
diff --git a/include/clang/GR/PathSensitive/SummaryManager.h b/include/clang/EntoSA/PathSensitive/SummaryManager.h
similarity index 100%
rename from include/clang/GR/PathSensitive/SummaryManager.h
rename to include/clang/EntoSA/PathSensitive/SummaryManager.h
diff --git a/include/clang/GR/PathSensitive/SymbolManager.h b/include/clang/EntoSA/PathSensitive/SymbolManager.h
similarity index 100%
rename from include/clang/GR/PathSensitive/SymbolManager.h
rename to include/clang/EntoSA/PathSensitive/SymbolManager.h
diff --git a/include/clang/GR/PathSensitive/TransferFuncs.h b/include/clang/EntoSA/PathSensitive/TransferFuncs.h
similarity index 96%
rename from include/clang/GR/PathSensitive/TransferFuncs.h
rename to include/clang/EntoSA/PathSensitive/TransferFuncs.h
index c73a33d160f4da7f77d377daf30466adbbb51b98..ac5b4a6d176e1dfe285e66ace7163cc00c4c0efa 100644
--- a/include/clang/GR/PathSensitive/TransferFuncs.h
+++ b/include/clang/EntoSA/PathSensitive/TransferFuncs.h
@@ -15,8 +15,8 @@
 #ifndef LLVM_CLANG_GR_TRANSFERFUNCS
 #define LLVM_CLANG_GR_TRANSFERFUNCS
 
-#include "clang/GR/PathSensitive/GRState.h"
-#include "clang/GR/PathSensitive/SVals.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/SVals.h"
 #include <vector>
 
 namespace clang {
diff --git a/include/clang/GR/PathSensitive/WorkList.h b/include/clang/EntoSA/PathSensitive/WorkList.h
similarity index 97%
rename from include/clang/GR/PathSensitive/WorkList.h
rename to include/clang/EntoSA/PathSensitive/WorkList.h
index 132bcf6e0bd1dd67b3fbc676a8f8415d2c0bd752..6f98587235f0b7c39f5e182b5c7f3189e7a14c37 100644
--- a/include/clang/GR/PathSensitive/WorkList.h
+++ b/include/clang/EntoSA/PathSensitive/WorkList.h
@@ -15,7 +15,7 @@
 #ifndef LLVM_CLANG_GR_WORKLIST
 #define LLVM_CLANG_GR_WORKLIST
 
-#include "clang/GR/PathSensitive/BlockCounter.h"
+#include "clang/EntoSA/PathSensitive/BlockCounter.h"
 #include <cstddef>
 
 namespace clang {
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 2066563c33d6dd013724a991b373e2a514233bd1..6197dc72d0ba571ae57cf56213b69ecd8a30bd99 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -12,5 +12,5 @@ add_subdirectory(Serialization)
 add_subdirectory(Frontend)
 add_subdirectory(FrontendTool)
 add_subdirectory(Index)
-add_subdirectory(GR)
-add_subdirectory(GR/Checkers)
+add_subdirectory(EntoSA)
+add_subdirectory(EntoSA/Checkers)
diff --git a/lib/GR/AggExprVisitor.cpp b/lib/EntoSA/AggExprVisitor.cpp
similarity index 97%
rename from lib/GR/AggExprVisitor.cpp
rename to lib/EntoSA/AggExprVisitor.cpp
index af30c56974a9241cfdb0ce169ea625eee95a66bd..c356186622633bb228da2ab3529fe26fa47e4065 100644
--- a/lib/GR/AggExprVisitor.cpp
+++ b/lib/EntoSA/AggExprVisitor.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 #include "clang/AST/StmtVisitor.h"
 
 using namespace clang;
diff --git a/lib/GR/AnalysisManager.cpp b/lib/EntoSA/AnalysisManager.cpp
similarity index 94%
rename from lib/GR/AnalysisManager.cpp
rename to lib/EntoSA/AnalysisManager.cpp
index 767ae4ab75d2302f598da5ca0583457b7997e114..fa64f472f78ae2dad095e994baaebfe4c944c32b 100644
--- a/lib/GR/AnalysisManager.cpp
+++ b/lib/EntoSA/AnalysisManager.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/AnalysisManager.h"
+#include "clang/EntoSA/PathSensitive/AnalysisManager.h"
 #include "clang/Index/Entity.h"
 #include "clang/Index/Indexer.h"
 
diff --git a/lib/GR/AnalyzerStatsChecker.cpp b/lib/EntoSA/AnalyzerStatsChecker.cpp
similarity index 96%
rename from lib/GR/AnalyzerStatsChecker.cpp
rename to lib/EntoSA/AnalyzerStatsChecker.cpp
index fa8ae59894b12f99d1c634c9ab3a53e87d231b51..fb0e74b4b5261813e1c40978baa9539dd31dcdd4 100644
--- a/lib/GR/AnalyzerStatsChecker.cpp
+++ b/lib/EntoSA/AnalyzerStatsChecker.cpp
@@ -9,9 +9,9 @@
 // This file reports various statistics about analyzer visitation.
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExplodedGraph.h"
-#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExplodedGraph.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
 
 // FIXME: Restructure checker registration.
 #include "Checkers/ExprEngineExperimentalChecks.h"
diff --git a/lib/GR/BasicConstraintManager.cpp b/lib/EntoSA/BasicConstraintManager.cpp
similarity index 98%
rename from lib/GR/BasicConstraintManager.cpp
rename to lib/EntoSA/BasicConstraintManager.cpp
index da91f5c98554bfbc5db38c80a2cfd09bc55bc8f5..92837d2ff4d74505a7b973fb0b9c762c89564d17 100644
--- a/lib/GR/BasicConstraintManager.cpp
+++ b/lib/EntoSA/BasicConstraintManager.cpp
@@ -13,9 +13,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "SimpleConstraintManager.h"
-#include "clang/GR/PathSensitive/GRState.h"
-#include "clang/GR/PathSensitive/GRStateTrait.h"
-#include "clang/GR/PathSensitive/TransferFuncs.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/PathSensitive/TransferFuncs.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
diff --git a/lib/GR/BasicStore.cpp b/lib/EntoSA/BasicStore.cpp
similarity index 99%
rename from lib/GR/BasicStore.cpp
rename to lib/EntoSA/BasicStore.cpp
index 9eb8d79ce4aa1651e09fee2df0e38608848118f1..8c4a732aa31f33b2e1fa80d53d8b6b9f33324661 100644
--- a/lib/GR/BasicStore.cpp
+++ b/lib/EntoSA/BasicStore.cpp
@@ -15,7 +15,7 @@
 #include "clang/AST/ExprObjC.h"
 #include "clang/Analysis/Analyses/LiveVariables.h"
 #include "clang/Analysis/AnalysisContext.h"
-#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
 #include "llvm/ADT/ImmutableMap.h"
 
 using namespace clang;
diff --git a/lib/GR/BasicValueFactory.cpp b/lib/EntoSA/BasicValueFactory.cpp
similarity index 99%
rename from lib/GR/BasicValueFactory.cpp
rename to lib/EntoSA/BasicValueFactory.cpp
index 8e51361e00ceafe6b2133bdf3185b58bb582f481..0d1cb4a91339613d6fd21c2eb36cbccbdfc75aeb 100644
--- a/lib/GR/BasicValueFactory.cpp
+++ b/lib/EntoSA/BasicValueFactory.cpp
@@ -13,7 +13,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/BasicValueFactory.h"
+#include "clang/EntoSA/PathSensitive/BasicValueFactory.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/BlockCounter.cpp b/lib/EntoSA/BlockCounter.cpp
similarity index 97%
rename from lib/GR/BlockCounter.cpp
rename to lib/EntoSA/BlockCounter.cpp
index dadf707cf2fcdb55896a8d9af28848e38c036ef7..b4e6eeee3f4ddc08adb55461c5470acb9868c2fc 100644
--- a/lib/GR/BlockCounter.cpp
+++ b/lib/EntoSA/BlockCounter.cpp
@@ -13,7 +13,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/BlockCounter.h"
+#include "clang/EntoSA/PathSensitive/BlockCounter.h"
 #include "llvm/ADT/ImmutableMap.h"
 
 using namespace clang;
diff --git a/lib/GR/BugReporter.cpp b/lib/EntoSA/BugReporter.cpp
similarity index 99%
rename from lib/GR/BugReporter.cpp
rename to lib/EntoSA/BugReporter.cpp
index 769e2b9c4d88122c74e58e233582b169989b2b18..ff3502449993aeab014889fd8568b98d5bfcf02d 100644
--- a/lib/GR/BugReporter.cpp
+++ b/lib/EntoSA/BugReporter.cpp
@@ -12,9 +12,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/BugReporter/BugReporter.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/Analysis/CFG.h"
 #include "clang/AST/Expr.h"
@@ -22,7 +22,7 @@
 #include "clang/AST/StmtObjC.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Analysis/ProgramPoint.h"
-#include "clang/GR/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/STLExtras.h"
diff --git a/lib/GR/BugReporterVisitors.cpp b/lib/EntoSA/BugReporterVisitors.cpp
similarity index 98%
rename from lib/GR/BugReporterVisitors.cpp
rename to lib/EntoSA/BugReporterVisitors.cpp
index 78b5ad66ab97e808735030f18a33eafc5f4c5dac..d264505b23f5c3bfbdb82b57e57666af8c5931cc 100644
--- a/lib/GR/BugReporterVisitors.cpp
+++ b/lib/EntoSA/BugReporterVisitors.cpp
@@ -14,10 +14,10 @@
 
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprObjC.h"
-#include "clang/GR/BugReporter/BugReporter.h"
-#include "clang/GR/BugReporter/PathDiagnostic.h"
-#include "clang/GR/PathSensitive/ExplodedGraph.h"
-#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/PathSensitive/ExplodedGraph.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/CFRefCount.cpp b/lib/EntoSA/CFRefCount.cpp
similarity index 99%
rename from lib/GR/CFRefCount.cpp
rename to lib/EntoSA/CFRefCount.cpp
index 2fe6b18c6d6d2b45865597efc058588cdde1bf4c..9c9637eb821a87450f0e19c5dd1b12a60d1d706a 100644
--- a/lib/GR/CFRefCount.cpp
+++ b/lib/EntoSA/CFRefCount.cpp
@@ -16,15 +16,15 @@
 #include "clang/AST/StmtVisitor.h"
 #include "clang/Basic/LangOptions.h"
 #include "clang/Basic/SourceManager.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/BugReporter/PathDiagnostic.h"
-#include "clang/GR/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
 #include "clang/Analysis/DomainSpecific/CocoaConventions.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExprEngineBuilders.h"
-#include "clang/GR/PathSensitive/GRStateTrait.h"
-#include "clang/GR/PathSensitive/TransferFuncs.h"
-#include "clang/GR/PathSensitive/SymbolManager.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExprEngineBuilders.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/PathSensitive/TransferFuncs.h"
+#include "clang/EntoSA/PathSensitive/SymbolManager.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/ImmutableList.h"
diff --git a/lib/GR/CMakeLists.txt b/lib/EntoSA/CMakeLists.txt
similarity index 87%
rename from lib/GR/CMakeLists.txt
rename to lib/EntoSA/CMakeLists.txt
index 748f7123f7fa2a72312021bd9ab5c06a14aee4d9..09a6c2f364356668408bb61b2bdd089a9af9c5c8 100644
--- a/lib/GR/CMakeLists.txt
+++ b/lib/EntoSA/CMakeLists.txt
@@ -2,7 +2,7 @@ set(LLVM_NO_RTTI 1)
 
 set(LLVM_USED_LIBS clangBasic clangLex clangAST clangFrontend clangRewrite)
 
-add_clang_library(clangGRCore
+add_clang_library(clangEntoCore
   AggExprVisitor.cpp
   AnalysisManager.cpp
   AnalyzerStatsChecker.cpp
@@ -37,5 +37,5 @@ add_clang_library(clangGRCore
   TextPathDiagnostics.cpp
   )
 
-add_dependencies(clangGRCore ClangAttrClasses ClangAttrList ClangDeclNodes
+add_dependencies(clangEntoCore ClangAttrClasses ClangAttrList ClangDeclNodes
                  ClangStmtNodes)
diff --git a/lib/GR/CXXExprEngine.cpp b/lib/EntoSA/CXXExprEngine.cpp
similarity index 99%
rename from lib/GR/CXXExprEngine.cpp
rename to lib/EntoSA/CXXExprEngine.cpp
index eee90f2b21159e1c70f729b76a7ba706630e0722..3ecd439d0ae52c141919ac5b757d327aaa1e4648 100644
--- a/lib/GR/CXXExprEngine.cpp
+++ b/lib/EntoSA/CXXExprEngine.cpp
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/AnalysisManager.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/AnalysisManager.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 #include "clang/AST/DeclCXX.h"
 
 using namespace clang;
diff --git a/lib/GR/Checker.cpp b/lib/EntoSA/Checker.cpp
similarity index 96%
rename from lib/GR/Checker.cpp
rename to lib/EntoSA/Checker.cpp
index 975d8475bcd73c80c69fa2e4dd2aae17c292935a..943be6b93132d0bd66b52ada40cf9084002f19df 100644
--- a/lib/GR/Checker.cpp
+++ b/lib/EntoSA/Checker.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/Checker.h"
+#include "clang/EntoSA/PathSensitive/Checker.h"
 using namespace clang;
 using namespace ento;
 
diff --git a/lib/GR/CheckerHelpers.cpp b/lib/EntoSA/CheckerHelpers.cpp
similarity index 97%
rename from lib/GR/CheckerHelpers.cpp
rename to lib/EntoSA/CheckerHelpers.cpp
index 81e83399ed28dd052bf3a13cf7d97708f197ab05..7c7f707afd6343497ab0a77fdce42b9df07d9313 100644
--- a/lib/GR/CheckerHelpers.cpp
+++ b/lib/EntoSA/CheckerHelpers.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/CheckerHelpers.h"
+#include "clang/EntoSA/PathSensitive/CheckerHelpers.h"
 #include "clang/AST/Expr.h"
 
 // Recursively find any substatements containing macros
diff --git a/lib/GR/Checkers/AdjustedReturnValueChecker.cpp b/lib/EntoSA/Checkers/AdjustedReturnValueChecker.cpp
similarity index 94%
rename from lib/GR/Checkers/AdjustedReturnValueChecker.cpp
rename to lib/EntoSA/Checkers/AdjustedReturnValueChecker.cpp
index d4e5389f8567149433f6142c5c7f8e3fef0108d9..914b1e4fbbb4f12dd577a2b95f1e90c0b122761d 100644
--- a/lib/GR/Checkers/AdjustedReturnValueChecker.cpp
+++ b/lib/EntoSA/Checkers/AdjustedReturnValueChecker.cpp
@@ -14,9 +14,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugReporter.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/AnalysisConsumer.cpp b/lib/EntoSA/Checkers/AnalysisConsumer.cpp
similarity index 97%
rename from lib/GR/Checkers/AnalysisConsumer.cpp
rename to lib/EntoSA/Checkers/AnalysisConsumer.cpp
index f70de0596b7bebb47b564eeec50d2ba637f8300a..043a24a2ef6f3781f9b5003c825b71a8f674ae26 100644
--- a/lib/GR/Checkers/AnalysisConsumer.cpp
+++ b/lib/EntoSA/Checkers/AnalysisConsumer.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/AnalysisConsumer.h"
+#include "clang/EntoSA/AnalysisConsumer.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclCXX.h"
@@ -20,14 +20,14 @@
 #include "clang/Analysis/Analyses/LiveVariables.h"
 #include "clang/Analysis/Analyses/UninitializedValues.h"
 #include "clang/Analysis/CFG.h"
-#include "clang/GR/Checkers/LocalCheckers.h"
-#include "clang/GR/ManagerRegistry.h"
-#include "clang/GR/BugReporter/PathDiagnostic.h"
-#include "clang/GR/PathSensitive/AnalysisManager.h"
-#include "clang/GR/BugReporter/BugReporter.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
-#include "clang/GR/PathSensitive/TransferFuncs.h"
-#include "clang/GR/PathDiagnosticClients.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/ManagerRegistry.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/PathSensitive/AnalysisManager.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/TransferFuncs.h"
+#include "clang/EntoSA/PathDiagnosticClients.h"
 
 // FIXME: Restructure checker registration.
 #include "ExprEngineExperimentalChecks.h"
diff --git a/lib/GR/Checkers/ArrayBoundChecker.cpp b/lib/EntoSA/Checkers/ArrayBoundChecker.cpp
similarity index 94%
rename from lib/GR/Checkers/ArrayBoundChecker.cpp
rename to lib/EntoSA/Checkers/ArrayBoundChecker.cpp
index 9d4e3c4fd962ec757e747d03c512eea34d7ee1f2..c72a4668ab6842ce8f702dc2e6c92649c6fd58a4 100644
--- a/lib/GR/Checkers/ArrayBoundChecker.cpp
+++ b/lib/EntoSA/Checkers/ArrayBoundChecker.cpp
@@ -13,9 +13,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/ArrayBoundCheckerV2.cpp b/lib/EntoSA/Checkers/ArrayBoundCheckerV2.cpp
similarity index 98%
rename from lib/GR/Checkers/ArrayBoundCheckerV2.cpp
rename to lib/EntoSA/Checkers/ArrayBoundCheckerV2.cpp
index 1753ac52a8050b3316204f565dc5f0233900e153..33683bac32488fa67e119a8b5c6fc9d1aa578fdd 100644
--- a/lib/GR/Checkers/ArrayBoundCheckerV2.cpp
+++ b/lib/EntoSA/Checkers/ArrayBoundCheckerV2.cpp
@@ -13,9 +13,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 #include "clang/AST/CharUnits.h"
 
 using namespace clang;
diff --git a/lib/GR/Checkers/AttrNonNullChecker.cpp b/lib/EntoSA/Checkers/AttrNonNullChecker.cpp
similarity index 97%
rename from lib/GR/Checkers/AttrNonNullChecker.cpp
rename to lib/EntoSA/Checkers/AttrNonNullChecker.cpp
index 5c2aede8159d84f43a8e10fa76c5b24f2dc0d69d..f887e24d1625fb1e28ad3f1f0d531a459ab1c7cc 100644
--- a/lib/GR/Checkers/AttrNonNullChecker.cpp
+++ b/lib/EntoSA/Checkers/AttrNonNullChecker.cpp
@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/BasicObjCFoundationChecks.cpp b/lib/EntoSA/Checkers/BasicObjCFoundationChecks.cpp
similarity index 97%
rename from lib/GR/Checkers/BasicObjCFoundationChecks.cpp
rename to lib/EntoSA/Checkers/BasicObjCFoundationChecks.cpp
index a172477bd69ea8e3dfcc1e2cec2479e8d035bde4..8e83160a2014aa54aba0e37cdce07c07b6569c06 100644
--- a/lib/GR/Checkers/BasicObjCFoundationChecks.cpp
+++ b/lib/EntoSA/Checkers/BasicObjCFoundationChecks.cpp
@@ -15,14 +15,14 @@
 
 #include "BasicObjCFoundationChecks.h"
 
-#include "clang/GR/PathSensitive/ExplodedGraph.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
-#include "clang/GR/PathSensitive/GRState.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/MemRegion.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/PathSensitive/ExplodedGraph.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/MemRegion.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprObjC.h"
diff --git a/lib/GR/Checkers/BasicObjCFoundationChecks.h b/lib/EntoSA/Checkers/BasicObjCFoundationChecks.h
similarity index 100%
rename from lib/GR/Checkers/BasicObjCFoundationChecks.h
rename to lib/EntoSA/Checkers/BasicObjCFoundationChecks.h
diff --git a/lib/GR/Checkers/BuiltinFunctionChecker.cpp b/lib/EntoSA/Checkers/BuiltinFunctionChecker.cpp
similarity index 98%
rename from lib/GR/Checkers/BuiltinFunctionChecker.cpp
rename to lib/EntoSA/Checkers/BuiltinFunctionChecker.cpp
index 697f0a4c00095988126aa07f703ce594bf6ec6ec..1db8aac93f87f65e17ee78d316fed64220cebb77 100644
--- a/lib/GR/Checkers/BuiltinFunctionChecker.cpp
+++ b/lib/EntoSA/Checkers/BuiltinFunctionChecker.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/PathSensitive/Checker.h"
+#include "clang/EntoSA/PathSensitive/Checker.h"
 #include "clang/Basic/Builtins.h"
 
 using namespace clang;
diff --git a/lib/GR/Checkers/CMakeLists.txt b/lib/EntoSA/Checkers/CMakeLists.txt
similarity index 91%
rename from lib/GR/Checkers/CMakeLists.txt
rename to lib/EntoSA/Checkers/CMakeLists.txt
index 2f2c7a7b5c112a692dd239421f28accae8ffb4c8..224a515d9aecc877b56ecfeb9df31b69b1a91e3a 100644
--- a/lib/GR/Checkers/CMakeLists.txt
+++ b/lib/EntoSA/Checkers/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_clang_library(clangGRCheckers
+add_clang_library(clangEntoCheckers
   AdjustedReturnValueChecker.cpp
   AnalysisConsumer.cpp
   ArrayBoundChecker.cpp
@@ -49,5 +49,5 @@ add_clang_library(clangGRCheckers
   VLASizeChecker.cpp
   )
 
-add_dependencies(clangGRCore ClangAttrClasses ClangAttrList ClangDeclNodes
+add_dependencies(clangEntoCore ClangAttrClasses ClangAttrList ClangDeclNodes
                  ClangStmtNodes)
diff --git a/lib/GR/Checkers/CStringChecker.cpp b/lib/EntoSA/Checkers/CStringChecker.cpp
similarity index 99%
rename from lib/GR/Checkers/CStringChecker.cpp
rename to lib/EntoSA/Checkers/CStringChecker.cpp
index d658c2f3dddf30ccfc7e8a947ef30d496bbc02a3..199d6b2f5e78e5701ce46977d63919ff257978be 100644
--- a/lib/GR/Checkers/CStringChecker.cpp
+++ b/lib/EntoSA/Checkers/CStringChecker.cpp
@@ -13,9 +13,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineExperimentalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
 #include "llvm/ADT/StringSwitch.h"
 
 using namespace clang;
diff --git a/lib/GR/Checkers/CallAndMessageChecker.cpp b/lib/EntoSA/Checkers/CallAndMessageChecker.cpp
similarity index 99%
rename from lib/GR/Checkers/CallAndMessageChecker.cpp
rename to lib/EntoSA/Checkers/CallAndMessageChecker.cpp
index 24fc20ef13aead8294f2297e5d4c8c8172287ece..2fa37e3fa571ee9bc72460fd92dd025c8dcba69d 100644
--- a/lib/GR/Checkers/CallAndMessageChecker.cpp
+++ b/lib/EntoSA/Checkers/CallAndMessageChecker.cpp
@@ -15,8 +15,8 @@
 #include "ExprEngineInternalChecks.h"
 #include "clang/AST/ParentMap.h"
 #include "clang/Basic/TargetInfo.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/CastSizeChecker.cpp b/lib/EntoSA/Checkers/CastSizeChecker.cpp
similarity index 96%
rename from lib/GR/Checkers/CastSizeChecker.cpp
rename to lib/EntoSA/Checkers/CastSizeChecker.cpp
index 7844f51f068341ddf79f8408935d6aec6a04a026..41a72ef32d335e2d4e17ed366dfdec1b7dfaf505 100644
--- a/lib/GR/Checkers/CastSizeChecker.cpp
+++ b/lib/EntoSA/Checkers/CastSizeChecker.cpp
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 #include "clang/AST/CharUnits.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 #include "ExprEngineInternalChecks.h"
 
 using namespace clang;
diff --git a/lib/GR/Checkers/CastToStructChecker.cpp b/lib/EntoSA/Checkers/CastToStructChecker.cpp
similarity index 96%
rename from lib/GR/Checkers/CastToStructChecker.cpp
rename to lib/EntoSA/Checkers/CastToStructChecker.cpp
index 236623fc4a3186fd0bdf0429325a9648ee8817c5..83393b9268fba614fc95355e91c1fb9c7a9f3c74 100644
--- a/lib/GR/Checkers/CastToStructChecker.cpp
+++ b/lib/EntoSA/Checkers/CastToStructChecker.cpp
@@ -13,8 +13,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 #include "ExprEngineInternalChecks.h"
 
 using namespace clang;
diff --git a/lib/GR/Checkers/CheckDeadStores.cpp b/lib/EntoSA/Checkers/CheckDeadStores.cpp
similarity index 98%
rename from lib/GR/Checkers/CheckDeadStores.cpp
rename to lib/EntoSA/Checkers/CheckDeadStores.cpp
index d2ffd6acb47aacf419564005b2ea47449f014d98..047c83abc64ad238bdf09fa94cf813824490b8c7 100644
--- a/lib/GR/Checkers/CheckDeadStores.cpp
+++ b/lib/EntoSA/Checkers/CheckDeadStores.cpp
@@ -12,11 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
 #include "clang/Analysis/Analyses/LiveVariables.h"
 #include "clang/Analysis/Visitors/CFGRecStmtVisitor.h"
-#include "clang/GR/BugReporter/BugReporter.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 #include "clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/AST/ASTContext.h"
diff --git a/lib/GR/Checkers/CheckObjCDealloc.cpp b/lib/EntoSA/Checkers/CheckObjCDealloc.cpp
similarity index 98%
rename from lib/GR/Checkers/CheckObjCDealloc.cpp
rename to lib/EntoSA/Checkers/CheckObjCDealloc.cpp
index 1aa024928219b707d0f483f3eabc0ee2a5868d48..391e30f61ebef1e4a69b8a0020ba375bca543071 100644
--- a/lib/GR/Checkers/CheckObjCDealloc.cpp
+++ b/lib/EntoSA/Checkers/CheckObjCDealloc.cpp
@@ -13,9 +13,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/Checkers/LocalCheckers.h"
-#include "clang/GR/BugReporter/PathDiagnostic.h"
-#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
 #include "clang/AST/ExprObjC.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/DeclObjC.h"
diff --git a/lib/GR/Checkers/CheckObjCInstMethSignature.cpp b/lib/EntoSA/Checkers/CheckObjCInstMethSignature.cpp
similarity index 96%
rename from lib/GR/Checkers/CheckObjCInstMethSignature.cpp
rename to lib/EntoSA/Checkers/CheckObjCInstMethSignature.cpp
index 62c5e600054e37b8192b74c66d9d9e9c799e87d5..f908e69cc7d682ed3aef40b71d5740e7de71ad87 100644
--- a/lib/GR/Checkers/CheckObjCInstMethSignature.cpp
+++ b/lib/EntoSA/Checkers/CheckObjCInstMethSignature.cpp
@@ -13,9 +13,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/Checkers/LocalCheckers.h"
-#include "clang/GR/BugReporter/PathDiagnostic.h"
-#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/Type.h"
 #include "clang/AST/ASTContext.h"
diff --git a/lib/GR/Checkers/CheckSecuritySyntaxOnly.cpp b/lib/EntoSA/Checkers/CheckSecuritySyntaxOnly.cpp
similarity index 99%
rename from lib/GR/Checkers/CheckSecuritySyntaxOnly.cpp
rename to lib/EntoSA/Checkers/CheckSecuritySyntaxOnly.cpp
index bdb03f8038cfbd9dbbe40d342e790a5bbfb5491b..98da69231c640d195106a3793be383fde35a9916 100644
--- a/lib/GR/Checkers/CheckSecuritySyntaxOnly.cpp
+++ b/lib/EntoSA/Checkers/CheckSecuritySyntaxOnly.cpp
@@ -12,8 +12,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Basic/TargetInfo.h"
-#include "clang/GR/BugReporter/BugReporter.h"
-#include "clang/GR/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
 #include "clang/AST/StmtVisitor.h"
 #include "llvm/Support/raw_ostream.h"
 
diff --git a/lib/GR/Checkers/CheckSizeofPointer.cpp b/lib/EntoSA/Checkers/CheckSizeofPointer.cpp
similarity index 95%
rename from lib/GR/Checkers/CheckSizeofPointer.cpp
rename to lib/EntoSA/Checkers/CheckSizeofPointer.cpp
index 3a2e8c7b50b9eb070cca2d0d988e20865d30dbef..f7ab9514e9bc5418b4ae5eb9aa79a02394077ac6 100644
--- a/lib/GR/Checkers/CheckSizeofPointer.cpp
+++ b/lib/EntoSA/Checkers/CheckSizeofPointer.cpp
@@ -12,9 +12,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
 #include "clang/AST/StmtVisitor.h"
-#include "clang/GR/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/ChrootChecker.cpp b/lib/EntoSA/Checkers/ChrootChecker.cpp
similarity index 95%
rename from lib/GR/Checkers/ChrootChecker.cpp
rename to lib/EntoSA/Checkers/ChrootChecker.cpp
index 6a36593894435bf3ed366bc2a07eecad66f35269..e951c29d1aee96d56f093b6d9c4bb733696b5058 100644
--- a/lib/GR/Checkers/ChrootChecker.cpp
+++ b/lib/EntoSA/Checkers/ChrootChecker.cpp
@@ -12,11 +12,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineExperimentalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/GRState.h"
-#include "clang/GR/PathSensitive/GRStateTrait.h"
-#include "clang/GR/PathSensitive/SymbolManager.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/PathSensitive/SymbolManager.h"
 #include "llvm/ADT/ImmutableMap.h"
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/DereferenceChecker.cpp b/lib/EntoSA/Checkers/DereferenceChecker.cpp
similarity index 97%
rename from lib/GR/Checkers/DereferenceChecker.cpp
rename to lib/EntoSA/Checkers/DereferenceChecker.cpp
index cecea57192415ad0fc08941e1353b4eb62554b28..35fae40935b4635838c518a7e16de84dabbbde4b 100644
--- a/lib/GR/Checkers/DereferenceChecker.cpp
+++ b/lib/EntoSA/Checkers/DereferenceChecker.cpp
@@ -13,10 +13,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/Checkers/DereferenceChecker.h"
-#include "clang/GR/PathSensitive/Checker.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/Checkers/DereferenceChecker.h"
+#include "clang/EntoSA/PathSensitive/Checker.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/DivZeroChecker.cpp b/lib/EntoSA/Checkers/DivZeroChecker.cpp
similarity index 96%
rename from lib/GR/Checkers/DivZeroChecker.cpp
rename to lib/EntoSA/Checkers/DivZeroChecker.cpp
index 2119a0ca2f6b3a125a3d4d2289417b12a323d0fa..24c743a8d051200cad5a88de0454b0d6b8af244a 100644
--- a/lib/GR/Checkers/DivZeroChecker.cpp
+++ b/lib/EntoSA/Checkers/DivZeroChecker.cpp
@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/ExprEngine.cpp b/lib/EntoSA/Checkers/ExprEngine.cpp
similarity index 99%
rename from lib/GR/Checkers/ExprEngine.cpp
rename to lib/EntoSA/Checkers/ExprEngine.cpp
index 2ff665c9416d2418c6a3b0239479af08c62c9d4a..afd6318acc2f7d798d526dbab6fb5ce5032274b8 100644
--- a/lib/GR/Checkers/ExprEngine.cpp
+++ b/lib/EntoSA/Checkers/ExprEngine.cpp
@@ -16,11 +16,11 @@
 // FIXME: Restructure checker registration.
 #include "ExprEngineInternalChecks.h"
 
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/AnalysisManager.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
-#include "clang/GR/PathSensitive/ExprEngineBuilders.h"
-#include "clang/GR/PathSensitive/Checker.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/AnalysisManager.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/ExprEngineBuilders.h"
+#include "clang/EntoSA/PathSensitive/Checker.h"
 #include "clang/AST/CharUnits.h"
 #include "clang/AST/ParentMap.h"
 #include "clang/AST/StmtObjC.h"
diff --git a/lib/GR/Checkers/ExprEngineExperimentalChecks.cpp b/lib/EntoSA/Checkers/ExprEngineExperimentalChecks.cpp
similarity index 96%
rename from lib/GR/Checkers/ExprEngineExperimentalChecks.cpp
rename to lib/EntoSA/Checkers/ExprEngineExperimentalChecks.cpp
index 9f3c04ae917e99e813592e27614bc17f929f4315..6ab5a4d5daf72120a26c2e721eb5447fa119e4c7 100644
--- a/lib/GR/Checkers/ExprEngineExperimentalChecks.cpp
+++ b/lib/EntoSA/Checkers/ExprEngineExperimentalChecks.cpp
@@ -14,7 +14,7 @@
 
 #include "ExprEngineInternalChecks.h"
 #include "ExprEngineExperimentalChecks.h"
-#include "clang/GR/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/ExprEngineExperimentalChecks.h b/lib/EntoSA/Checkers/ExprEngineExperimentalChecks.h
similarity index 100%
rename from lib/GR/Checkers/ExprEngineExperimentalChecks.h
rename to lib/EntoSA/Checkers/ExprEngineExperimentalChecks.h
diff --git a/lib/GR/Checkers/ExprEngineInternalChecks.h b/lib/EntoSA/Checkers/ExprEngineInternalChecks.h
similarity index 100%
rename from lib/GR/Checkers/ExprEngineInternalChecks.h
rename to lib/EntoSA/Checkers/ExprEngineInternalChecks.h
diff --git a/lib/GR/Checkers/FixedAddressChecker.cpp b/lib/EntoSA/Checkers/FixedAddressChecker.cpp
similarity index 95%
rename from lib/GR/Checkers/FixedAddressChecker.cpp
rename to lib/EntoSA/Checkers/FixedAddressChecker.cpp
index 1d629ee55e95eb55234aec6070be4cc763ec5752..ea736435d6be848f9c5fbed450fc0c95845f5527 100644
--- a/lib/GR/Checkers/FixedAddressChecker.cpp
+++ b/lib/EntoSA/Checkers/FixedAddressChecker.cpp
@@ -14,8 +14,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/FrontendActions.cpp b/lib/EntoSA/Checkers/FrontendActions.cpp
similarity index 89%
rename from lib/GR/Checkers/FrontendActions.cpp
rename to lib/EntoSA/Checkers/FrontendActions.cpp
index c88378279ae281f2ac9bf6258eb77a503c782fbb..b901afc5e14c8f22fd67c4f3a1fd324cae7d1e4d 100644
--- a/lib/GR/Checkers/FrontendActions.cpp
+++ b/lib/EntoSA/Checkers/FrontendActions.cpp
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/FrontendActions.h"
+#include "clang/EntoSA/FrontendActions.h"
 #include "clang/Frontend/CompilerInstance.h"
-#include "clang/GR/AnalysisConsumer.h"
+#include "clang/EntoSA/AnalysisConsumer.h"
 using namespace clang;
 using namespace ento;
 
diff --git a/lib/GR/Checkers/IdempotentOperationChecker.cpp b/lib/EntoSA/Checkers/IdempotentOperationChecker.cpp
similarity index 98%
rename from lib/GR/Checkers/IdempotentOperationChecker.cpp
rename to lib/EntoSA/Checkers/IdempotentOperationChecker.cpp
index 56bb542e923b1c37fd4cc1815b2faff873492ce5..04f652cdcb9f34eeb387f88e00f655f3002ab120 100644
--- a/lib/GR/Checkers/IdempotentOperationChecker.cpp
+++ b/lib/EntoSA/Checkers/IdempotentOperationChecker.cpp
@@ -45,12 +45,12 @@
 #include "ExprEngineExperimentalChecks.h"
 #include "clang/Analysis/CFGStmtMap.h"
 #include "clang/Analysis/Analyses/PseudoConstantAnalysis.h"
-#include "clang/GR/BugReporter/BugReporter.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerHelpers.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/CoreEngine.h"
-#include "clang/GR/PathSensitive/SVals.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerHelpers.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/CoreEngine.h"
+#include "clang/EntoSA/PathSensitive/SVals.h"
 #include "clang/AST/Stmt.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallSet.h"
diff --git a/lib/GR/Checkers/LLVMConventionsChecker.cpp b/lib/EntoSA/Checkers/LLVMConventionsChecker.cpp
similarity index 98%
rename from lib/GR/Checkers/LLVMConventionsChecker.cpp
rename to lib/EntoSA/Checkers/LLVMConventionsChecker.cpp
index 864dd850937ba3b3d5ad89719d65e08802554c0c..e88997f79ca76f4d64bc03db35990ea92684e2e6 100644
--- a/lib/GR/Checkers/LLVMConventionsChecker.cpp
+++ b/lib/EntoSA/Checkers/LLVMConventionsChecker.cpp
@@ -14,8 +14,8 @@
 
 #include "clang/AST/DeclTemplate.h"
 #include "clang/AST/StmtVisitor.h"
-#include "clang/GR/Checkers/LocalCheckers.h"
-#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
 #include <string>
 #include "llvm/ADT/StringRef.h"
 
diff --git a/lib/GR/Checkers/MacOSXAPIChecker.cpp b/lib/EntoSA/Checkers/MacOSXAPIChecker.cpp
similarity index 96%
rename from lib/GR/Checkers/MacOSXAPIChecker.cpp
rename to lib/EntoSA/Checkers/MacOSXAPIChecker.cpp
index 5934c5ffbf23fe51c12038ce58aec42cebeb644b..c2f5f4b83cfe0c3affb4e368966c2ea2da7076e7 100644
--- a/lib/GR/Checkers/MacOSXAPIChecker.cpp
+++ b/lib/EntoSA/Checkers/MacOSXAPIChecker.cpp
@@ -17,9 +17,9 @@
 
 #include "ExprEngineInternalChecks.h"
 #include "clang/Basic/TargetInfo.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/raw_ostream.h"
diff --git a/lib/GR/Checkers/Makefile b/lib/EntoSA/Checkers/Makefile
similarity index 94%
rename from lib/GR/Checkers/Makefile
rename to lib/EntoSA/Checkers/Makefile
index b3d213ab07343b5e876326d77e31576505899950..9ba4e282d2cc82558e369596395ac9ec3b0d884c 100644
--- a/lib/GR/Checkers/Makefile
+++ b/lib/EntoSA/Checkers/Makefile
@@ -12,6 +12,6 @@
 ##===----------------------------------------------------------------------===##
 
 CLANG_LEVEL := ../../..
-LIBRARYNAME := clangGRCheckers
+LIBRARYNAME := clangEntoCheckers
 
 include $(CLANG_LEVEL)/Makefile
diff --git a/lib/GR/Checkers/MallocChecker.cpp b/lib/EntoSA/Checkers/MallocChecker.cpp
similarity index 98%
rename from lib/GR/Checkers/MallocChecker.cpp
rename to lib/EntoSA/Checkers/MallocChecker.cpp
index a4d317f8b056adc90e935c5189c5620d431382f5..2b0ae82ccd7bc9a44adf18ffff9044d06ba93771 100644
--- a/lib/GR/Checkers/MallocChecker.cpp
+++ b/lib/EntoSA/Checkers/MallocChecker.cpp
@@ -13,11 +13,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineExperimentalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/GRState.h"
-#include "clang/GR/PathSensitive/GRStateTrait.h"
-#include "clang/GR/PathSensitive/SymbolManager.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/PathSensitive/SymbolManager.h"
 #include "llvm/ADT/ImmutableMap.h"
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/NSAutoreleasePoolChecker.cpp b/lib/EntoSA/Checkers/NSAutoreleasePoolChecker.cpp
similarity index 94%
rename from lib/GR/Checkers/NSAutoreleasePoolChecker.cpp
rename to lib/EntoSA/Checkers/NSAutoreleasePoolChecker.cpp
index c93121fcd93e870ac8a875b33f573e78f1bb1b38..acad46c35280620995eef13f133d4130725e4e1b 100644
--- a/lib/GR/Checkers/NSAutoreleasePoolChecker.cpp
+++ b/lib/EntoSA/Checkers/NSAutoreleasePoolChecker.cpp
@@ -15,9 +15,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/BugReporter/BugReporter.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 #include "BasicObjCFoundationChecks.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/Decl.h"
diff --git a/lib/GR/Checkers/NSErrorChecker.cpp b/lib/EntoSA/Checkers/NSErrorChecker.cpp
similarity index 97%
rename from lib/GR/Checkers/NSErrorChecker.cpp
rename to lib/EntoSA/Checkers/NSErrorChecker.cpp
index ee3f901ad5306fd6b5a3e4fca4e166dd58b209ea..d5c395f0a1112d0f8e22c66b0fd5c15541d900be 100644
--- a/lib/GR/Checkers/NSErrorChecker.cpp
+++ b/lib/EntoSA/Checkers/NSErrorChecker.cpp
@@ -15,10 +15,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/Checkers/LocalCheckers.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
-#include "clang/GR/Checkers/DereferenceChecker.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/Checkers/DereferenceChecker.h"
 #include "BasicObjCFoundationChecks.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/Decl.h"
diff --git a/lib/GR/Checkers/NoReturnFunctionChecker.cpp b/lib/EntoSA/Checkers/NoReturnFunctionChecker.cpp
similarity index 97%
rename from lib/GR/Checkers/NoReturnFunctionChecker.cpp
rename to lib/EntoSA/Checkers/NoReturnFunctionChecker.cpp
index ad86ac500d8003fb6c743db94fc94a6a2a1383eb..4b96ddba3999e8e254245efe925fa91d0dd78603 100644
--- a/lib/GR/Checkers/NoReturnFunctionChecker.cpp
+++ b/lib/EntoSA/Checkers/NoReturnFunctionChecker.cpp
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 #include "llvm/ADT/StringSwitch.h"
 
 using namespace clang;
diff --git a/lib/GR/Checkers/OSAtomicChecker.cpp b/lib/EntoSA/Checkers/OSAtomicChecker.cpp
similarity index 99%
rename from lib/GR/Checkers/OSAtomicChecker.cpp
rename to lib/EntoSA/Checkers/OSAtomicChecker.cpp
index 3d230ce76e7f6d93c617c2da138415610c5a9428..cc67c3df7a53ecaecb14c92bb989161e84357a23 100644
--- a/lib/GR/Checkers/OSAtomicChecker.cpp
+++ b/lib/EntoSA/Checkers/OSAtomicChecker.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/PathSensitive/Checker.h"
+#include "clang/EntoSA/PathSensitive/Checker.h"
 #include "clang/Basic/Builtins.h"
 
 using namespace clang;
diff --git a/lib/GR/Checkers/ObjCAtSyncChecker.cpp b/lib/EntoSA/Checkers/ObjCAtSyncChecker.cpp
similarity index 93%
rename from lib/GR/Checkers/ObjCAtSyncChecker.cpp
rename to lib/EntoSA/Checkers/ObjCAtSyncChecker.cpp
index b44fae8b6c949b959c313f3c3143150b312b4251..3e901b60075d06ffacc628594223cf2fbf7af23d 100644
--- a/lib/GR/Checkers/ObjCAtSyncChecker.cpp
+++ b/lib/EntoSA/Checkers/ObjCAtSyncChecker.cpp
@@ -13,10 +13,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/Checkers/DereferenceChecker.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/Checkers/DereferenceChecker.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/ObjCUnusedIVarsChecker.cpp b/lib/EntoSA/Checkers/ObjCUnusedIVarsChecker.cpp
similarity index 97%
rename from lib/GR/Checkers/ObjCUnusedIVarsChecker.cpp
rename to lib/EntoSA/Checkers/ObjCUnusedIVarsChecker.cpp
index 177f6a22679e2294ef664b532a75facc4bc0edfa..a2e2475f2875964fbaeac7d8af81c874474009ad 100644
--- a/lib/GR/Checkers/ObjCUnusedIVarsChecker.cpp
+++ b/lib/EntoSA/Checkers/ObjCUnusedIVarsChecker.cpp
@@ -13,9 +13,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/Checkers/LocalCheckers.h"
-#include "clang/GR/BugReporter/PathDiagnostic.h"
-#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
 #include "clang/AST/ExprObjC.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/DeclObjC.h"
diff --git a/lib/GR/Checkers/PointerArithChecker.cpp b/lib/EntoSA/Checkers/PointerArithChecker.cpp
similarity index 95%
rename from lib/GR/Checkers/PointerArithChecker.cpp
rename to lib/EntoSA/Checkers/PointerArithChecker.cpp
index f40eeec52f5ef87a9c03ba39a7843f6840a3f55d..30009a2560730fb7d2834b40e634e3829b3a5bef 100644
--- a/lib/GR/Checkers/PointerArithChecker.cpp
+++ b/lib/EntoSA/Checkers/PointerArithChecker.cpp
@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/PointerSubChecker.cpp b/lib/EntoSA/Checkers/PointerSubChecker.cpp
similarity index 95%
rename from lib/GR/Checkers/PointerSubChecker.cpp
rename to lib/EntoSA/Checkers/PointerSubChecker.cpp
index 63aa90429e96b3e5d85c3f3cdd4a27ebcf279403..923d0a86d8ec4f9a7794d5d6fe485387fd813125 100644
--- a/lib/GR/Checkers/PointerSubChecker.cpp
+++ b/lib/EntoSA/Checkers/PointerSubChecker.cpp
@@ -14,8 +14,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/PthreadLockChecker.cpp b/lib/EntoSA/Checkers/PthreadLockChecker.cpp
similarity index 96%
rename from lib/GR/Checkers/PthreadLockChecker.cpp
rename to lib/EntoSA/Checkers/PthreadLockChecker.cpp
index 517f6b15ab7b8220a2a14f40ee878969d9e8201f..56c9adb50913cd27790c012009534fd34f57568e 100644
--- a/lib/GR/Checkers/PthreadLockChecker.cpp
+++ b/lib/EntoSA/Checkers/PthreadLockChecker.cpp
@@ -12,9 +12,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/BugReporter/BugReporter.h"
-#include "clang/GR/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
 #include "ExprEngineExperimentalChecks.h"
 #include "llvm/ADT/ImmutableSet.h"
 
diff --git a/lib/GR/Checkers/ReturnPointerRangeChecker.cpp b/lib/EntoSA/Checkers/ReturnPointerRangeChecker.cpp
similarity index 95%
rename from lib/GR/Checkers/ReturnPointerRangeChecker.cpp
rename to lib/EntoSA/Checkers/ReturnPointerRangeChecker.cpp
index 80316f58c10f12285f22c2ed9b5a5c6c8fc35d06..8afe9847aaa8d4332569b9c2f577e389c8cc2006 100644
--- a/lib/GR/Checkers/ReturnPointerRangeChecker.cpp
+++ b/lib/EntoSA/Checkers/ReturnPointerRangeChecker.cpp
@@ -13,9 +13,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/ReturnUndefChecker.cpp b/lib/EntoSA/Checkers/ReturnUndefChecker.cpp
similarity index 92%
rename from lib/GR/Checkers/ReturnUndefChecker.cpp
rename to lib/EntoSA/Checkers/ReturnUndefChecker.cpp
index 17a2a55ebd965c23d7972eb242d260ee05a8e5ac..8e46519b21b975c00198456d2cb639bd53ccc4fe 100644
--- a/lib/GR/Checkers/ReturnUndefChecker.cpp
+++ b/lib/EntoSA/Checkers/ReturnUndefChecker.cpp
@@ -14,9 +14,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/StackAddrLeakChecker.cpp b/lib/EntoSA/Checkers/StackAddrLeakChecker.cpp
similarity index 97%
rename from lib/GR/Checkers/StackAddrLeakChecker.cpp
rename to lib/EntoSA/Checkers/StackAddrLeakChecker.cpp
index 229356ad6791d5ff32a28703bc957d4de926256c..c9aebadca12917dab2054b89a8cbe99b36e61a9d 100644
--- a/lib/GR/Checkers/StackAddrLeakChecker.cpp
+++ b/lib/EntoSA/Checkers/StackAddrLeakChecker.cpp
@@ -13,9 +13,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
 #include "clang/Basic/SourceManager.h"
 #include "llvm/ADT/SmallString.h"
 using namespace clang;
diff --git a/lib/GR/Checkers/StreamChecker.cpp b/lib/EntoSA/Checkers/StreamChecker.cpp
similarity index 98%
rename from lib/GR/Checkers/StreamChecker.cpp
rename to lib/EntoSA/Checkers/StreamChecker.cpp
index 32e22b04198e96001ce8a2c9cff46ea2e4335235..cb7899fbb223e011cc498415fb91077ffbddc449 100644
--- a/lib/GR/Checkers/StreamChecker.cpp
+++ b/lib/EntoSA/Checkers/StreamChecker.cpp
@@ -12,11 +12,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineExperimentalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/GRState.h"
-#include "clang/GR/PathSensitive/GRStateTrait.h"
-#include "clang/GR/PathSensitive/SymbolManager.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/PathSensitive/SymbolManager.h"
 #include "llvm/ADT/ImmutableMap.h"
 
 using namespace clang;
diff --git a/lib/GR/Checkers/UndefBranchChecker.cpp b/lib/EntoSA/Checkers/UndefBranchChecker.cpp
similarity index 97%
rename from lib/GR/Checkers/UndefBranchChecker.cpp
rename to lib/EntoSA/Checkers/UndefBranchChecker.cpp
index fc668be35caf926b09e60227bf134e787e838354..30d0728530163791fcf1b88e2f78404f36c910c8 100644
--- a/lib/GR/Checkers/UndefBranchChecker.cpp
+++ b/lib/EntoSA/Checkers/UndefBranchChecker.cpp
@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/Checker.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/Checker.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/UndefCapturedBlockVarChecker.cpp b/lib/EntoSA/Checkers/UndefCapturedBlockVarChecker.cpp
similarity index 95%
rename from lib/GR/Checkers/UndefCapturedBlockVarChecker.cpp
rename to lib/EntoSA/Checkers/UndefCapturedBlockVarChecker.cpp
index 8ceda3ddc5c6d323081ea572a88caa85cc6b9923..dcdcf1f7412cd1d0c2fd711cb7ae3676c11c223e 100644
--- a/lib/GR/Checkers/UndefCapturedBlockVarChecker.cpp
+++ b/lib/EntoSA/Checkers/UndefCapturedBlockVarChecker.cpp
@@ -12,9 +12,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
-#include "clang/GR/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
diff --git a/lib/GR/Checkers/UndefResultChecker.cpp b/lib/EntoSA/Checkers/UndefResultChecker.cpp
similarity index 94%
rename from lib/GR/Checkers/UndefResultChecker.cpp
rename to lib/EntoSA/Checkers/UndefResultChecker.cpp
index 3d4faa2988e18b63ce942d9e655f4ceadc75b3ac..c0427402b17d450f70494f14a8afd161b2574597 100644
--- a/lib/GR/Checkers/UndefResultChecker.cpp
+++ b/lib/EntoSA/Checkers/UndefResultChecker.cpp
@@ -13,9 +13,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/UndefinedArraySubscriptChecker.cpp b/lib/EntoSA/Checkers/UndefinedArraySubscriptChecker.cpp
similarity index 94%
rename from lib/GR/Checkers/UndefinedArraySubscriptChecker.cpp
rename to lib/EntoSA/Checkers/UndefinedArraySubscriptChecker.cpp
index 90f7d5db4197f2445a1ac21fb1dce32ff621c324..aea78c048bea282473937b2f458d44325cf3ee62 100644
--- a/lib/GR/Checkers/UndefinedArraySubscriptChecker.cpp
+++ b/lib/EntoSA/Checkers/UndefinedArraySubscriptChecker.cpp
@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/UndefinedAssignmentChecker.cpp b/lib/EntoSA/Checkers/UndefinedAssignmentChecker.cpp
similarity index 96%
rename from lib/GR/Checkers/UndefinedAssignmentChecker.cpp
rename to lib/EntoSA/Checkers/UndefinedAssignmentChecker.cpp
index 8addd4458e883e5e75ef73b594172643f066974f..5060cdff9645571f699bef59afe913a81c257a7d 100644
--- a/lib/GR/Checkers/UndefinedAssignmentChecker.cpp
+++ b/lib/EntoSA/Checkers/UndefinedAssignmentChecker.cpp
@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Checkers/UnixAPIChecker.cpp b/lib/EntoSA/Checkers/UnixAPIChecker.cpp
similarity index 98%
rename from lib/GR/Checkers/UnixAPIChecker.cpp
rename to lib/EntoSA/Checkers/UnixAPIChecker.cpp
index b9d8b57794aa32d32ec38ca976ac01b158fdfe3b..c45659c011202c45299dafcd43e1fb4d4d11c1c3 100644
--- a/lib/GR/Checkers/UnixAPIChecker.cpp
+++ b/lib/EntoSA/Checkers/UnixAPIChecker.cpp
@@ -14,8 +14,8 @@
 
 #include "ExprEngineInternalChecks.h"
 #include "clang/Basic/TargetInfo.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringSwitch.h"
 #include <fcntl.h>
diff --git a/lib/GR/Checkers/UnreachableCodeChecker.cpp b/lib/EntoSA/Checkers/UnreachableCodeChecker.cpp
similarity index 96%
rename from lib/GR/Checkers/UnreachableCodeChecker.cpp
rename to lib/EntoSA/Checkers/UnreachableCodeChecker.cpp
index b52dc87c04e2ee4e6b39e25d987b101ece71939e..e3ea72e13373ecb5513f5dd3057346c5faedae56 100644
--- a/lib/GR/Checkers/UnreachableCodeChecker.cpp
+++ b/lib/EntoSA/Checkers/UnreachableCodeChecker.cpp
@@ -16,11 +16,11 @@
 #include "clang/AST/ParentMap.h"
 #include "clang/Basic/Builtins.h"
 #include "clang/Basic/SourceManager.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExplodedGraph.h"
-#include "clang/GR/PathSensitive/SVals.h"
-#include "clang/GR/PathSensitive/CheckerHelpers.h"
-#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExplodedGraph.h"
+#include "clang/EntoSA/PathSensitive/SVals.h"
+#include "clang/EntoSA/PathSensitive/CheckerHelpers.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
 #include "ExprEngineExperimentalChecks.h"
 #include "llvm/ADT/SmallPtrSet.h"
 
diff --git a/lib/GR/Checkers/VLASizeChecker.cpp b/lib/EntoSA/Checkers/VLASizeChecker.cpp
similarity index 96%
rename from lib/GR/Checkers/VLASizeChecker.cpp
rename to lib/EntoSA/Checkers/VLASizeChecker.cpp
index d21ad217806a9edbf1dc67fa2e698a747688cd9f..0d17238ee70324f2457b00f837b8bc50002569f4 100644
--- a/lib/GR/Checkers/VLASizeChecker.cpp
+++ b/lib/EntoSA/Checkers/VLASizeChecker.cpp
@@ -16,9 +16,9 @@
 
 #include "ExprEngineInternalChecks.h"
 #include "clang/AST/CharUnits.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/CoreEngine.cpp b/lib/EntoSA/CoreEngine.cpp
similarity index 99%
rename from lib/GR/CoreEngine.cpp
rename to lib/EntoSA/CoreEngine.cpp
index 3236b92378302f06b767ab84ceef040f54af716b..478e77b4af34bd8e2218ca018228ae14bdc56188 100644
--- a/lib/GR/CoreEngine.cpp
+++ b/lib/EntoSA/CoreEngine.cpp
@@ -12,9 +12,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/AnalysisManager.h"
-#include "clang/GR/PathSensitive/CoreEngine.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/AnalysisManager.h"
+#include "clang/EntoSA/PathSensitive/CoreEngine.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 #include "clang/Index/TranslationUnit.h"
 #include "clang/AST/Expr.h"
 #include "llvm/Support/Casting.h"
diff --git a/lib/GR/Environment.cpp b/lib/EntoSA/Environment.cpp
similarity index 99%
rename from lib/GR/Environment.cpp
rename to lib/EntoSA/Environment.cpp
index 4961704509c29e86b320b1a0a6f000b5bd6afb9e..eecbabbb2e37f571c1ea58dfc6259af8a50389f2 100644
--- a/lib/GR/Environment.cpp
+++ b/lib/EntoSA/Environment.cpp
@@ -13,7 +13,7 @@
 
 #include "clang/Analysis/AnalysisContext.h"
 #include "clang/Analysis/CFG.h"
-#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/ExplodedGraph.cpp b/lib/EntoSA/ExplodedGraph.cpp
similarity index 98%
rename from lib/GR/ExplodedGraph.cpp
rename to lib/EntoSA/ExplodedGraph.cpp
index dd206aba0000ae4b0fd64742c69ad1850b2a6720..ec66ba60280cc6cb9cf5bbab519a6dc7186018cd 100644
--- a/lib/GR/ExplodedGraph.cpp
+++ b/lib/EntoSA/ExplodedGraph.cpp
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/ExplodedGraph.h"
-#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/ExplodedGraph.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
 #include "clang/AST/Stmt.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/DenseMap.h"
diff --git a/lib/GR/FlatStore.cpp b/lib/EntoSA/FlatStore.cpp
similarity index 99%
rename from lib/GR/FlatStore.cpp
rename to lib/EntoSA/FlatStore.cpp
index 6809c3b53cdd27db4192abfa5e606a51db02d137..8ded4d16b6528c97bc5910e3c973b9f4f3a419ee 100644
--- a/lib/GR/FlatStore.cpp
+++ b/lib/EntoSA/FlatStore.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
 #include "llvm/ADT/ImmutableIntervalMap.h"
 #include "llvm/Support/ErrorHandling.h"
 
diff --git a/lib/GR/GRState.cpp b/lib/EntoSA/GRState.cpp
similarity index 98%
rename from lib/GR/GRState.cpp
rename to lib/EntoSA/GRState.cpp
index e531cc9d99bced4df547f154cc5d434932e42b84..62396230ff72328c0e66d5fcdbe255f93796619d 100644
--- a/lib/GR/GRState.cpp
+++ b/lib/EntoSA/GRState.cpp
@@ -12,10 +12,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Analysis/CFG.h"
-#include "clang/GR/PathSensitive/GRStateTrait.h"
-#include "clang/GR/PathSensitive/GRState.h"
-#include "clang/GR/PathSensitive/SubEngine.h"
-#include "clang/GR/PathSensitive/TransferFuncs.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/SubEngine.h"
+#include "clang/EntoSA/PathSensitive/TransferFuncs.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
diff --git a/lib/GR/HTMLDiagnostics.cpp b/lib/EntoSA/HTMLDiagnostics.cpp
similarity index 99%
rename from lib/GR/HTMLDiagnostics.cpp
rename to lib/EntoSA/HTMLDiagnostics.cpp
index 72a854a85d290f41d95f531069d7cd0962814d4e..a0d338ae1e689c468f053bef65e7739c8925df22 100644
--- a/lib/GR/HTMLDiagnostics.cpp
+++ b/lib/EntoSA/HTMLDiagnostics.cpp
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathDiagnosticClients.h"
-#include "clang/GR/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/PathDiagnosticClients.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Decl.h"
 #include "clang/Basic/SourceManager.h"
diff --git a/lib/GR/Makefile b/lib/EntoSA/Makefile
similarity index 95%
rename from lib/GR/Makefile
rename to lib/EntoSA/Makefile
index 3261983107e15647c5675ca159ba16df5b8ae26d..967813869548ca3a7e28bce7d637569163363adb 100644
--- a/lib/GR/Makefile
+++ b/lib/EntoSA/Makefile
@@ -12,7 +12,7 @@
 ##===----------------------------------------------------------------------===##
 
 CLANG_LEVEL := ../..
-LIBRARYNAME := clangGRCore
+LIBRARYNAME := clangEntoCore
 PARALLEL_DIRS := Checkers
 
 include $(CLANG_LEVEL)/Makefile
diff --git a/lib/GR/ManagerRegistry.cpp b/lib/EntoSA/ManagerRegistry.cpp
similarity index 94%
rename from lib/GR/ManagerRegistry.cpp
rename to lib/EntoSA/ManagerRegistry.cpp
index 4058c11f7c8df3b1aaa9cefb05baec5ee8d755ea..99b7a707481b62722d2b3ce389bb3306700b1603 100644
--- a/lib/GR/ManagerRegistry.cpp
+++ b/lib/EntoSA/ManagerRegistry.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/ManagerRegistry.h"
+#include "clang/EntoSA/ManagerRegistry.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/MemRegion.cpp b/lib/EntoSA/MemRegion.cpp
similarity index 99%
rename from lib/GR/MemRegion.cpp
rename to lib/EntoSA/MemRegion.cpp
index f16223636f68643047253cdbfbc4bd1f4f9daa6a..ff0f34044e76b11db48c006867430d39fe5296d1 100644
--- a/lib/GR/MemRegion.cpp
+++ b/lib/EntoSA/MemRegion.cpp
@@ -13,8 +13,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/MemRegion.h"
-#include "clang/GR/PathSensitive/SValBuilder.h"
+#include "clang/EntoSA/PathSensitive/MemRegion.h"
+#include "clang/EntoSA/PathSensitive/SValBuilder.h"
 #include "clang/Analysis/AnalysisContext.h"
 #include "clang/Analysis/Support/BumpVector.h"
 #include "clang/AST/CharUnits.h"
diff --git a/lib/GR/PathDiagnostic.cpp b/lib/EntoSA/PathDiagnostic.cpp
similarity index 99%
rename from lib/GR/PathDiagnostic.cpp
rename to lib/EntoSA/PathDiagnostic.cpp
index 69c660b4a4c4c1a50878b3c535a45df7a8cdb86e..bf8c8b0d3d9d9ebf0fa9cdcb71e2524d1ceef508 100644
--- a/lib/GR/PathDiagnostic.cpp
+++ b/lib/EntoSA/PathDiagnostic.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclObjC.h"
diff --git a/lib/GR/PlistDiagnostics.cpp b/lib/EntoSA/PlistDiagnostics.cpp
similarity index 99%
rename from lib/GR/PlistDiagnostics.cpp
rename to lib/EntoSA/PlistDiagnostics.cpp
index ebab2b200295b1cfda2efc0c5c0c081ebeffa646..6e54d494c5dcc0c68edd0dc3bcb8a62beb4a72fa 100644
--- a/lib/GR/PlistDiagnostics.cpp
+++ b/lib/EntoSA/PlistDiagnostics.cpp
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathDiagnosticClients.h"
-#include "clang/GR/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/PathDiagnosticClients.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/FileManager.h"
 #include "clang/Lex/Preprocessor.h"
diff --git a/lib/GR/README.txt b/lib/EntoSA/README.txt
similarity index 100%
rename from lib/GR/README.txt
rename to lib/EntoSA/README.txt
diff --git a/lib/GR/RangeConstraintManager.cpp b/lib/EntoSA/RangeConstraintManager.cpp
similarity index 98%
rename from lib/GR/RangeConstraintManager.cpp
rename to lib/EntoSA/RangeConstraintManager.cpp
index 5ce69bafd14340a82106871b0496d415b2f67529..5c2d674515b4664f9e795ded75e7381e8edcb3fa 100644
--- a/lib/GR/RangeConstraintManager.cpp
+++ b/lib/EntoSA/RangeConstraintManager.cpp
@@ -13,10 +13,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "SimpleConstraintManager.h"
-#include "clang/GR/PathSensitive/GRState.h"
-#include "clang/GR/PathSensitive/GRStateTrait.h"
-#include "clang/GR/PathSensitive/TransferFuncs.h"
-#include "clang/GR/ManagerRegistry.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/PathSensitive/TransferFuncs.h"
+#include "clang/EntoSA/ManagerRegistry.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/ImmutableSet.h"
diff --git a/lib/GR/RegionStore.cpp b/lib/EntoSA/RegionStore.cpp
similarity index 99%
rename from lib/GR/RegionStore.cpp
rename to lib/EntoSA/RegionStore.cpp
index 0ae68cf79a9dfc3717bee25d62d5695aaf26671a..4913d1a3893dfc4a9cb80b91d7ff1818cd4f96bf 100644
--- a/lib/GR/RegionStore.cpp
+++ b/lib/EntoSA/RegionStore.cpp
@@ -20,9 +20,9 @@
 #include "clang/Analysis/Analyses/LiveVariables.h"
 #include "clang/Analysis/AnalysisContext.h"
 #include "clang/Basic/TargetInfo.h"
-#include "clang/GR/PathSensitive/GRState.h"
-#include "clang/GR/PathSensitive/GRStateTrait.h"
-#include "clang/GR/PathSensitive/MemRegion.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/PathSensitive/MemRegion.h"
 #include "llvm/ADT/ImmutableList.h"
 #include "llvm/ADT/ImmutableMap.h"
 #include "llvm/ADT/Optional.h"
diff --git a/lib/GR/SValBuilder.cpp b/lib/EntoSA/SValBuilder.cpp
similarity index 97%
rename from lib/GR/SValBuilder.cpp
rename to lib/EntoSA/SValBuilder.cpp
index eec5193ef3a5d6c0b614124a4464247058a526d1..c4efaae90660ab910ada4a22d97ccb37b2f4544f 100644
--- a/lib/GR/SValBuilder.cpp
+++ b/lib/EntoSA/SValBuilder.cpp
@@ -12,11 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/MemRegion.h"
-#include "clang/GR/PathSensitive/SVals.h"
-#include "clang/GR/PathSensitive/SValBuilder.h"
-#include "clang/GR/PathSensitive/GRState.h"
-#include "clang/GR/PathSensitive/BasicValueFactory.h"
+#include "clang/EntoSA/PathSensitive/MemRegion.h"
+#include "clang/EntoSA/PathSensitive/SVals.h"
+#include "clang/EntoSA/PathSensitive/SValBuilder.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/BasicValueFactory.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/SVals.cpp b/lib/EntoSA/SVals.cpp
similarity index 99%
rename from lib/GR/SVals.cpp
rename to lib/EntoSA/SVals.cpp
index ed2bc13e498f1af24b0c20038d7884dd93930ab7..ea23293924af599e2608799cf97ddedc4da159c8 100644
--- a/lib/GR/SVals.cpp
+++ b/lib/EntoSA/SVals.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
 #include "clang/Basic/IdentifierTable.h"
 
 using namespace clang;
diff --git a/lib/GR/SimpleConstraintManager.cpp b/lib/EntoSA/SimpleConstraintManager.cpp
similarity index 98%
rename from lib/GR/SimpleConstraintManager.cpp
rename to lib/EntoSA/SimpleConstraintManager.cpp
index f0d50da2991e3f96da494652a6156c57552e1d87..ef26fc5d93750478155bb846ffbf85cf549c8161 100644
--- a/lib/GR/SimpleConstraintManager.cpp
+++ b/lib/EntoSA/SimpleConstraintManager.cpp
@@ -13,9 +13,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "SimpleConstraintManager.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
-#include "clang/GR/PathSensitive/GRState.h"
-#include "clang/GR/PathSensitive/Checker.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/Checker.h"
 
 namespace clang {
 
diff --git a/lib/GR/SimpleConstraintManager.h b/lib/EntoSA/SimpleConstraintManager.h
similarity index 97%
rename from lib/GR/SimpleConstraintManager.h
rename to lib/EntoSA/SimpleConstraintManager.h
index 85d133f2f8eee8124580f589a477c84f7011b5c1..83db8cc9cedaa83cd5d79632d985d15c60d477bd 100644
--- a/lib/GR/SimpleConstraintManager.h
+++ b/lib/EntoSA/SimpleConstraintManager.h
@@ -14,8 +14,8 @@
 #ifndef LLVM_CLANG_GR_SIMPLE_CONSTRAINT_MANAGER_H
 #define LLVM_CLANG_GR_SIMPLE_CONSTRAINT_MANAGER_H
 
-#include "clang/GR/PathSensitive/ConstraintManager.h"
-#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/ConstraintManager.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
 
 namespace clang {
 
diff --git a/lib/GR/SimpleSValBuilder.cpp b/lib/EntoSA/SimpleSValBuilder.cpp
similarity index 99%
rename from lib/GR/SimpleSValBuilder.cpp
rename to lib/EntoSA/SimpleSValBuilder.cpp
index bcd303e8fbdaeb65226b103312d6368f542975c1..ac0bfa62ef77e391d840d23f66dbeb3b86fbe480 100644
--- a/lib/GR/SimpleSValBuilder.cpp
+++ b/lib/EntoSA/SimpleSValBuilder.cpp
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/SValBuilder.h"
-#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/SValBuilder.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
 
 using namespace clang;
 using namespace ento;
diff --git a/lib/GR/Store.cpp b/lib/EntoSA/Store.cpp
similarity index 99%
rename from lib/GR/Store.cpp
rename to lib/EntoSA/Store.cpp
index 2e9857a9a0cd4e11df33596eeddb7f46bcb70941..29b0ee1b5fbeef74b67937f3d3f8b0998f0b6616 100644
--- a/lib/GR/Store.cpp
+++ b/lib/EntoSA/Store.cpp
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/Store.h"
-#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/Store.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
 #include "clang/AST/CharUnits.h"
 
 using namespace clang;
diff --git a/lib/GR/SymbolManager.cpp b/lib/EntoSA/SymbolManager.cpp
similarity index 98%
rename from lib/GR/SymbolManager.cpp
rename to lib/EntoSA/SymbolManager.cpp
index 7727138b021b1c16c8c21a1387bba0b2316aea20..75e0774837f25aa5d4960a55fdaa31a8feef9871 100644
--- a/lib/GR/SymbolManager.cpp
+++ b/lib/EntoSA/SymbolManager.cpp
@@ -12,9 +12,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/SymbolManager.h"
+#include "clang/EntoSA/PathSensitive/SymbolManager.h"
 #include "clang/Analysis/Analyses/LiveVariables.h"
-#include "clang/GR/PathSensitive/MemRegion.h"
+#include "clang/EntoSA/PathSensitive/MemRegion.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
diff --git a/lib/GR/TextPathDiagnostics.cpp b/lib/EntoSA/TextPathDiagnostics.cpp
similarity index 95%
rename from lib/GR/TextPathDiagnostics.cpp
rename to lib/EntoSA/TextPathDiagnostics.cpp
index 02e6c2e8d6026f0a2bedf05fd21210a5aa158ac1..bf98301dc51399c8fc456ce5f869d6d16d623a6d 100644
--- a/lib/GR/TextPathDiagnostics.cpp
+++ b/lib/EntoSA/TextPathDiagnostics.cpp
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathDiagnosticClients.h"
-#include "clang/GR/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/PathDiagnosticClients.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
 #include "clang/Lex/Preprocessor.h"
 #include "llvm/Support/raw_ostream.h"
 using namespace clang;
diff --git a/lib/FrontendTool/CMakeLists.txt b/lib/FrontendTool/CMakeLists.txt
index f4ace981464b455856cd493bf1348b8e0bec602c..89937e1762ce9b87576ff5e604803011f50b5060 100644
--- a/lib/FrontendTool/CMakeLists.txt
+++ b/lib/FrontendTool/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
 set(LLVM_USED_LIBS clangDriver clangFrontend clangRewrite clangCodeGen 
-    clangGRCheckers clangGRCore)
+    clangEntoCheckers clangEntoCore)
 
 add_clang_library(clangFrontendTool
   ExecuteCompilerInvocation.cpp
diff --git a/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/lib/FrontendTool/ExecuteCompilerInvocation.cpp
index ae6194beb8581a04e16f2adce25112ca637761b7..e17e8b715685de8cb8eeea8a14de5ed2ab547501 100644
--- a/lib/FrontendTool/ExecuteCompilerInvocation.cpp
+++ b/lib/FrontendTool/ExecuteCompilerInvocation.cpp
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/FrontendTool/Utils.h"
-#include "clang/GR/FrontendActions.h"
+#include "clang/EntoSA/FrontendActions.h"
 #include "clang/CodeGen/CodeGenAction.h"
 #include "clang/Driver/CC1Options.h"
 #include "clang/Driver/OptTable.h"
diff --git a/lib/Makefile b/lib/Makefile
index 6509fd59c63e45cee4aa224cfce681fef6974e85..300b9ea09714aa51850534ef93ed5315756047f0 100755
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -9,7 +9,7 @@
 CLANG_LEVEL := ..
 
 PARALLEL_DIRS = Headers Basic Lex Parse AST Sema CodeGen Analysis \
-                GR Rewrite Serialization Frontend FrontendTool Index Driver
+                EntoSA Rewrite Serialization Frontend FrontendTool Index Driver
 
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index 9c331a5b6dd7258adf7c4616a30e6c1fafed7dff..6e02e85e5a51509499755fa7c562fbea4546df96 100644
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -8,8 +8,8 @@ set( LLVM_USED_LIBS
   clangCodeGen
   clangParse
   clangSema
-  clangGRCheckers
-  clangGRCore
+  clangEntoCheckers
+  clangEntoCore
   clangAnalysis
   clangIndex
   clangRewrite
diff --git a/tools/driver/Makefile b/tools/driver/Makefile
index a98d715c2e21eadb25ec8c50297748768fb3d926..e97bfeb44358c80f4bf63176f63e44b6b1a528c2 100644
--- a/tools/driver/Makefile
+++ b/tools/driver/Makefile
@@ -39,7 +39,7 @@ LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter codegen \
                    ipo selectiondag
 USEDLIBS = clangFrontendTool.a clangFrontend.a clangDriver.a \
            clangSerialization.a clangCodeGen.a clangParse.a clangSema.a \
-           clangGRCheckers.a clangGRCore.a clangAnalysis.a clangIndex.a clangRewrite.a \
+           clangEntoCheckers.a clangEntoCore.a clangAnalysis.a clangIndex.a clangRewrite.a \
            clangAST.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile