3 files changed, 8 insertions, 10 deletions
diff --git a/lib/Bytecode/Reader/ReaderInternals.h b/lib/Bytecode/Reader/ReaderInternals.h
index 5ce7686894..f08cedf8cf 100644
--- a/lib/Bytecode/Reader/ReaderInternals.h
+++ b/lib/Bytecode/Reader/ReaderInternals.h
@@ -43,7 +43,7 @@ struct LazyFunctionInfo {
   unsigned FunctionSlot;
 };
 
-class BytecodeParser : public AbstractModuleProvider {
+class BytecodeParser : public ModuleProvider {
   BytecodeParser(const BytecodeParser &);  // DO NOT IMPLEMENT
   void operator=(const BytecodeParser &);  // DO NOT IMPLEMENT
 public:
diff --git a/lib/Bytecode/Reader/ReaderWrappers.cpp b/lib/Bytecode/Reader/ReaderWrappers.cpp
index a936c0f72a..68f210175b 100644
--- a/lib/Bytecode/Reader/ReaderWrappers.cpp
+++ b/lib/Bytecode/Reader/ReaderWrappers.cpp
@@ -156,7 +156,7 @@ BytecodeStdinReader::BytecodeStdinReader() {
 
 /// getBytecodeBufferModuleProvider - lazy function-at-a-time loading from a
 /// buffer
-AbstractModuleProvider* 
+ModuleProvider* 
 getBytecodeBufferModuleProvider(const unsigned char *Buffer, unsigned Length,
                                 const std::string &ModuleID) {
   return new BytecodeBufferReader(Buffer, Length, ModuleID);
@@ -167,7 +167,7 @@ getBytecodeBufferModuleProvider(const unsigned char *Buffer, unsigned Length,
 Module *ParseBytecodeBuffer(const unsigned char *Buffer, unsigned Length,
                             const std::string &ModuleID, std::string *ErrorStr){
   try {
-    std::auto_ptr<AbstractModuleProvider>
+    std::auto_ptr<ModuleProvider>
       AMP(getBytecodeBufferModuleProvider(Buffer, Length, ModuleID));
     return AMP->releaseModule();
   } catch (std::string &err) {
@@ -178,8 +178,7 @@ Module *ParseBytecodeBuffer(const unsigned char *Buffer, unsigned Length,
 
 /// getBytecodeModuleProvider - lazy function-at-a-time loading from a file
 ///
-AbstractModuleProvider*
-getBytecodeModuleProvider(const std::string &Filename) {
+ModuleProvider *getBytecodeModuleProvider(const std::string &Filename) {
   if (Filename != std::string("-"))        // Read from a file...
     return new BytecodeFileReader(Filename);
   else                                     // Read from stdin
@@ -190,8 +189,7 @@ getBytecodeModuleProvider(const std::string &Filename) {
 ///
 Module *ParseBytecodeFile(const std::string &Filename, std::string *ErrorStr) {
   try {
-    std::auto_ptr<AbstractModuleProvider>
-      AMP(getBytecodeModuleProvider(Filename));
+    std::auto_ptr<ModuleProvider> AMP(getBytecodeModuleProvider(Filename));
     return AMP->releaseModule();
   } catch (std::string &err) {
     if (ErrorStr) *ErrorStr = err;
diff --git a/lib/VMCore/ModuleProvider.cpp b/lib/VMCore/ModuleProvider.cpp
index 9a3eb168d9..3a9c50528e 100644
--- a/lib/VMCore/ModuleProvider.cpp
+++ b/lib/VMCore/ModuleProvider.cpp
@@ -9,17 +9,17 @@
 
 /// ctor - always have a valid Module
 ///
-AbstractModuleProvider::AbstractModuleProvider() : TheModule(0) { }
+ModuleProvider::ModuleProvider() : TheModule(0) { }
 
 /// dtor - when we leave, we take our Module with us
 ///
-AbstractModuleProvider::~AbstractModuleProvider() {
+ModuleProvider::~ModuleProvider() {
   delete TheModule;
 }
 
 /// materializeFunction - make sure the given function is fully read.
 ///
-void AbstractModuleProvider::materializeModule() {
+void ModuleProvider::materializeModule() {
   if (!TheModule) return;
 
   for (Module::iterator i = TheModule->begin(), e = TheModule->end();