Rename headers: 'clang/GR' 'clang/EntoSA' and

update Makefile.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@122493 91177308-0d34-0410-b5e6-96231b3b80d8

93 files changed, 234 insertions, 234 deletions

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 2066563c33..6197dc72d0 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
index af30c56974..c356186622 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
index 767ae4ab75..fa64f472f7 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
index fa8ae59894..fb0e74b4b5 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
index da91f5c985..92837d2ff4 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
index 9eb8d79ce4..8c4a732aa3 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
index 8e51361e00..0d1cb4a913 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
index dadf707cf2..b4e6eeee3f 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
index 769e2b9c4d..ff35024499 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
index 78b5ad66ab..d264505b23 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
index 2fe6b18c6d..9c9637eb82 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
index 748f7123f7..09a6c2f364 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
index eee90f2b21..3ecd439d0a 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
index 975d8475bc..943be6b931 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
index 81e83399ed..7c7f707afd 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
index d4e5389f85..914b1e4fbb 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
index f70de0596b..043a24a2ef 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
index 9d4e3c4fd9..c72a4668ab 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
index 1753ac52a8..33683bac32 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
index 5c2aede815..f887e24d16 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
index a172477bd6..8e83160a20 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
index f4966e8ae8..f4966e8ae8 100644
--- a/lib/GR/Checkers/BasicObjCFoundationChecks.h
+++ b/lib/EntoSA/Checkers/BasicObjCFoundationChecks.h
diff --git a/lib/GR/Checkers/BuiltinFunctionChecker.cpp b/lib/EntoSA/Checkers/BuiltinFunctionChecker.cpp
index 697f0a4c00..1db8aac93f 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
index 2f2c7a7b5c..224a515d9a 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
index d658c2f3dd..199d6b2f5e 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
index 24fc20ef13..2fa37e3fa5 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
index 7844f51f06..41a72ef32d 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
index 236623fc4a..83393b9268 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
index d2ffd6acb4..047c83abc6 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
index 1aa0249282..391e30f61e 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
index 62c5e60005..f908e69cc7 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
index bdb03f8038..98da69231c 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
index 3a2e8c7b50..f7ab9514e9 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
index 6a36593894..e951c29d1a 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
index cecea57192..35fae40935 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
index 2119a0ca2f..24c743a8d0 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
index 2ff665c941..afd6318acc 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
index 9f3c04ae91..6ab5a4d5da 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
index f8359d1c5c..f8359d1c5c 100644
--- a/lib/GR/Checkers/ExprEngineExperimentalChecks.h
+++ b/lib/EntoSA/Checkers/ExprEngineExperimentalChecks.h
diff --git a/lib/GR/Checkers/ExprEngineInternalChecks.h b/lib/EntoSA/Checkers/ExprEngineInternalChecks.h
index f67371da0f..f67371da0f 100644
--- a/lib/GR/Checkers/ExprEngineInternalChecks.h
+++ b/lib/EntoSA/Checkers/ExprEngineInternalChecks.h
diff --git a/lib/GR/Checkers/FixedAddressChecker.cpp b/lib/EntoSA/Checkers/FixedAddressChecker.cpp
index 1d629ee55e..ea736435d6 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
index c88378279a..b901afc5e1 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
index 56bb542e92..04f652cdcb 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
index 864dd85093..e88997f79c 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
index 5934c5ffbf..c2f5f4b83c 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
index b3d213ab07..9ba4e282d2 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
index a4d317f8b0..2b0ae82ccd 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
index c93121fcd9..acad46c352 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
index ee3f901ad5..d5c395f0a1 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
index ad86ac500d..4b96ddba39 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
index 3d230ce76e..cc67c3df7a 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
index b44fae8b6c..3e901b6007 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
index 177f6a2267..a2e2475f28 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
index f40eeec52f..30009a2560 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
index 63aa90429e..923d0a86d8 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
index 517f6b15ab..56c9adb509 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
index 80316f58c1..8afe9847aa 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
index 17a2a55ebd..8e46519b21 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
index 229356ad67..c9aebadca1 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
index 32e22b0419..cb7899fbb2 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
index fc668be35c..30d0728530 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
index 8ceda3ddc5..dcdcf1f741 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
index 3d4faa2988..c0427402b1 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
index 90f7d5db41..aea78c048b 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
index 8addd4458e..5060cdff96 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
index b9d8b57794..c45659c011 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
index b52dc87c04..e3ea72e133 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
index d21ad21780..0d17238ee7 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
index 3236b92378..478e77b4af 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
index 4961704509..eecbabbb2e 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
index dd206aba00..ec66ba6028 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
index 6809c3b53c..8ded4d16b6 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
index e531cc9d99..62396230ff 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
index 72a854a85d..a0d338ae1e 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
index 3261983107..9678138695 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
index 4058c11f7c..99b7a70748 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
index f16223636f..ff0f34044e 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
index 69c660b4a4..bf8c8b0d3d 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
index ebab2b2002..6e54d494c5 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
index dd16ccc980..dd16ccc980 100644
--- a/lib/GR/README.txt
+++ b/lib/EntoSA/README.txt
diff --git a/lib/GR/RangeConstraintManager.cpp b/lib/EntoSA/RangeConstraintManager.cpp
index 5ce69bafd1..5c2d674515 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
index 0ae68cf79a..4913d1a389 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
index eec5193ef3..c4efaae906 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
index ed2bc13e49..ea23293924 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
index f0d50da299..ef26fc5d93 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
index 85d133f2f8..83db8cc9ce 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
index bcd303e8fb..ac0bfa62ef 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
index 2e9857a9a0..29b0ee1b5f 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
index 7727138b02..75e0774837 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
index 02e6c2e8d6..bf98301dc5 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 f4ace98146..89937e1762 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 ae6194beb8..e17e8b7156 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 6509fd59c6..300b9ea097 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