133 files changed, 285 insertions, 285 deletions

diff --git a/clang/examples/PrintFunctionNames/CMakeLists.txt b/clang/examples/PrintFunctionNames/CMakeLists.txt
index f16dd2b695b..ee451877c6c 100644
--- a/clang/examples/PrintFunctionNames/CMakeLists.txt
+++ b/clang/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/clang/examples/clang-interpreter/CMakeLists.txt b/clang/examples/clang-interpreter/CMakeLists.txt
index 8bdea4ca223..c8c3c2be2d2 100644
--- a/clang/examples/clang-interpreter/CMakeLists.txt
+++ b/clang/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/clang/examples/clang-interpreter/Makefile b/clang/examples/clang-interpreter/Makefile
index 6a690b0bf8b..86bc9ca142b 100644
--- a/clang/examples/clang-interpreter/Makefile
+++ b/clang/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/clang/examples/wpa/CMakeLists.txt b/clang/examples/wpa/CMakeLists.txt
index 94719b2993e..0100aa2b982 100644
--- a/clang/examples/wpa/CMakeLists.txt
+++ b/clang/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/clang/examples/wpa/Makefile b/clang/examples/wpa/Makefile
index f04fcb7e2d2..4fbba9d30f0 100644
--- a/clang/examples/wpa/Makefile
+++ b/clang/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/clang/include/clang/GR/AnalysisConsumer.h b/clang/include/clang/EntoSA/AnalysisConsumer.h
index 86f6c727a4b..86f6c727a4b 100644
--- a/clang/include/clang/GR/AnalysisConsumer.h
+++ b/clang/include/clang/EntoSA/AnalysisConsumer.h
diff --git a/clang/include/clang/GR/BugReporter/BugReporter.h b/clang/include/clang/EntoSA/BugReporter/BugReporter.h
index 7d2dffae75b..c879d3c94eb 100644
--- a/clang/include/clang/GR/BugReporter/BugReporter.h
+++ b/clang/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/clang/include/clang/GR/BugReporter/BugType.h b/clang/include/clang/EntoSA/BugReporter/BugType.h
index 854094977ac..1eee141964f 100644
--- a/clang/include/clang/GR/BugReporter/BugType.h
+++ b/clang/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/clang/include/clang/GR/BugReporter/PathDiagnostic.h b/clang/include/clang/EntoSA/BugReporter/PathDiagnostic.h
index 6d53c097d29..6d53c097d29 100644
--- a/clang/include/clang/GR/BugReporter/PathDiagnostic.h
+++ b/clang/include/clang/EntoSA/BugReporter/PathDiagnostic.h
diff --git a/clang/include/clang/GR/Checkers/DereferenceChecker.h b/clang/include/clang/EntoSA/Checkers/DereferenceChecker.h
index f9cce9ca9c6..f9cce9ca9c6 100644
--- a/clang/include/clang/GR/Checkers/DereferenceChecker.h
+++ b/clang/include/clang/EntoSA/Checkers/DereferenceChecker.h
diff --git a/clang/include/clang/GR/Checkers/LocalCheckers.h b/clang/include/clang/EntoSA/Checkers/LocalCheckers.h
index e0f002b6d08..e0f002b6d08 100644
--- a/clang/include/clang/GR/Checkers/LocalCheckers.h
+++ b/clang/include/clang/EntoSA/Checkers/LocalCheckers.h
diff --git a/clang/include/clang/GR/FrontendActions.h b/clang/include/clang/EntoSA/FrontendActions.h
index e3867a2a247..e3867a2a247 100644
--- a/clang/include/clang/GR/FrontendActions.h
+++ b/clang/include/clang/EntoSA/FrontendActions.h
diff --git a/clang/include/clang/GR/ManagerRegistry.h b/clang/include/clang/EntoSA/ManagerRegistry.h
index ff174c0b4aa..43657a54714 100644
--- a/clang/include/clang/GR/ManagerRegistry.h
+++ b/clang/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/clang/include/clang/GR/PathDiagnosticClients.h b/clang/include/clang/EntoSA/PathDiagnosticClients.h
index 2713e31fc0d..2713e31fc0d 100644
--- a/clang/include/clang/GR/PathDiagnosticClients.h
+++ b/clang/include/clang/EntoSA/PathDiagnosticClients.h
diff --git a/clang/include/clang/GR/PathSensitive/AnalysisManager.h b/clang/include/clang/EntoSA/PathSensitive/AnalysisManager.h
index c9deccc539c..95d954ec863 100644
--- a/clang/include/clang/GR/PathSensitive/AnalysisManager.h
+++ b/clang/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/clang/include/clang/GR/PathSensitive/BasicValueFactory.h b/clang/include/clang/EntoSA/PathSensitive/BasicValueFactory.h
index 0a692ba9d6b..061508ecbdd 100644
--- a/clang/include/clang/GR/PathSensitive/BasicValueFactory.h
+++ b/clang/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/clang/include/clang/GR/PathSensitive/BlockCounter.h b/clang/include/clang/EntoSA/PathSensitive/BlockCounter.h
index 7d0fdfb5f11..7d0fdfb5f11 100644
--- a/clang/include/clang/GR/PathSensitive/BlockCounter.h
+++ b/clang/include/clang/EntoSA/PathSensitive/BlockCounter.h
diff --git a/clang/include/clang/GR/PathSensitive/Checker.h b/clang/include/clang/EntoSA/PathSensitive/Checker.h
index 73fb37fc4ce..a536955c958 100644
--- a/clang/include/clang/GR/PathSensitive/Checker.h
+++ b/clang/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/clang/include/clang/GR/PathSensitive/CheckerHelpers.h b/clang/include/clang/EntoSA/PathSensitive/CheckerHelpers.h
index 005e0e58639..005e0e58639 100644
--- a/clang/include/clang/GR/PathSensitive/CheckerHelpers.h
+++ b/clang/include/clang/EntoSA/PathSensitive/CheckerHelpers.h
diff --git a/clang/include/clang/GR/PathSensitive/CheckerVisitor.def b/clang/include/clang/EntoSA/PathSensitive/CheckerVisitor.def
index 3ee80719856..3ee80719856 100644
--- a/clang/include/clang/GR/PathSensitive/CheckerVisitor.def
+++ b/clang/include/clang/EntoSA/PathSensitive/CheckerVisitor.def
diff --git a/clang/include/clang/GR/PathSensitive/CheckerVisitor.h b/clang/include/clang/EntoSA/PathSensitive/CheckerVisitor.h
index 18ffa9fad30..62ce943cdbc 100644
--- a/clang/include/clang/GR/PathSensitive/CheckerVisitor.h
+++ b/clang/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/clang/include/clang/GR/PathSensitive/ConstraintManager.h b/clang/include/clang/EntoSA/PathSensitive/ConstraintManager.h
index 3e73f4b225d..b9e723ca4a6 100644
--- a/clang/include/clang/GR/PathSensitive/ConstraintManager.h
+++ b/clang/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/clang/include/clang/GR/PathSensitive/CoreEngine.h b/clang/include/clang/EntoSA/PathSensitive/CoreEngine.h
index eaaff521606..45e7fdc6450 100644
--- a/clang/include/clang/GR/PathSensitive/CoreEngine.h
+++ b/clang/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/clang/include/clang/GR/PathSensitive/Environment.h b/clang/include/clang/EntoSA/PathSensitive/Environment.h
index a8861cc0c2a..1e88e1605ee 100644
--- a/clang/include/clang/GR/PathSensitive/Environment.h
+++ b/clang/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/clang/include/clang/GR/PathSensitive/ExplodedGraph.h b/clang/include/clang/EntoSA/PathSensitive/ExplodedGraph.h
index 7f8c4c60c4c..7f8c4c60c4c 100644
--- a/clang/include/clang/GR/PathSensitive/ExplodedGraph.h
+++ b/clang/include/clang/EntoSA/PathSensitive/ExplodedGraph.h
diff --git a/clang/include/clang/GR/PathSensitive/ExprEngine.h b/clang/include/clang/EntoSA/PathSensitive/ExprEngine.h
index ed06b27f305..d10e76b2027 100644
--- a/clang/include/clang/GR/PathSensitive/ExprEngine.h
+++ b/clang/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/clang/include/clang/GR/PathSensitive/ExprEngineBuilders.h b/clang/include/clang/EntoSA/PathSensitive/ExprEngineBuilders.h
index b3ccc299413..91df6121a78 100644
--- a/clang/include/clang/GR/PathSensitive/ExprEngineBuilders.h
+++ b/clang/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/clang/include/clang/GR/PathSensitive/GRState.h b/clang/include/clang/EntoSA/PathSensitive/GRState.h
index 914dadbdbd8..8e2ab072997 100644
--- a/clang/include/clang/GR/PathSensitive/GRState.h
+++ b/clang/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/clang/include/clang/GR/PathSensitive/GRStateTrait.h b/clang/include/clang/EntoSA/PathSensitive/GRStateTrait.h
index 914625a2856..914625a2856 100644
--- a/clang/include/clang/GR/PathSensitive/GRStateTrait.h
+++ b/clang/include/clang/EntoSA/PathSensitive/GRStateTrait.h
diff --git a/clang/include/clang/GR/PathSensitive/MemRegion.h b/clang/include/clang/EntoSA/PathSensitive/MemRegion.h
index 20e25cf44a6..c9c72ab33ed 100644
--- a/clang/include/clang/GR/PathSensitive/MemRegion.h
+++ b/clang/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/clang/include/clang/GR/PathSensitive/SValBuilder.h b/clang/include/clang/EntoSA/PathSensitive/SValBuilder.h
index b01f4305ef9..f4c168dc0bb 100644
--- a/clang/include/clang/GR/PathSensitive/SValBuilder.h
+++ b/clang/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/clang/include/clang/GR/PathSensitive/SVals.h b/clang/include/clang/EntoSA/PathSensitive/SVals.h
index 617b3948b75..acbf1d44138 100644
--- a/clang/include/clang/GR/PathSensitive/SVals.h
+++ b/clang/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/clang/include/clang/GR/PathSensitive/Store.h b/clang/include/clang/EntoSA/PathSensitive/Store.h
index f82959b7dad..83b113834ec 100644
--- a/clang/include/clang/GR/PathSensitive/Store.h
+++ b/clang/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/clang/include/clang/GR/PathSensitive/SubEngine.h b/clang/include/clang/EntoSA/PathSensitive/SubEngine.h
index 755dff703e8..bddd5e950f3 100644
--- a/clang/include/clang/GR/PathSensitive/SubEngine.h
+++ b/clang/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/clang/include/clang/GR/PathSensitive/SummaryManager.h b/clang/include/clang/EntoSA/PathSensitive/SummaryManager.h
index ed878515988..ed878515988 100644
--- a/clang/include/clang/GR/PathSensitive/SummaryManager.h
+++ b/clang/include/clang/EntoSA/PathSensitive/SummaryManager.h
diff --git a/clang/include/clang/GR/PathSensitive/SymbolManager.h b/clang/include/clang/EntoSA/PathSensitive/SymbolManager.h
index ad173bb4353..ad173bb4353 100644
--- a/clang/include/clang/GR/PathSensitive/SymbolManager.h
+++ b/clang/include/clang/EntoSA/PathSensitive/SymbolManager.h
diff --git a/clang/include/clang/GR/PathSensitive/TransferFuncs.h b/clang/include/clang/EntoSA/PathSensitive/TransferFuncs.h
index c73a33d160f..ac5b4a6d176 100644
--- a/clang/include/clang/GR/PathSensitive/TransferFuncs.h
+++ b/clang/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/clang/include/clang/GR/PathSensitive/WorkList.h b/clang/include/clang/EntoSA/PathSensitive/WorkList.h
index 132bcf6e0bd..6f98587235f 100644
--- a/clang/include/clang/GR/PathSensitive/WorkList.h
+++ b/clang/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/clang/lib/CMakeLists.txt b/clang/lib/CMakeLists.txt
index 2066563c33d..6197dc72d0b 100644
--- a/clang/lib/CMakeLists.txt
+++ b/clang/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/clang/lib/GR/AggExprVisitor.cpp b/clang/lib/EntoSA/AggExprVisitor.cpp
index af30c56974a..c3561866226 100644
--- a/clang/lib/GR/AggExprVisitor.cpp
+++ b/clang/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/clang/lib/GR/AnalysisManager.cpp b/clang/lib/EntoSA/AnalysisManager.cpp
index 767ae4ab75d..fa64f472f78 100644
--- a/clang/lib/GR/AnalysisManager.cpp
+++ b/clang/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/clang/lib/GR/AnalyzerStatsChecker.cpp b/clang/lib/EntoSA/AnalyzerStatsChecker.cpp
index fa8ae59894b..fb0e74b4b52 100644
--- a/clang/lib/GR/AnalyzerStatsChecker.cpp
+++ b/clang/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/clang/lib/GR/BasicConstraintManager.cpp b/clang/lib/EntoSA/BasicConstraintManager.cpp
index da91f5c9855..92837d2ff4d 100644
--- a/clang/lib/GR/BasicConstraintManager.cpp
+++ b/clang/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/clang/lib/GR/BasicStore.cpp b/clang/lib/EntoSA/BasicStore.cpp
index 9eb8d79ce4a..8c4a732aa31 100644
--- a/clang/lib/GR/BasicStore.cpp
+++ b/clang/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/clang/lib/GR/BasicValueFactory.cpp b/clang/lib/EntoSA/BasicValueFactory.cpp
index 8e51361e00c..0d1cb4a9133 100644
--- a/clang/lib/GR/BasicValueFactory.cpp
+++ b/clang/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/clang/lib/GR/BlockCounter.cpp b/clang/lib/EntoSA/BlockCounter.cpp
index dadf707cf2f..b4e6eeee3f4 100644
--- a/clang/lib/GR/BlockCounter.cpp
+++ b/clang/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/clang/lib/GR/BugReporter.cpp b/clang/lib/EntoSA/BugReporter.cpp
index 769e2b9c4d8..ff350244999 100644
--- a/clang/lib/GR/BugReporter.cpp
+++ b/clang/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/clang/lib/GR/BugReporterVisitors.cpp b/clang/lib/EntoSA/BugReporterVisitors.cpp
index 78b5ad66ab9..d264505b23f 100644
--- a/clang/lib/GR/BugReporterVisitors.cpp
+++ b/clang/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/clang/lib/GR/CFRefCount.cpp b/clang/lib/EntoSA/CFRefCount.cpp
index 2fe6b18c6d6..9c9637eb821 100644
--- a/clang/lib/GR/CFRefCount.cpp
+++ b/clang/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/clang/lib/GR/CMakeLists.txt b/clang/lib/EntoSA/CMakeLists.txt
index 748f7123f7f..09a6c2f3643 100644
--- a/clang/lib/GR/CMakeLists.txt
+++ b/clang/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/clang/lib/GR/CXXExprEngine.cpp b/clang/lib/EntoSA/CXXExprEngine.cpp
index eee90f2b211..3ecd439d0ae 100644
--- a/clang/lib/GR/CXXExprEngine.cpp
+++ b/clang/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/clang/lib/GR/Checker.cpp b/clang/lib/EntoSA/Checker.cpp
index 975d8475bcd..943be6b9313 100644
--- a/clang/lib/GR/Checker.cpp
+++ b/clang/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/clang/lib/GR/CheckerHelpers.cpp b/clang/lib/EntoSA/CheckerHelpers.cpp
index 81e83399ed2..7c7f707afd6 100644
--- a/clang/lib/GR/CheckerHelpers.cpp
+++ b/clang/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/clang/lib/GR/Checkers/AdjustedReturnValueChecker.cpp b/clang/lib/EntoSA/Checkers/AdjustedReturnValueChecker.cpp
index d4e5389f856..914b1e4fbbb 100644
--- a/clang/lib/GR/Checkers/AdjustedReturnValueChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/AnalysisConsumer.cpp b/clang/lib/EntoSA/Checkers/AnalysisConsumer.cpp
index f70de0596b7..043a24a2ef6 100644
--- a/clang/lib/GR/Checkers/AnalysisConsumer.cpp
+++ b/clang/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/clang/lib/GR/Checkers/ArrayBoundChecker.cpp b/clang/lib/EntoSA/Checkers/ArrayBoundChecker.cpp
index 9d4e3c4fd96..c72a4668ab6 100644
--- a/clang/lib/GR/Checkers/ArrayBoundChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/ArrayBoundCheckerV2.cpp b/clang/lib/EntoSA/Checkers/ArrayBoundCheckerV2.cpp
index 1753ac52a80..33683bac324 100644
--- a/clang/lib/GR/Checkers/ArrayBoundCheckerV2.cpp
+++ b/clang/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/clang/lib/GR/Checkers/AttrNonNullChecker.cpp b/clang/lib/EntoSA/Checkers/AttrNonNullChecker.cpp
index 5c2aede8159..f887e24d162 100644
--- a/clang/lib/GR/Checkers/AttrNonNullChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/BasicObjCFoundationChecks.cpp b/clang/lib/EntoSA/Checkers/BasicObjCFoundationChecks.cpp
index a172477bd69..8e83160a201 100644
--- a/clang/lib/GR/Checkers/BasicObjCFoundationChecks.cpp
+++ b/clang/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/clang/lib/GR/Checkers/BasicObjCFoundationChecks.h b/clang/lib/EntoSA/Checkers/BasicObjCFoundationChecks.h
index f4966e8ae83..f4966e8ae83 100644
--- a/clang/lib/GR/Checkers/BasicObjCFoundationChecks.h
+++ b/clang/lib/EntoSA/Checkers/BasicObjCFoundationChecks.h
diff --git a/clang/lib/GR/Checkers/BuiltinFunctionChecker.cpp b/clang/lib/EntoSA/Checkers/BuiltinFunctionChecker.cpp
index 697f0a4c000..1db8aac93f8 100644
--- a/clang/lib/GR/Checkers/BuiltinFunctionChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/CMakeLists.txt b/clang/lib/EntoSA/Checkers/CMakeLists.txt
index 2f2c7a7b5c1..224a515d9ae 100644
--- a/clang/lib/GR/Checkers/CMakeLists.txt
+++ b/clang/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/clang/lib/GR/Checkers/CStringChecker.cpp b/clang/lib/EntoSA/Checkers/CStringChecker.cpp
index d658c2f3ddd..199d6b2f5e7 100644
--- a/clang/lib/GR/Checkers/CStringChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/CallAndMessageChecker.cpp b/clang/lib/EntoSA/Checkers/CallAndMessageChecker.cpp
index 24fc20ef13a..2fa37e3fa57 100644
--- a/clang/lib/GR/Checkers/CallAndMessageChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/CastSizeChecker.cpp b/clang/lib/EntoSA/Checkers/CastSizeChecker.cpp
index 7844f51f068..41a72ef32d3 100644
--- a/clang/lib/GR/Checkers/CastSizeChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/CastToStructChecker.cpp b/clang/lib/EntoSA/Checkers/CastToStructChecker.cpp
index 236623fc4a3..83393b9268f 100644
--- a/clang/lib/GR/Checkers/CastToStructChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/CheckDeadStores.cpp b/clang/lib/EntoSA/Checkers/CheckDeadStores.cpp
index d2ffd6acb47..047c83abc64 100644
--- a/clang/lib/GR/Checkers/CheckDeadStores.cpp
+++ b/clang/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/clang/lib/GR/Checkers/CheckObjCDealloc.cpp b/clang/lib/EntoSA/Checkers/CheckObjCDealloc.cpp
index 1aa02492821..391e30f61eb 100644
--- a/clang/lib/GR/Checkers/CheckObjCDealloc.cpp
+++ b/clang/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/clang/lib/GR/Checkers/CheckObjCInstMethSignature.cpp b/clang/lib/EntoSA/Checkers/CheckObjCInstMethSignature.cpp
index 62c5e600054..f908e69cc7d 100644
--- a/clang/lib/GR/Checkers/CheckObjCInstMethSignature.cpp
+++ b/clang/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/clang/lib/GR/Checkers/CheckSecuritySyntaxOnly.cpp b/clang/lib/EntoSA/Checkers/CheckSecuritySyntaxOnly.cpp
index bdb03f8038c..98da69231c6 100644
--- a/clang/lib/GR/Checkers/CheckSecuritySyntaxOnly.cpp
+++ b/clang/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/clang/lib/GR/Checkers/CheckSizeofPointer.cpp b/clang/lib/EntoSA/Checkers/CheckSizeofPointer.cpp
index 3a2e8c7b50b..f7ab9514e9b 100644
--- a/clang/lib/GR/Checkers/CheckSizeofPointer.cpp
+++ b/clang/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/clang/lib/GR/Checkers/ChrootChecker.cpp b/clang/lib/EntoSA/Checkers/ChrootChecker.cpp
index 6a365938944..e951c29d1ae 100644
--- a/clang/lib/GR/Checkers/ChrootChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/DereferenceChecker.cpp b/clang/lib/EntoSA/Checkers/DereferenceChecker.cpp
index cecea571924..35fae40935b 100644
--- a/clang/lib/GR/Checkers/DereferenceChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/DivZeroChecker.cpp b/clang/lib/EntoSA/Checkers/DivZeroChecker.cpp
index 2119a0ca2f6..24c743a8d05 100644
--- a/clang/lib/GR/Checkers/DivZeroChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/ExprEngine.cpp b/clang/lib/EntoSA/Checkers/ExprEngine.cpp
index 2ff665c9416..afd6318acc2 100644
--- a/clang/lib/GR/Checkers/ExprEngine.cpp
+++ b/clang/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/clang/lib/GR/Checkers/ExprEngineExperimentalChecks.cpp b/clang/lib/EntoSA/Checkers/ExprEngineExperimentalChecks.cpp
index 9f3c04ae917..6ab5a4d5daf 100644
--- a/clang/lib/GR/Checkers/ExprEngineExperimentalChecks.cpp
+++ b/clang/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/clang/lib/GR/Checkers/ExprEngineExperimentalChecks.h b/clang/lib/EntoSA/Checkers/ExprEngineExperimentalChecks.h
index f8359d1c5cd..f8359d1c5cd 100644
--- a/clang/lib/GR/Checkers/ExprEngineExperimentalChecks.h
+++ b/clang/lib/EntoSA/Checkers/ExprEngineExperimentalChecks.h
diff --git a/clang/lib/GR/Checkers/ExprEngineInternalChecks.h b/clang/lib/EntoSA/Checkers/ExprEngineInternalChecks.h
index f67371da0fc..f67371da0fc 100644
--- a/clang/lib/GR/Checkers/ExprEngineInternalChecks.h
+++ b/clang/lib/EntoSA/Checkers/ExprEngineInternalChecks.h
diff --git a/clang/lib/GR/Checkers/FixedAddressChecker.cpp b/clang/lib/EntoSA/Checkers/FixedAddressChecker.cpp
index 1d629ee55e9..ea736435d6b 100644
--- a/clang/lib/GR/Checkers/FixedAddressChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/FrontendActions.cpp b/clang/lib/EntoSA/Checkers/FrontendActions.cpp
index c88378279ae..b901afc5e14 100644
--- a/clang/lib/GR/Checkers/FrontendActions.cpp
+++ b/clang/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/clang/lib/GR/Checkers/IdempotentOperationChecker.cpp b/clang/lib/EntoSA/Checkers/IdempotentOperationChecker.cpp
index 56bb542e923..04f652cdcb9 100644
--- a/clang/lib/GR/Checkers/IdempotentOperationChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/LLVMConventionsChecker.cpp b/clang/lib/EntoSA/Checkers/LLVMConventionsChecker.cpp
index 864dd850937..e88997f79ca 100644
--- a/clang/lib/GR/Checkers/LLVMConventionsChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/MacOSXAPIChecker.cpp b/clang/lib/EntoSA/Checkers/MacOSXAPIChecker.cpp
index 5934c5ffbf2..c2f5f4b83cf 100644
--- a/clang/lib/GR/Checkers/MacOSXAPIChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/Makefile b/clang/lib/EntoSA/Checkers/Makefile
index b3d213ab073..9ba4e282d2c 100644
--- a/clang/lib/GR/Checkers/Makefile
+++ b/clang/lib/EntoSA/Checkers/Makefile
@@ -12,6 +12,6 @@
 ##===----------------------------------------------------------------------===##
 
 CLANG_LEVEL := ../../..
