diff --git a/include/llvm/Analysis/CallGraph.h b/include/llvm/Analysis/CallGraph.h
index 7e8ff9e08c2..3305c8526e7 100644
--- a/include/llvm/Analysis/CallGraph.h
+++ b/include/llvm/Analysis/CallGraph.h
@@ -126,8 +126,6 @@ public:
   CallGraph() : Root(0) {}
   ~CallGraph() { destroy(); }
 
-  virtual const char *getPassName() const { return "Call Graph Construction"; }
-
   // run - Compute the call graph for the specified module.
   virtual bool run(Module &M);
 
diff --git a/include/llvm/Analysis/DataStructure.h b/include/llvm/Analysis/DataStructure.h
index d4e61db64b9..c611574eadf 100644
--- a/include/llvm/Analysis/DataStructure.h
+++ b/include/llvm/Analysis/DataStructure.h
@@ -332,10 +332,6 @@ public:
 
   ~LocalDataStructures() { releaseMemory(); }
 
-  virtual const char *getPassName() const {
-    return "Local Data Structure Analysis";
-  }
-
   virtual bool run(Module &M);
 
   // getDSGraph - Return the data structure graph for the specified function.
@@ -371,10 +367,6 @@ public:
 
   ~BUDataStructures() { releaseMemory(); }
 
-  virtual const char *getPassName() const {
-    return "Bottom-Up Data Structure Analysis Closure";
-  }
-
   virtual bool run(Module &M);
 
   // getDSGraph - Return the data structure graph for the specified function.
