diff --git a/examples/PrintFunctionNames/CMakeLists.txt b/examples/PrintFunctionNames/CMakeLists.txt
index f8d7375906abd3f3b355cf3ab2d8735d5bd0df91..ae5444207db56f4662b22b3f37a40f983b0dc80f 100644
--- a/examples/PrintFunctionNames/CMakeLists.txt
+++ b/examples/PrintFunctionNames/CMakeLists.txt
@@ -10,7 +10,7 @@ set( LLVM_USED_LIBS
   clangCodeGen
   clangParse
   clangSema
-  clangChecker
+  clangGRCore
   clangAnalysis
   clangIndex
   clangRewrite
diff --git a/examples/clang-interpreter/CMakeLists.txt b/examples/clang-interpreter/CMakeLists.txt
index 73f28bb7a2e7c7a3617ea5b5336848a30c1ba717..65786db18ef85fceefd91381861624f659a38cdd 100644
--- a/examples/clang-interpreter/CMakeLists.txt
+++ b/examples/clang-interpreter/CMakeLists.txt
@@ -6,7 +6,7 @@ set(LLVM_USED_LIBS
     clangDriver
     clangCodeGen
     clangSema
-    clangChecker
+    clangGRCore
     clangIndex
     clangAnalysis
     clangRewrite
diff --git a/examples/clang-interpreter/Makefile b/examples/clang-interpreter/Makefile
index 2f5e017af803cbb7976b46d62b29dfbff7ed88f8..9b7662461e732da1ed91a878936581684fae14d9 100644
--- a/examples/clang-interpreter/Makefile
+++ b/examples/clang-interpreter/Makefile
@@ -18,7 +18,7 @@ TOOL_NO_EXPORTS = 1
 LINK_COMPONENTS := jit interpreter nativecodegen bitreader bitwriter ipo \
 	selectiondag asmparser
 USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a clangCodeGen.a \
-           clangSema.a clangChecker.a clangAnalysis.a clangRewrite.a \
+           clangSema.a clangGRCore.a clangAnalysis.a clangRewrite.a \
            clangAST.a clangParse.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
diff --git a/examples/wpa/CMakeLists.txt b/examples/wpa/CMakeLists.txt
index 13e4298c1f2ec6f5fa5a701809e3727071260f37..9dbc04473d8caf75e75a4b19583634c7e1110255 100644
--- a/examples/wpa/CMakeLists.txt
+++ b/examples/wpa/CMakeLists.txt
@@ -7,7 +7,7 @@ set(LLVM_USED_LIBS
   clangSema
   clangAnalysis
   clangSerialization
-  clangChecker
+  clangGRCore
   clangRewrite
   clangAST
   clangParse
diff --git a/examples/wpa/Makefile b/examples/wpa/Makefile
index 0a70ea6359c81064d8e49b2b75709acd1142d4e8..9e875f31f5414b3023787a169e08c24150c04d85 100644
--- a/examples/wpa/Makefile
+++ b/examples/wpa/Makefile
@@ -16,7 +16,7 @@ NO_INSTALL = 1
 TOOL_NO_EXPORTS = 1
 
 LINK_COMPONENTS := asmparser bitreader mc core
-USEDLIBS = clangChecker.a clangIndex.a clangFrontend.a clangDriver.a \
+USEDLIBS = clangGRCore.a clangIndex.a clangFrontend.a clangDriver.a \
 	   clangSema.a clangAnalysis.a clangSerialization.a \
            clangAST.a clangParse.a clangLex.a clangBasic.a
 
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index bd5e342e028f450d3d4a335af8f2af5c9e0db25f..9cd734747652b7546fdfd69bfe1ce7db340fb00e 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -12,4 +12,4 @@ add_subdirectory(Serialization)
 add_subdirectory(Frontend)
 add_subdirectory(FrontendTool)
 add_subdirectory(Index)
-add_subdirectory(Checker)
+add_subdirectory(GR)
diff --git a/lib/FrontendTool/CMakeLists.txt b/lib/FrontendTool/CMakeLists.txt
index 09d9e3419dc27f3639efa9a1098177c834cdd5ac..cfd5fbda08d69683f452d329d0fa2f4199aae3b7 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 
-    clangChecker)
+    clangGRCore)
 
 add_clang_library(clangFrontendTool
   ExecuteCompilerInvocation.cpp
diff --git a/lib/Checker/AdjustedReturnValueChecker.cpp b/lib/GR/AdjustedReturnValueChecker.cpp
similarity index 100%
rename from lib/Checker/AdjustedReturnValueChecker.cpp
rename to lib/GR/AdjustedReturnValueChecker.cpp
diff --git a/lib/Checker/AggExprVisitor.cpp b/lib/GR/AggExprVisitor.cpp
similarity index 100%
rename from lib/Checker/AggExprVisitor.cpp
rename to lib/GR/AggExprVisitor.cpp
diff --git a/lib/Checker/AnalysisConsumer.cpp b/lib/GR/AnalysisConsumer.cpp
similarity index 100%
rename from lib/Checker/AnalysisConsumer.cpp
rename to lib/GR/AnalysisConsumer.cpp
diff --git a/lib/Checker/AnalysisManager.cpp b/lib/GR/AnalysisManager.cpp
similarity index 100%
rename from lib/Checker/AnalysisManager.cpp
rename to lib/GR/AnalysisManager.cpp
diff --git a/lib/Checker/AnalyzerStatsChecker.cpp b/lib/GR/AnalyzerStatsChecker.cpp
similarity index 100%
rename from lib/Checker/AnalyzerStatsChecker.cpp
rename to lib/GR/AnalyzerStatsChecker.cpp
diff --git a/lib/Checker/ArrayBoundChecker.cpp b/lib/GR/ArrayBoundChecker.cpp
similarity index 100%
rename from lib/Checker/ArrayBoundChecker.cpp
rename to lib/GR/ArrayBoundChecker.cpp
diff --git a/lib/Checker/AttrNonNullChecker.cpp b/lib/GR/AttrNonNullChecker.cpp
similarity index 100%
rename from lib/Checker/AttrNonNullChecker.cpp
rename to lib/GR/AttrNonNullChecker.cpp
diff --git a/lib/Checker/BasicConstraintManager.cpp b/lib/GR/BasicConstraintManager.cpp
similarity index 100%
rename from lib/Checker/BasicConstraintManager.cpp
rename to lib/GR/BasicConstraintManager.cpp
diff --git a/lib/Checker/BasicObjCFoundationChecks.cpp b/lib/GR/BasicObjCFoundationChecks.cpp
similarity index 100%
rename from lib/Checker/BasicObjCFoundationChecks.cpp
rename to lib/GR/BasicObjCFoundationChecks.cpp
diff --git a/lib/Checker/BasicObjCFoundationChecks.h b/lib/GR/BasicObjCFoundationChecks.h
similarity index 100%
rename from lib/Checker/BasicObjCFoundationChecks.h
rename to lib/GR/BasicObjCFoundationChecks.h
diff --git a/lib/Checker/BasicStore.cpp b/lib/GR/BasicStore.cpp
similarity index 100%
rename from lib/Checker/BasicStore.cpp
rename to lib/GR/BasicStore.cpp
diff --git a/lib/Checker/BasicValueFactory.cpp b/lib/GR/BasicValueFactory.cpp
similarity index 100%
rename from lib/Checker/BasicValueFactory.cpp
rename to lib/GR/BasicValueFactory.cpp
diff --git a/lib/Checker/BugReporter.cpp b/lib/GR/BugReporter.cpp
similarity index 100%
rename from lib/Checker/BugReporter.cpp
rename to lib/GR/BugReporter.cpp
diff --git a/lib/Checker/BugReporterVisitors.cpp b/lib/GR/BugReporterVisitors.cpp
similarity index 100%
rename from lib/Checker/BugReporterVisitors.cpp
rename to lib/GR/BugReporterVisitors.cpp
diff --git a/lib/Checker/BuiltinFunctionChecker.cpp b/lib/GR/BuiltinFunctionChecker.cpp
similarity index 100%
rename from lib/Checker/BuiltinFunctionChecker.cpp
rename to lib/GR/BuiltinFunctionChecker.cpp
diff --git a/lib/Checker/CFRefCount.cpp b/lib/GR/CFRefCount.cpp
similarity index 100%
rename from lib/Checker/CFRefCount.cpp
rename to lib/GR/CFRefCount.cpp
diff --git a/lib/Checker/CMakeLists.txt b/lib/GR/CMakeLists.txt
similarity index 94%
rename from lib/Checker/CMakeLists.txt
rename to lib/GR/CMakeLists.txt
index c6b4550b7376b1b73e6903879c83bfa650641c0f..ed59398d991515ebb16bd252d96872c9e76776f1 100644
--- a/lib/Checker/CMakeLists.txt
+++ b/lib/GR/CMakeLists.txt
@@ -2,7 +2,7 @@ set(LLVM_NO_RTTI 1)
 
 set(LLVM_USED_LIBS clangBasic clangLex clangAST clangFrontend clangRewrite)
 
-add_clang_library(clangChecker
+add_clang_library(clangGRCore
   AdjustedReturnValueChecker.cpp
   AggExprVisitor.cpp
   AnalysisConsumer.cpp
@@ -84,5 +84,5 @@ add_clang_library(clangChecker
   VLASizeChecker.cpp
   )
 
-add_dependencies(clangChecker ClangAttrClasses ClangAttrList ClangDeclNodes
+add_dependencies(clangGRCore ClangAttrClasses ClangAttrList ClangDeclNodes
                  ClangStmtNodes)
diff --git a/lib/Checker/CStringChecker.cpp b/lib/GR/CStringChecker.cpp
similarity index 100%
rename from lib/Checker/CStringChecker.cpp
rename to lib/GR/CStringChecker.cpp
diff --git a/lib/Checker/CallAndMessageChecker.cpp b/lib/GR/CallAndMessageChecker.cpp
similarity index 100%
rename from lib/Checker/CallAndMessageChecker.cpp
rename to lib/GR/CallAndMessageChecker.cpp
diff --git a/lib/Checker/CastSizeChecker.cpp b/lib/GR/CastSizeChecker.cpp
similarity index 100%
rename from lib/Checker/CastSizeChecker.cpp
rename to lib/GR/CastSizeChecker.cpp
diff --git a/lib/Checker/CastToStructChecker.cpp b/lib/GR/CastToStructChecker.cpp
similarity index 100%
rename from lib/Checker/CastToStructChecker.cpp
rename to lib/GR/CastToStructChecker.cpp
diff --git a/lib/Checker/CheckDeadStores.cpp b/lib/GR/CheckDeadStores.cpp
similarity index 100%
rename from lib/Checker/CheckDeadStores.cpp
rename to lib/GR/CheckDeadStores.cpp
diff --git a/lib/Checker/CheckObjCDealloc.cpp b/lib/GR/CheckObjCDealloc.cpp
similarity index 100%
rename from lib/Checker/CheckObjCDealloc.cpp
rename to lib/GR/CheckObjCDealloc.cpp
diff --git a/lib/Checker/CheckObjCInstMethSignature.cpp b/lib/GR/CheckObjCInstMethSignature.cpp
similarity index 100%
rename from lib/Checker/CheckObjCInstMethSignature.cpp
rename to lib/GR/CheckObjCInstMethSignature.cpp
diff --git a/lib/Checker/CheckSecuritySyntaxOnly.cpp b/lib/GR/CheckSecuritySyntaxOnly.cpp
similarity index 100%
rename from lib/Checker/CheckSecuritySyntaxOnly.cpp
rename to lib/GR/CheckSecuritySyntaxOnly.cpp
diff --git a/lib/Checker/CheckSizeofPointer.cpp b/lib/GR/CheckSizeofPointer.cpp
similarity index 100%
rename from lib/Checker/CheckSizeofPointer.cpp
rename to lib/GR/CheckSizeofPointer.cpp
diff --git a/lib/Checker/Checker.cpp b/lib/GR/Checker.cpp
similarity index 100%
rename from lib/Checker/Checker.cpp
rename to lib/GR/Checker.cpp
diff --git a/lib/Checker/CheckerHelpers.cpp b/lib/GR/CheckerHelpers.cpp
similarity index 100%
rename from lib/Checker/CheckerHelpers.cpp
rename to lib/GR/CheckerHelpers.cpp
diff --git a/lib/Checker/ChrootChecker.cpp b/lib/GR/ChrootChecker.cpp
similarity index 100%
rename from lib/Checker/ChrootChecker.cpp
rename to lib/GR/ChrootChecker.cpp
diff --git a/lib/Checker/DereferenceChecker.cpp b/lib/GR/DereferenceChecker.cpp
similarity index 100%
rename from lib/Checker/DereferenceChecker.cpp
rename to lib/GR/DereferenceChecker.cpp
diff --git a/lib/Checker/DivZeroChecker.cpp b/lib/GR/DivZeroChecker.cpp
similarity index 100%
rename from lib/Checker/DivZeroChecker.cpp
rename to lib/GR/DivZeroChecker.cpp
diff --git a/lib/Checker/Environment.cpp b/lib/GR/Environment.cpp
similarity index 100%
rename from lib/Checker/Environment.cpp
rename to lib/GR/Environment.cpp
diff --git a/lib/Checker/ExplodedGraph.cpp b/lib/GR/ExplodedGraph.cpp
similarity index 100%
rename from lib/Checker/ExplodedGraph.cpp
rename to lib/GR/ExplodedGraph.cpp
diff --git a/lib/Checker/FixedAddressChecker.cpp b/lib/GR/FixedAddressChecker.cpp
similarity index 100%
rename from lib/Checker/FixedAddressChecker.cpp
rename to lib/GR/FixedAddressChecker.cpp
diff --git a/lib/Checker/FlatStore.cpp b/lib/GR/FlatStore.cpp
similarity index 100%
rename from lib/Checker/FlatStore.cpp
rename to lib/GR/FlatStore.cpp
diff --git a/lib/Checker/FrontendActions.cpp b/lib/GR/FrontendActions.cpp
similarity index 100%
rename from lib/Checker/FrontendActions.cpp
rename to lib/GR/FrontendActions.cpp
diff --git a/lib/Checker/GRBlockCounter.cpp b/lib/GR/GRBlockCounter.cpp
similarity index 100%
rename from lib/Checker/GRBlockCounter.cpp
rename to lib/GR/GRBlockCounter.cpp
diff --git a/lib/Checker/GRCXXExprEngine.cpp b/lib/GR/GRCXXExprEngine.cpp
similarity index 100%
rename from lib/Checker/GRCXXExprEngine.cpp
rename to lib/GR/GRCXXExprEngine.cpp
diff --git a/lib/Checker/GRCoreEngine.cpp b/lib/GR/GRCoreEngine.cpp
similarity index 100%
rename from lib/Checker/GRCoreEngine.cpp
rename to lib/GR/GRCoreEngine.cpp
diff --git a/lib/Checker/GRExprEngine.cpp b/lib/GR/GRExprEngine.cpp
similarity index 100%
rename from lib/Checker/GRExprEngine.cpp
rename to lib/GR/GRExprEngine.cpp
diff --git a/lib/Checker/GRExprEngineExperimentalChecks.cpp b/lib/GR/GRExprEngineExperimentalChecks.cpp
similarity index 100%
rename from lib/Checker/GRExprEngineExperimentalChecks.cpp
rename to lib/GR/GRExprEngineExperimentalChecks.cpp
diff --git a/lib/Checker/GRExprEngineExperimentalChecks.h b/lib/GR/GRExprEngineExperimentalChecks.h
similarity index 100%
rename from lib/Checker/GRExprEngineExperimentalChecks.h
rename to lib/GR/GRExprEngineExperimentalChecks.h
diff --git a/lib/Checker/GRExprEngineInternalChecks.h b/lib/GR/GRExprEngineInternalChecks.h
similarity index 100%
rename from lib/Checker/GRExprEngineInternalChecks.h
rename to lib/GR/GRExprEngineInternalChecks.h
diff --git a/lib/Checker/GRState.cpp b/lib/GR/GRState.cpp
similarity index 100%
rename from lib/Checker/GRState.cpp
rename to lib/GR/GRState.cpp
diff --git a/lib/Checker/HTMLDiagnostics.cpp b/lib/GR/HTMLDiagnostics.cpp
similarity index 100%
rename from lib/Checker/HTMLDiagnostics.cpp
rename to lib/GR/HTMLDiagnostics.cpp
diff --git a/lib/Checker/IdempotentOperationChecker.cpp b/lib/GR/IdempotentOperationChecker.cpp
similarity index 100%
rename from lib/Checker/IdempotentOperationChecker.cpp
rename to lib/GR/IdempotentOperationChecker.cpp
diff --git a/lib/Checker/LLVMConventionsChecker.cpp b/lib/GR/LLVMConventionsChecker.cpp
similarity index 100%
rename from lib/Checker/LLVMConventionsChecker.cpp
rename to lib/GR/LLVMConventionsChecker.cpp
diff --git a/lib/Checker/MacOSXAPIChecker.cpp b/lib/GR/MacOSXAPIChecker.cpp
similarity index 100%
rename from lib/Checker/MacOSXAPIChecker.cpp
rename to lib/GR/MacOSXAPIChecker.cpp
diff --git a/lib/Checker/Makefile b/lib/GR/Makefile
similarity index 95%
rename from lib/Checker/Makefile
rename to lib/GR/Makefile
index 4ec6f65a0bb1139cb8d07bc084cee2abe0ee71b6..71066effe4b18e6db64538bba49ac43f4931456b 100644
--- a/lib/Checker/Makefile
+++ b/lib/GR/Makefile
@@ -12,7 +12,7 @@
 ##===----------------------------------------------------------------------===##
 
 CLANG_LEVEL := ../..
-LIBRARYNAME := clangChecker
+LIBRARYNAME := clangGRCore
 
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/lib/Checker/MallocChecker.cpp b/lib/GR/MallocChecker.cpp
similarity index 100%
rename from lib/Checker/MallocChecker.cpp
rename to lib/GR/MallocChecker.cpp
diff --git a/lib/Checker/ManagerRegistry.cpp b/lib/GR/ManagerRegistry.cpp
similarity index 100%
rename from lib/Checker/ManagerRegistry.cpp
rename to lib/GR/ManagerRegistry.cpp
diff --git a/lib/Checker/MemRegion.cpp b/lib/GR/MemRegion.cpp
similarity index 100%
rename from lib/Checker/MemRegion.cpp
rename to lib/GR/MemRegion.cpp
diff --git a/lib/Checker/NSAutoreleasePoolChecker.cpp b/lib/GR/NSAutoreleasePoolChecker.cpp
similarity index 100%
rename from lib/Checker/NSAutoreleasePoolChecker.cpp
rename to lib/GR/NSAutoreleasePoolChecker.cpp
diff --git a/lib/Checker/NSErrorChecker.cpp b/lib/GR/NSErrorChecker.cpp
similarity index 100%
rename from lib/Checker/NSErrorChecker.cpp
rename to lib/GR/NSErrorChecker.cpp
diff --git a/lib/Checker/NoReturnFunctionChecker.cpp b/lib/GR/NoReturnFunctionChecker.cpp
similarity index 100%
rename from lib/Checker/NoReturnFunctionChecker.cpp
rename to lib/GR/NoReturnFunctionChecker.cpp
diff --git a/lib/Checker/OSAtomicChecker.cpp b/lib/GR/OSAtomicChecker.cpp
similarity index 100%
rename from lib/Checker/OSAtomicChecker.cpp
rename to lib/GR/OSAtomicChecker.cpp
diff --git a/lib/Checker/ObjCAtSyncChecker.cpp b/lib/GR/ObjCAtSyncChecker.cpp
similarity index 100%
rename from lib/Checker/ObjCAtSyncChecker.cpp
rename to lib/GR/ObjCAtSyncChecker.cpp
diff --git a/lib/Checker/ObjCUnusedIVarsChecker.cpp b/lib/GR/ObjCUnusedIVarsChecker.cpp
similarity index 100%
rename from lib/Checker/ObjCUnusedIVarsChecker.cpp
rename to lib/GR/ObjCUnusedIVarsChecker.cpp
diff --git a/lib/Checker/PathDiagnostic.cpp b/lib/GR/PathDiagnostic.cpp
similarity index 100%
rename from lib/Checker/PathDiagnostic.cpp
rename to lib/GR/PathDiagnostic.cpp
diff --git a/lib/Checker/PlistDiagnostics.cpp b/lib/GR/PlistDiagnostics.cpp
similarity index 100%
rename from lib/Checker/PlistDiagnostics.cpp
rename to lib/GR/PlistDiagnostics.cpp
diff --git a/lib/Checker/PointerArithChecker.cpp b/lib/GR/PointerArithChecker.cpp
similarity index 100%
rename from lib/Checker/PointerArithChecker.cpp
rename to lib/GR/PointerArithChecker.cpp
diff --git a/lib/Checker/PointerSubChecker.cpp b/lib/GR/PointerSubChecker.cpp
similarity index 100%
rename from lib/Checker/PointerSubChecker.cpp
rename to lib/GR/PointerSubChecker.cpp
diff --git a/lib/Checker/PthreadLockChecker.cpp b/lib/GR/PthreadLockChecker.cpp
similarity index 100%
rename from lib/Checker/PthreadLockChecker.cpp
rename to lib/GR/PthreadLockChecker.cpp
diff --git a/lib/Checker/README.txt b/lib/GR/README.txt
similarity index 100%
rename from lib/Checker/README.txt
rename to lib/GR/README.txt
diff --git a/lib/Checker/RangeConstraintManager.cpp b/lib/GR/RangeConstraintManager.cpp
similarity index 100%
rename from lib/Checker/RangeConstraintManager.cpp
rename to lib/GR/RangeConstraintManager.cpp
diff --git a/lib/Checker/RegionStore.cpp b/lib/GR/RegionStore.cpp
similarity index 100%
rename from lib/Checker/RegionStore.cpp
rename to lib/GR/RegionStore.cpp
diff --git a/lib/Checker/ReturnPointerRangeChecker.cpp b/lib/GR/ReturnPointerRangeChecker.cpp
similarity index 100%
rename from lib/Checker/ReturnPointerRangeChecker.cpp
rename to lib/GR/ReturnPointerRangeChecker.cpp
diff --git a/lib/Checker/ReturnUndefChecker.cpp b/lib/GR/ReturnUndefChecker.cpp
similarity index 100%
rename from lib/Checker/ReturnUndefChecker.cpp
rename to lib/GR/ReturnUndefChecker.cpp
diff --git a/lib/Checker/SValBuilder.cpp b/lib/GR/SValBuilder.cpp
similarity index 100%
rename from lib/Checker/SValBuilder.cpp
rename to lib/GR/SValBuilder.cpp
diff --git a/lib/Checker/SVals.cpp b/lib/GR/SVals.cpp
similarity index 100%
rename from lib/Checker/SVals.cpp
rename to lib/GR/SVals.cpp
diff --git a/lib/Checker/SimpleConstraintManager.cpp b/lib/GR/SimpleConstraintManager.cpp
similarity index 100%
rename from lib/Checker/SimpleConstraintManager.cpp
rename to lib/GR/SimpleConstraintManager.cpp
diff --git a/lib/Checker/SimpleConstraintManager.h b/lib/GR/SimpleConstraintManager.h
similarity index 100%
rename from lib/Checker/SimpleConstraintManager.h
rename to lib/GR/SimpleConstraintManager.h
diff --git a/lib/Checker/SimpleSValBuilder.cpp b/lib/GR/SimpleSValBuilder.cpp
similarity index 100%
rename from lib/Checker/SimpleSValBuilder.cpp
rename to lib/GR/SimpleSValBuilder.cpp
diff --git a/lib/Checker/StackAddrLeakChecker.cpp b/lib/GR/StackAddrLeakChecker.cpp
similarity index 100%
rename from lib/Checker/StackAddrLeakChecker.cpp
rename to lib/GR/StackAddrLeakChecker.cpp
diff --git a/lib/Checker/Store.cpp b/lib/GR/Store.cpp
similarity index 100%
rename from lib/Checker/Store.cpp
rename to lib/GR/Store.cpp
diff --git a/lib/Checker/StreamChecker.cpp b/lib/GR/StreamChecker.cpp
similarity index 100%
rename from lib/Checker/StreamChecker.cpp
rename to lib/GR/StreamChecker.cpp
diff --git a/lib/Checker/SymbolManager.cpp b/lib/GR/SymbolManager.cpp
similarity index 100%
rename from lib/Checker/SymbolManager.cpp
rename to lib/GR/SymbolManager.cpp
diff --git a/lib/Checker/TextPathDiagnostics.cpp b/lib/GR/TextPathDiagnostics.cpp
similarity index 100%
rename from lib/Checker/TextPathDiagnostics.cpp
rename to lib/GR/TextPathDiagnostics.cpp
diff --git a/lib/Checker/UndefBranchChecker.cpp b/lib/GR/UndefBranchChecker.cpp
similarity index 100%
rename from lib/Checker/UndefBranchChecker.cpp
rename to lib/GR/UndefBranchChecker.cpp
diff --git a/lib/Checker/UndefCapturedBlockVarChecker.cpp b/lib/GR/UndefCapturedBlockVarChecker.cpp
similarity index 100%
rename from lib/Checker/UndefCapturedBlockVarChecker.cpp
rename to lib/GR/UndefCapturedBlockVarChecker.cpp
diff --git a/lib/Checker/UndefResultChecker.cpp b/lib/GR/UndefResultChecker.cpp
similarity index 100%
rename from lib/Checker/UndefResultChecker.cpp
rename to lib/GR/UndefResultChecker.cpp
diff --git a/lib/Checker/UndefinedArraySubscriptChecker.cpp b/lib/GR/UndefinedArraySubscriptChecker.cpp
similarity index 100%
rename from lib/Checker/UndefinedArraySubscriptChecker.cpp
rename to lib/GR/UndefinedArraySubscriptChecker.cpp
diff --git a/lib/Checker/UndefinedAssignmentChecker.cpp b/lib/GR/UndefinedAssignmentChecker.cpp
similarity index 100%
rename from lib/Checker/UndefinedAssignmentChecker.cpp
rename to lib/GR/UndefinedAssignmentChecker.cpp
diff --git a/lib/Checker/UnixAPIChecker.cpp b/lib/GR/UnixAPIChecker.cpp
similarity index 100%
rename from lib/Checker/UnixAPIChecker.cpp
rename to lib/GR/UnixAPIChecker.cpp
diff --git a/lib/Checker/UnreachableCodeChecker.cpp b/lib/GR/UnreachableCodeChecker.cpp
similarity index 100%
rename from lib/Checker/UnreachableCodeChecker.cpp
rename to lib/GR/UnreachableCodeChecker.cpp
diff --git a/lib/Checker/VLASizeChecker.cpp b/lib/GR/VLASizeChecker.cpp
similarity index 100%
rename from lib/Checker/VLASizeChecker.cpp
rename to lib/GR/VLASizeChecker.cpp
diff --git a/lib/Makefile b/lib/Makefile
index dbd0eb699ee1a1fc5b46f260d77fa9a45cba2f71..6509fd59c63e45cee4aa224cfce681fef6974e85 100755
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -9,7 +9,7 @@
 CLANG_LEVEL := ..
 
 PARALLEL_DIRS = Headers Basic Lex Parse AST Sema CodeGen Analysis \
-                Checker Rewrite Serialization Frontend FrontendTool Index Driver
+                GR Rewrite Serialization Frontend FrontendTool Index Driver
 
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index b5c7b148863a11364d5d5e380d5c661899bb1636..66dd512b446100da8fe79035134fdd7964a59f99 100644
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -8,7 +8,7 @@ set( LLVM_USED_LIBS
   clangCodeGen
   clangParse
   clangSema
-  clangChecker
+  clangGRCore
   clangAnalysis
   clangIndex
   clangRewrite
diff --git a/tools/driver/Makefile b/tools/driver/Makefile
index 585a918f4a78fe03ec8792e9b8a92669e77ea491..834e238b71b28da9e3bb51d62be76210448ed4ed 100644
--- a/tools/driver/Makefile
+++ b/tools/driver/Makefile
@@ -39,7 +39,7 @@ LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter codegen \
                    ipo selectiondag
 USEDLIBS = clangFrontendTool.a clangFrontend.a clangDriver.a \
            clangSerialization.a clangCodeGen.a clangParse.a clangSema.a \
-           clangChecker.a clangAnalysis.a clangIndex.a clangRewrite.a \
+           clangGRCore.a clangAnalysis.a clangIndex.a clangRewrite.a \
            clangAST.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile