diff --git a/include/llvm/Transforms/ChangeAllocations.h b/include/llvm/Transforms/ChangeAllocations.h
index 4c36b2d4c00..46efa26077b 100644
--- a/include/llvm/Transforms/ChangeAllocations.h
+++ b/include/llvm/Transforms/ChangeAllocations.h
@@ -13,7 +13,7 @@
 #include "llvm/Transforms/Pass.h"
 class TargetData;
 
-class LowerAllocations : public ConcretePass {
+class LowerAllocations : public Pass {
   Method *MallocMeth;   // Methods in the module we are processing
   Method *FreeMeth;     // Initialized by doPassInitializationVirt
 
@@ -28,12 +28,12 @@ public:
   //
   // This function is always successful.
   //
-  bool doPassInitializationVirt(Module *M);
+  bool doPassInitialization(Module *M);
 
   // doPerMethodWork - This method does the actual work of converting
   // instructions over, assuming that the pass has already been initialized.
   //
-  bool doPerMethodWorkVirt(Method *M);
+  bool doPerMethodWork(Method *M);
 };
 
 #endif
diff --git a/include/llvm/Transforms/HoistPHIConstants.h b/include/llvm/Transforms/HoistPHIConstants.h
index d15ead91f43..931269bc0b1 100644
--- a/include/llvm/Transforms/HoistPHIConstants.h
+++ b/include/llvm/Transforms/HoistPHIConstants.h
@@ -11,10 +11,11 @@
 
 #include "llvm/Transforms/Pass.h"
 
-struct HoistPHIConstants : public StatelessPass<HoistPHIConstants> {
-  // doPerMethodWork - This method does the work.  Always successful.
-  //
-  static bool doPerMethodWork(Method *M);
+struct HoistPHIConstants : public Pass {
+  static bool doHoistPHIConstants(Method *M);
+
+
+  virtual bool doPerMethodWork(Method *M) { return doHoistPHIConstants(M); }
 };
 
 #endif
diff --git a/include/llvm/Transforms/PrintModulePass.h b/include/llvm/Transforms/PrintModulePass.h
index 0e2cee15997..98948d88440 100644
--- a/include/llvm/Transforms/PrintModulePass.h
+++ b/include/llvm/Transforms/PrintModulePass.h
@@ -11,7 +11,7 @@
 #include "llvm/Transforms/Pass.h"
 #include "llvm/Assembly/Writer.h"
 
-class PrintModulePass : public ConcretePass {
+class PrintModulePass : public Pass {
   string Banner;          // String to print before each method
   ostream *Out;           // ostream to print on
   bool DeleteStream;      // Delete the ostream in our dtor?
@@ -26,7 +26,7 @@ public:
   // doPerMethodWork - This pass just prints a banner followed by the method as
   // it's processed.
   //
-  bool doPerMethodWorkVirt(Method *M) {
+  bool doPerMethodWork(Method *M) {
     (*Out) << Banner << M;
     return false;
   }