1 files changed, 9 insertions, 9 deletions
diff --git a/lib/VMCore/Module.cpp b/lib/VMCore/Module.cpp
index 1b6e71725a..06c25d366c 100644
--- a/lib/VMCore/Module.cpp
+++ b/lib/VMCore/Module.cpp
@@ -5,7 +5,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Module.h"
-#include "llvm/Method.h"
+#include "llvm/Function.h"
 #include "llvm/GlobalVariable.h"
 #include "llvm/InstrTypes.h"
 #include "llvm/ValueHolderImpl.h"
@@ -18,7 +18,7 @@
 // for having a DefHolderImpl.h file seperate from DefHolder.h!  :(
 //
 template class ValueHolder<GlobalVariable, Module, Module>;
-template class ValueHolder<Method, Module, Module>;
+template class ValueHolder<Function, Module, Module>;
 
 // Define the GlobalValueRefMap as a struct that wraps a map so that we don't
 // have Module.h depend on <map>
@@ -29,15 +29,15 @@ struct GlobalValueRefMap : public std::map<GlobalValue*, ConstantPointerRef*>{
 
 Module::Module()
   : Value(Type::VoidTy, Value::ModuleVal, ""), SymTabValue(this),
-    GlobalList(this, this), MethodList(this, this), GVRefMap(0) {
+    GlobalList(this, this), FunctionList(this, this), GVRefMap(0) {
 }
 
 Module::~Module() {
   dropAllReferences();
   GlobalList.delete_all();
   GlobalList.setParent(0);
-  MethodList.delete_all();
-  MethodList.setParent(0);
+  FunctionList.delete_all();
+  FunctionList.setParent(0);
 }
 
 
@@ -50,8 +50,8 @@ Module::~Module() {
 // delete.
 //
 void Module::dropAllReferences() {
-  for_each(MethodList.begin(), MethodList.end(),
-	   std::mem_fun(&Method::dropAllReferences));
+  for_each(FunctionList.begin(), FunctionList.end(),
+	   std::mem_fun(&Function::dropAllReferences));
 
   for_each(GlobalList.begin(), GlobalList.end(),
 	   std::mem_fun(&GlobalVariable::dropAllReferences));
@@ -80,10 +80,10 @@ bool Module::reduceApply(bool (*Func)(GlobalVariable*)) {
 bool Module::reduceApply(bool (*Func)(const GlobalVariable*)) const {
   return reduce_apply_bool(gbegin(), gend(), Func);
 }
-bool Module::reduceApply(bool (*Func)(Method*)) {
+bool Module::reduceApply(bool (*Func)(Function*)) {
   return reduce_apply_bool(begin(), end(), Func);
 }
-bool Module::reduceApply(bool (*Func)(const Method*)) const {
+bool Module::reduceApply(bool (*Func)(const Function*)) const {
   return reduce_apply_bool(begin(), end(), Func);
 }