-LIBRARYNAME := clangGRCheckers
+LIBRARYNAME := clangEntoCheckers
 
 include $(CLANG_LEVEL)/Makefile
diff --git a/clang/lib/GR/Checkers/MallocChecker.cpp b/clang/lib/EntoSA/Checkers/MallocChecker.cpp
index a4d317f8b05..2b0ae82ccd7 100644
--- a/clang/lib/GR/Checkers/MallocChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/NSAutoreleasePoolChecker.cpp b/clang/lib/EntoSA/Checkers/NSAutoreleasePoolChecker.cpp
index c93121fcd93..acad46c3528 100644
--- a/clang/lib/GR/Checkers/NSAutoreleasePoolChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/NSErrorChecker.cpp b/clang/lib/EntoSA/Checkers/NSErrorChecker.cpp
index ee3f901ad53..d5c395f0a11 100644
--- a/clang/lib/GR/Checkers/NSErrorChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/NoReturnFunctionChecker.cpp b/clang/lib/EntoSA/Checkers/NoReturnFunctionChecker.cpp
index ad86ac500d8..4b96ddba399 100644
--- a/clang/lib/GR/Checkers/NoReturnFunctionChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/OSAtomicChecker.cpp b/clang/lib/EntoSA/Checkers/OSAtomicChecker.cpp
index 3d230ce76e7..cc67c3df7a5 100644
--- a/clang/lib/GR/Checkers/OSAtomicChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/ObjCAtSyncChecker.cpp b/clang/lib/EntoSA/Checkers/ObjCAtSyncChecker.cpp
index b44fae8b6c9..3e901b60075 100644
--- a/clang/lib/GR/Checkers/ObjCAtSyncChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/ObjCUnusedIVarsChecker.cpp b/clang/lib/EntoSA/Checkers/ObjCUnusedIVarsChecker.cpp
index 177f6a22679..a2e2475f287 100644
--- a/clang/lib/GR/Checkers/ObjCUnusedIVarsChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/PointerArithChecker.cpp b/clang/lib/EntoSA/Checkers/PointerArithChecker.cpp
index f40eeec52f5..30009a25607 100644
--- a/clang/lib/GR/Checkers/PointerArithChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/PointerSubChecker.cpp b/clang/lib/EntoSA/Checkers/PointerSubChecker.cpp
index 63aa90429e9..923d0a86d8e 100644
--- a/clang/lib/GR/Checkers/PointerSubChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/PthreadLockChecker.cpp b/clang/lib/EntoSA/Checkers/PthreadLockChecker.cpp
index 517f6b15ab7..56c9adb5091 100644
--- a/clang/lib/GR/Checkers/PthreadLockChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/ReturnPointerRangeChecker.cpp b/clang/lib/EntoSA/Checkers/ReturnPointerRangeChecker.cpp
index 80316f58c10..8afe9847aaa 100644
--- a/clang/lib/GR/Checkers/ReturnPointerRangeChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/ReturnUndefChecker.cpp b/clang/lib/EntoSA/Checkers/ReturnUndefChecker.cpp
index 17a2a55ebd9..8e46519b21b 100644
--- a/clang/lib/GR/Checkers/ReturnUndefChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/StackAddrLeakChecker.cpp b/clang/lib/EntoSA/Checkers/StackAddrLeakChecker.cpp
index 229356ad679..c9aebadca12 100644
--- a/clang/lib/GR/Checkers/StackAddrLeakChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/StreamChecker.cpp b/clang/lib/EntoSA/Checkers/StreamChecker.cpp
index 32e22b04198..cb7899fbb22 100644
--- a/clang/lib/GR/Checkers/StreamChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/UndefBranchChecker.cpp b/clang/lib/EntoSA/Checkers/UndefBranchChecker.cpp
index fc668be35ca..30d07285301 100644
--- a/clang/lib/GR/Checkers/UndefBranchChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/UndefCapturedBlockVarChecker.cpp b/clang/lib/EntoSA/Checkers/UndefCapturedBlockVarChecker.cpp
index 8ceda3ddc5c..dcdcf1f7412 100644
--- a/clang/lib/GR/Checkers/UndefCapturedBlockVarChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/UndefResultChecker.cpp b/clang/lib/EntoSA/Checkers/UndefResultChecker.cpp
index 3d4faa2988e..c0427402b17 100644
--- a/clang/lib/GR/Checkers/UndefResultChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/UndefinedArraySubscriptChecker.cpp b/clang/lib/EntoSA/Checkers/UndefinedArraySubscriptChecker.cpp
index 90f7d5db419..aea78c048be 100644
--- a/clang/lib/GR/Checkers/UndefinedArraySubscriptChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/UndefinedAssignmentChecker.cpp b/clang/lib/EntoSA/Checkers/UndefinedAssignmentChecker.cpp
index 8addd4458e8..5060cdff964 100644
--- a/clang/lib/GR/Checkers/UndefinedAssignmentChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/UnixAPIChecker.cpp b/clang/lib/EntoSA/Checkers/UnixAPIChecker.cpp
index b9d8b57794a..c45659c0112 100644
--- a/clang/lib/GR/Checkers/UnixAPIChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/UnreachableCodeChecker.cpp b/clang/lib/EntoSA/Checkers/UnreachableCodeChecker.cpp
index b52dc87c04e..e3ea72e1337 100644
--- a/clang/lib/GR/Checkers/UnreachableCodeChecker.cpp
+++ b/clang/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/clang/lib/GR/Checkers/VLASizeChecker.cpp b/clang/lib/EntoSA/Checkers/VLASizeChecker.cpp
index d21ad217806..0d17238ee70 100644
--- a/clang/lib/GR/Checkers/VLASizeChecker.cpp
+++ b/clang/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/clang/lib/GR/CoreEngine.cpp b/clang/lib/EntoSA/CoreEngine.cpp
index 3236b923783..478e77b4af3 100644
--- a/clang/lib/GR/CoreEngine.cpp
+++ b/clang/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/clang/lib/GR/Environment.cpp b/clang/lib/EntoSA/Environment.cpp
index 4961704509c..eecbabbb2e3 100644
--- a/clang/lib/GR/Environment.cpp
+++ b/clang/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/clang/lib/GR/ExplodedGraph.cpp b/clang/lib/EntoSA/ExplodedGraph.cpp
index dd206aba000..ec66ba60280 100644
--- a/clang/lib/GR/ExplodedGraph.cpp
+++ b/clang/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/clang/lib/GR/FlatStore.cpp b/clang/lib/EntoSA/FlatStore.cpp
index 6809c3b53cd..8ded4d16b65 100644
--- a/clang/lib/GR/FlatStore.cpp
+++ b/clang/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/clang/lib/GR/GRState.cpp b/clang/lib/EntoSA/GRState.cpp
index e531cc9d99b..62396230ff7 100644
--- a/clang/lib/GR/GRState.cpp
+++ b/clang/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/clang/lib/GR/HTMLDiagnostics.cpp b/clang/lib/EntoSA/HTMLDiagnostics.cpp
index 72a854a85d2..a0d338ae1e6 100644
--- a/clang/lib/GR/HTMLDiagnostics.cpp
+++ b/clang/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/clang/lib/GR/Makefile b/clang/lib/EntoSA/Makefile
index 3261983107e..96781386954 100644
--- a/clang/lib/GR/Makefile
+++ b/clang/lib/EntoSA/Makefile
@@ -12,7 +12,7 @@
 ##===----------------------------------------------------------------------===##
 
 CLANG_LEVEL := ../..
