2 files changed, 14 insertions, 15 deletions

diff --git a/llvm/lib/VMCore/ConstPoolVals.cpp b/llvm/lib/VMCore/ConstPoolVals.cpp
index 3b543cbcbe5..e8d4f679fa4 100644
--- a/llvm/lib/VMCore/ConstPoolVals.cpp
+++ b/llvm/lib/VMCore/ConstPoolVals.cpp
@@ -134,7 +134,7 @@ ConstPoolStruct::ConstPoolStruct(const StructType *T,
   }
 }
 
-ConstPoolPointerReference::ConstPoolPointerReference(GlobalValue *GV)
+ConstPoolPointerRef::ConstPoolPointerRef(GlobalValue *GV)
   : ConstPoolPointer(GV->getType()) {
   Operands.push_back(Use(GV, this));
 }
@@ -224,7 +224,7 @@ string ConstPoolPointerNull::getStrValue() const {
   return "null";
 }
 
-string ConstPoolPointerReference::getStrValue() const {
+string ConstPoolPointerRef::getStrValue() const {
   const GlobalValue *V = getValue();
   if (V->hasName()) return "%" + V->getName();
 
@@ -482,17 +482,17 @@ ConstPoolPointerNull *ConstPoolPointerNull::get(const PointerType *Ty) {
   return Result;
 }
 
-//---- ConstPoolPointerReference::get() implementation...
+//---- ConstPoolPointerRef::get() implementation...
 //
-ConstPoolPointerReference *ConstPoolPointerReference::get(GlobalValue *GV) {
+ConstPoolPointerRef *ConstPoolPointerRef::get(GlobalValue *GV) {
   assert(GV->getParent() && "Global Value must be attached to a module!");
 
   // The Module handles the pointer reference sharing...
-  return GV->getParent()->getConstPoolPointerReference(GV);
+  return GV->getParent()->getConstPoolPointerRef(GV);
 }
 
 
-void ConstPoolPointerReference::mutateReference(GlobalValue *NewGV) {
-  getValue()->getParent()->mutateConstPoolPointerReference(getValue(), NewGV);
+void ConstPoolPointerRef::mutateReference(GlobalValue *NewGV) {
+  getValue()->getParent()->mutateConstPoolPointerRef(getValue(), NewGV);
   Operands[0] = NewGV;
 }
diff --git a/llvm/lib/VMCore/Module.cpp b/llvm/lib/VMCore/Module.cpp
index fbe85867146..7f5e3e246ab 100644
--- a/llvm/lib/VMCore/Module.cpp
+++ b/llvm/lib/VMCore/Module.cpp
@@ -23,7 +23,7 @@ template class ValueHolder<Method, Module, Module>;
 // Define the GlobalValueRefMap as a struct that wraps a map so that we don't
 // have Module.h depend on <map>
 //
-struct GlobalValueRefMap : public map<GlobalValue*, ConstPoolPointerReference*>{
+struct GlobalValueRefMap : public map<GlobalValue*, ConstPoolPointerRef*>{
 };
 
 
@@ -62,7 +62,7 @@ void Module::dropAllReferences() {
   if (GVRefMap) {
     for (GlobalValueRefMap::iterator I = GVRefMap->begin(), E = GVRefMap->end();
 	 I != E; ++I) {
-      // Delete the ConstPoolPointerReference node...
+      // Delete the ConstPoolPointerRef node...
       I->second->destroyConstant();
     }
 
@@ -88,25 +88,24 @@ bool Module::reduceApply(bool (*Func)(const Method*)) const {
 }
 
 // Accessor for the underlying GlobalValRefMap...
-ConstPoolPointerReference *Module::getConstPoolPointerReference(GlobalValue *V){
+ConstPoolPointerRef *Module::getConstPoolPointerRef(GlobalValue *V){
   // Create ref map lazily on demand...
   if (GVRefMap == 0) GVRefMap = new GlobalValueRefMap();
 
   GlobalValueRefMap::iterator I = GVRefMap->find(V);
   if (I != GVRefMap->end()) return I->second;
 
-  ConstPoolPointerReference *Ref = new ConstPoolPointerReference(V);
+  ConstPoolPointerRef *Ref = new ConstPoolPointerRef(V);
   GVRefMap->insert(make_pair(V, Ref));
 
   return Ref;
 }
 
-void Module::mutateConstPoolPointerReference(GlobalValue *OldGV, 
-					     GlobalValue *NewGV) {
+void Module::mutateConstPoolPointerRef(GlobalValue *OldGV, GlobalValue *NewGV) {
   GlobalValueRefMap::iterator I = GVRefMap->find(OldGV);
   assert(I != GVRefMap->end() && 
-	 "mutateConstPoolPointerReference; OldGV not in table!");
-  ConstPoolPointerReference *Ref = I->second;
+	 "mutateConstPoolPointerRef; OldGV not in table!");
+  ConstPoolPointerRef *Ref = I->second;
 
   // Remove the old entry...
   GVRefMap->erase(I);