diff --git a/include/llvm/Analysis/Dominators.h b/include/llvm/Analysis/Dominators.h
index 9df1e656392..154b31ddd5a 100644
--- a/include/llvm/Analysis/Dominators.h
+++ b/include/llvm/Analysis/Dominators.h
@@ -98,10 +98,6 @@ struct DominatorSet : public DominatorSetBase {
 
   DominatorSet() : DominatorSetBase(false) {}
 
-  virtual const char *getPassName() const {
-    return "Dominator Set Construction";
-  }
-
   virtual bool runOnFunction(Function &F);
 
   // getAnalysisUsage - This simply provides a dominator set
@@ -121,10 +117,6 @@ struct PostDominatorSet : public DominatorSetBase {
 
   PostDominatorSet() : DominatorSetBase(true) {}
 
-  virtual const char *getPassName() const {
-    return "Post-Dominator Set Construction";
-  }
-
   virtual bool runOnFunction(Function &F);
 
   // getAnalysisUsage - This obviously provides a dominator set, but it also
@@ -176,10 +168,6 @@ struct ImmediateDominators : public ImmediateDominatorsBase {
 
   ImmediateDominators() : ImmediateDominatorsBase(false) {}
 
-  virtual const char *getPassName() const {
-    return "Immediate Dominators Construction";
-  }
-
   virtual bool runOnFunction(Function &F) {
     IDoms.clear();     // Reset from the last time we were run...
     DominatorSet &DS = getAnalysis<DominatorSet>();
@@ -205,10 +193,6 @@ struct ImmediatePostDominators : public ImmediateDominatorsBase {
 
   ImmediatePostDominators() : ImmediateDominatorsBase(true) {}
 
-  virtual const char *getPassName() const {
-    return "Immediate Post-Dominators Construction";
-  }
-
   virtual bool runOnFunction(Function &F) {
     IDoms.clear();     // Reset from the last time we were run...
     PostDominatorSet &DS = getAnalysis<PostDominatorSet>();
@@ -287,10 +271,6 @@ struct DominatorTree : public DominatorTreeBase {
 
   DominatorTree() : DominatorTreeBase(false) {}
 
-  virtual const char *getPassName() const {
-    return "Dominator Tree Construction";
-  }
-
   virtual bool runOnFunction(Function &F) {
     reset();     // Reset from the last time we were run...
     DominatorSet &DS = getAnalysis<DominatorSet>();
@@ -318,10 +298,6 @@ struct PostDominatorTree : public DominatorTreeBase {
 
   PostDominatorTree() : DominatorTreeBase(true) {}
 
-  virtual const char *getPassName() const {
-    return "Post-Dominator Tree Construction";
-  }
-
   virtual bool runOnFunction(Function &F) {
     reset();     // Reset from the last time we were run...
     PostDominatorSet &DS = getAnalysis<PostDominatorSet>();
@@ -372,10 +348,6 @@ struct DominanceFrontier : public DominanceFrontierBase {
 
   DominanceFrontier() : DominanceFrontierBase(false) {}
 
-  virtual const char *getPassName() const {
-    return "Dominance Frontier Construction";
-  }
-
   virtual bool runOnFunction(Function &) {
     Frontiers.clear();
     DominatorTree &DT = getAnalysis<DominatorTree>();
@@ -405,10 +377,6 @@ struct PostDominanceFrontier : public DominanceFrontierBase {
 
   PostDominanceFrontier() : DominanceFrontierBase(true) {}
 
-  virtual const char *getPassName() const {
-    return "Post-Dominance Frontier Construction";
-  }
-
   virtual bool runOnFunction(Function &) {
     Frontiers.clear();
     PostDominatorTree &DT = getAnalysis<PostDominatorTree>();
diff --git a/include/llvm/Analysis/FindUnsafePointerTypes.h b/include/llvm/Analysis/FindUnsafePointerTypes.h
index b4aa919b570..038d7639c3b 100644
--- a/include/llvm/Analysis/FindUnsafePointerTypes.h
+++ b/include/llvm/Analysis/FindUnsafePointerTypes.h
@@ -28,10 +28,6 @@ struct FindUnsafePointerTypes : public Pass {
 public:
   static AnalysisID ID;    // We are an analysis, we must have an ID
 
-  FindUnsafePointerTypes() {}
-
-  virtual const char *getPassName() const { return "Find Unsafe Pointer Types";}
-
   // Accessor for underlying type set...
   inline const std::set<PointerType*> &getUnsafeTypes() const {
     return UnsafeTypes;
diff --git a/include/llvm/Analysis/FindUsedTypes.h b/include/llvm/Analysis/FindUsedTypes.h
index 4e5e0512561..4888dda3935 100644
--- a/include/llvm/Analysis/FindUsedTypes.h
+++ b/include/llvm/Analysis/FindUsedTypes.h
@@ -20,13 +20,10 @@ public:
   //
   static AnalysisID ID;
 
-  FindUsedTypes() {}
-  virtual const char *getPassName() const { return "Find Used Types"; }
-
   // getTypes - After the pass has been run, return the set containing all of
   // the types used in the module.
   //
-  inline const std::set<const Type *> &getTypes() const { return UsedTypes; }
+  const std::set<const Type *> &getTypes() const { return UsedTypes; }
 
   // Print the types found in the module.  If the optional Module parameter is
   // passed in, then the types are printed symbolically if possible, using the
diff --git a/include/llvm/Analysis/IntervalPartition.h b/include/llvm/Analysis/IntervalPartition.h
index 307a70a87cd..f21083f3bb4 100644
--- a/include/llvm/Analysis/IntervalPartition.h
+++ b/include/llvm/Analysis/IntervalPartition.h
@@ -39,8 +39,6 @@ public:
 
   IntervalPartition() : RootInterval(0) {}
 
-  const char *getPassName() const { return "Interval Partition Construction"; }
-
   // run - Calculate the interval partition for this function
   virtual bool runOnFunction(Function &F);
 
diff --git a/include/llvm/Analysis/LiveVar/FunctionLiveVarInfo.h b/include/llvm/Analysis/LiveVar/FunctionLiveVarInfo.h
index 38cb3f09e3e..ac21a266333 100644
--- a/include/llvm/Analysis/LiveVar/FunctionLiveVarInfo.h
+++ b/include/llvm/Analysis/LiveVar/FunctionLiveVarInfo.h
@@ -58,8 +58,8 @@
 */
 
 
-#ifndef METH_LIVE_VAR_INFO_H
-#define METH_LIVE_VAR_INFO_H
+#ifndef FUNCTION_LIVE_VAR_INFO_H
+#define FUNCTION_LIVE_VAR_INFO_H
 
 #include "llvm/Pass.h"
 #include "llvm/Analysis/LiveVar/ValueSet.h"
@@ -91,8 +91,6 @@ class FunctionLiveVarInfo : public FunctionPass {
 public:
   static AnalysisID ID;    // We are an analysis, we must have an ID
 
-  virtual const char *getPassName() const { return "Live Variable Analysis"; }
-
   // --------- Implement the FunctionPass interface ----------------------
 
   // runOnFunction - Perform analysis, update internal data structures.
diff --git a/include/llvm/Analysis/LoopInfo.h b/include/llvm/Analysis/LoopInfo.h
index c04dcfa5d18..03eda2973a4 100644
--- a/include/llvm/Analysis/LoopInfo.h
+++ b/include/llvm/Analysis/LoopInfo.h
@@ -71,8 +71,6 @@ public:
   // LoopInfo ctor - Calculate the natural loop information for a CFG
   ~LoopInfo() { releaseMemory(); }
 
-  const char *getPassName() const { return "Natural Loop Analysis"; }
-
   const std::vector<Loop*> &getTopLevelLoops() const { return TopLevelLoops; }
 
   // getLoopFor - Return the inner most loop that BB lives in.  If a basic block
diff --git a/include/llvm/CodeGen/FunctionLiveVarInfo.h b/include/llvm/CodeGen/FunctionLiveVarInfo.h
index 38cb3f09e3e..ac21a266333 100644
--- a/include/llvm/CodeGen/FunctionLiveVarInfo.h
+++ b/include/llvm/CodeGen/FunctionLiveVarInfo.h
@@ -58,8 +58,8 @@
 */
 
 
-#ifndef METH_LIVE_VAR_INFO_H
-#define METH_LIVE_VAR_INFO_H
+#ifndef FUNCTION_LIVE_VAR_INFO_H
+#define FUNCTION_LIVE_VAR_INFO_H
 
 #include "llvm/Pass.h"
 #include "llvm/Analysis/LiveVar/ValueSet.h"
@@ -91,8 +91,6 @@ class FunctionLiveVarInfo : public FunctionPass {
 public:
   static AnalysisID ID;    // We are an analysis, we must have an ID
 
-  virtual const char *getPassName() const { return "Live Variable Analysis"; }
-
   // --------- Implement the FunctionPass interface ----------------------
 
   // runOnFunction - Perform analysis, update internal data structures.