diff --git a/llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp b/llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp
index 663d9a6b36b0..77c008730ff1 100644
--- a/llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp
+++ b/llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp
@@ -69,7 +69,7 @@ void Interpreter::runAtExitHandlers () {
 
 /// run - Start execution with the specified function and arguments.
 ///
-GenericValue Interpreter::run(Function *F,
+GenericValue Interpreter::runFunction(Function *F,
 			      const std::vector<GenericValue> &ArgValues) {
   assert (F && "Function *F was null at entry to run()");
 
@@ -91,9 +91,6 @@ GenericValue Interpreter::run(Function *F,
   // Start executing the function.
   run();
   
-  // Run any atexit handlers now!
-  runAtExitHandlers();
-
   GenericValue rv;
   rv.IntVal = ExitCode;
   return rv;
diff --git a/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h b/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
index f8bd316517cf..1f50777351f3 100644
--- a/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
+++ b/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
@@ -92,11 +92,10 @@ public:
   Interpreter(Module *M, bool isLittleEndian, bool isLongPointer);
   inline ~Interpreter() { }
 
-  /// runAtExitHandlers - Run any functions registered by the
-  /// program's calls to atexit(3), which we intercept and store in
-  /// AtExitHandlers.
+  /// runAtExitHandlers - Run any functions registered by the program's calls to
+  /// atexit(3), which we intercept and store in AtExitHandlers.
   ///
-  void runAtExitHandlers ();
+  void runAtExitHandlers();
 
   /// create - Create an interpreter ExecutionEngine. This can never fail.
   ///
@@ -104,8 +103,8 @@ public:
 
   /// run - Start execution with the specified function and arguments.
   ///
-  virtual GenericValue run(Function *F,
-			   const std::vector<GenericValue> &ArgValues);
+  virtual GenericValue runFunction(Function *F,
+                                   const std::vector<GenericValue> &ArgValues);
 
   /// recompileAndRelinkFunction - For the interpreter, functions are always
   /// up-to-date.