diff --git a/clang/lib/GR/HTMLDiagnostics.cpp b/clang/lib/GR/HTMLDiagnostics.cpp
index 0c059ffd..72a854a 100644
--- a/clang/lib/GR/HTMLDiagnostics.cpp
+++ b/clang/lib/GR/HTMLDiagnostics.cpp
@@ -26,7 +26,7 @@
 #include "llvm/Support/Path.h"
 
 using namespace clang;
-using namespace GR;
+using namespace ento;
 
 //===----------------------------------------------------------------------===//
 // Boilerplate.
@@ -78,8 +78,8 @@
 }
 
 PathDiagnosticClient*
-GR::createHTMLDiagnosticClient(const std::string& prefix,
-                                  const Preprocessor &PP) {
+ento::createHTMLDiagnosticClient(const std::string& prefix,
+                                 const Preprocessor &PP) {
   return new HTMLDiagnostics(prefix, PP);
 }