-LIBRARYNAME := clangGRCore
+LIBRARYNAME := clangEntoCore
 PARALLEL_DIRS := Checkers
 
 include $(CLANG_LEVEL)/Makefile
diff --git a/clang/lib/GR/ManagerRegistry.cpp b/clang/lib/EntoSA/ManagerRegistry.cpp
index 4058c11f7c8..99b7a707481 100644
--- a/clang/lib/GR/ManagerRegistry.cpp
+++ b/clang/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/clang/lib/GR/MemRegion.cpp b/clang/lib/EntoSA/MemRegion.cpp
index f16223636f6..ff0f34044e7 100644
--- a/clang/lib/GR/MemRegion.cpp
+++ b/clang/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/clang/lib/GR/PathDiagnostic.cpp b/clang/lib/EntoSA/PathDiagnostic.cpp
index 69c660b4a4c..bf8c8b0d3d9 100644
--- a/clang/lib/GR/PathDiagnostic.cpp
+++ b/clang/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/clang/lib/GR/PlistDiagnostics.cpp b/clang/lib/EntoSA/PlistDiagnostics.cpp
index ebab2b20029..6e54d494c5d 100644
--- a/clang/lib/GR/PlistDiagnostics.cpp
+++ b/clang/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/clang/lib/GR/README.txt b/clang/lib/EntoSA/README.txt
index dd16ccc9805..dd16ccc9805 100644
--- a/clang/lib/GR/README.txt
+++ b/clang/lib/EntoSA/README.txt
diff --git a/clang/lib/GR/RangeConstraintManager.cpp b/clang/lib/EntoSA/RangeConstraintManager.cpp
index 5ce69bafd14..5c2d674515b 100644
--- a/clang/lib/GR/RangeConstraintManager.cpp
+++ b/clang/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/clang/lib/GR/RegionStore.cpp b/clang/lib/EntoSA/RegionStore.cpp
index 0ae68cf79a9..4913d1a3893 100644
--- a/clang/lib/GR/RegionStore.cpp
+++ b/clang/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/clang/lib/GR/SValBuilder.cpp b/clang/lib/EntoSA/SValBuilder.cpp
index eec5193ef3a..c4efaae9066 100644
--- a/clang/lib/GR/SValBuilder.cpp
+++ b/clang/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/clang/lib/GR/SVals.cpp b/clang/lib/EntoSA/SVals.cpp
index ed2bc13e498..ea23293924a 100644
--- a/clang/lib/GR/SVals.cpp
+++ b/clang/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/clang/lib/GR/SimpleConstraintManager.cpp b/clang/lib/EntoSA/SimpleConstraintManager.cpp
index f0d50da2991..ef26fc5d937 100644
--- a/clang/lib/GR/SimpleConstraintManager.cpp
+++ b/clang/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/clang/lib/GR/SimpleConstraintManager.h b/clang/lib/EntoSA/SimpleConstraintManager.h
index 85d133f2f8e..83db8cc9ced 100644
--- a/clang/lib/GR/SimpleConstraintManager.h
+++ b/clang/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/clang/lib/GR/SimpleSValBuilder.cpp b/clang/lib/EntoSA/SimpleSValBuilder.cpp
index bcd303e8fbd..ac0bfa62ef7 100644
--- a/clang/lib/GR/SimpleSValBuilder.cpp
+++ b/clang/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/clang/lib/GR/Store.cpp b/clang/lib/EntoSA/Store.cpp
index 2e9857a9a0c..29b0ee1b5fb 100644
--- a/clang/lib/GR/Store.cpp
+++ b/clang/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/clang/lib/GR/SymbolManager.cpp b/clang/lib/EntoSA/SymbolManager.cpp
index 7727138b021..75e0774837f 100644
--- a/clang/lib/GR/SymbolManager.cpp
+++ b/clang/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/clang/lib/GR/TextPathDiagnostics.cpp b/clang/lib/EntoSA/TextPathDiagnostics.cpp
index 02e6c2e8d60..bf98301dc51 100644
--- a/clang/lib/GR/TextPathDiagnostics.cpp
+++ b/clang/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/clang/lib/FrontendTool/CMakeLists.txt b/clang/lib/FrontendTool/CMakeLists.txt
index f4ace981464..89937e1762c 100644
--- a/clang/lib/FrontendTool/CMakeLists.txt
+++ b/clang/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/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
index ae6194beb85..e17e8b71568 100644
--- a/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
+++ b/clang/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/clang/lib/Makefile b/clang/lib/Makefile
index 6509fd59c63..300b9ea0971 100755
--- a/clang/lib/Makefile
+++ b/clang/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/clang/tools/driver/CMakeLists.txt b/clang/tools/driver/CMakeLists.txt
index 9c331a5b6dd..6e02e85e5a5 100644
--- a/clang/tools/driver/CMakeLists.txt
+++ b/clang/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/clang/tools/driver/Makefile b/clang/tools/driver/Makefile
index a98d715c2e2..e97bfeb4435 100644
--- a/clang/tools/driver/Makefile
+++ b/clang/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