diff --git a/clang/lib/GR/RangeConstraintManager.cpp b/clang/lib/GR/RangeConstraintManager.cpp
index 8f8528d..5ce69ba 100644
--- a/clang/lib/GR/RangeConstraintManager.cpp
+++ b/clang/lib/GR/RangeConstraintManager.cpp
@@ -23,7 +23,7 @@
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;
-using namespace GR;
+using namespace ento;
 
 namespace { class ConstraintRange {}; }
 static int ConstraintRangeIndex = 0;
@@ -195,7 +195,7 @@
 typedef llvm::ImmutableMap<SymbolRef,RangeSet> ConstraintRangeTy;
 
 namespace clang {
-namespace GR {
+namespace ento {
 template<>
 struct GRStateTrait<ConstraintRange>
   : public GRStatePartialTrait<ConstraintRangeTy> {
@@ -254,7 +254,7 @@
 
 } // end anonymous namespace
 
-ConstraintManager* GR::CreateRangeConstraintManager(GRStateManager&,
+ConstraintManager* ento::CreateRangeConstraintManager(GRStateManager&,
                                                     SubEngine &subeng) {
   return new RangeConstraintManager(subeng);
 }