diff --git a/llvm/tools/analyze/analyze.cpp b/llvm/tools/analyze/analyze.cpp
index e347b4331b97..cd35a108d5fc 100644
--- a/llvm/tools/analyze/analyze.cpp
+++ b/llvm/tools/analyze/analyze.cpp
@@ -134,11 +134,11 @@ Pass *createPrintModulePass(const string &Message) {
   return new PrintModulePass(&std::cout);
 }
 
-struct InstForest : public FunctionPass {
+struct InstForestHelper : public FunctionPass {
   const char *getPassName() const { return "InstForest Printer"; }
 
   void doit(Function *F) {
-    std::cout << analysis::InstForest<char>(F);
+    std::cout << InstForest<char>(F);
   }
 
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -271,7 +271,7 @@ struct {
   { print             , createPrintFunctionPass                 },
   { intervals         , New<FunctionPass, IntervalPartition>    },
   { loops             , New<FunctionPass, LoopInfo>             },
-  { instforest        , Create<PrinterPass<InstForest> >        },
+  { instforest        , Create<PrinterPass<InstForestHelper> >  },
   { indvars           , Create<PrinterPass<IndVars> >           },
   { exprs             , Create<PrinterPass<Exprs> >             },