diff --git a/llvm/include/llvm/CodeGen/SelectionDAGISel.h b/llvm/include/llvm/CodeGen/SelectionDAGISel.h
index 790f23ba6b00..78179c9e2ad4 100644
--- a/llvm/include/llvm/CodeGen/SelectionDAGISel.h
+++ b/llvm/include/llvm/CodeGen/SelectionDAGISel.h
@@ -63,9 +63,9 @@ public:
     return true;
   }
 
-  /// IsFoldableBy - Returns true if the specific operand node N of U can be
+  /// CanBeFoldedBy - Returns true if the specific operand node N of U can be
   /// folded during instruction selection?
-  virtual bool IsFoldableBy(SDNode *N, SDNode *U) { return true; }
+  virtual bool CanBeFoldedBy(SDNode *N, SDNode *U) { return true; }
   
   /// CreateTargetHazardRecognizer - Return a newly allocated hazard recognizer
   /// to use for this target when scheduling the DAG.
diff --git a/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp b/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
index eea6feb19194..cafb1662ce6c 100644
--- a/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
+++ b/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
@@ -118,7 +118,7 @@ namespace {
 
     virtual void EmitFunctionEntryCode(Function &Fn, MachineFunction &MF);
 
-    virtual bool IsFoldableBy(SDNode *N, SDNode *U);
+    virtual bool CanBeFoldedBy(SDNode *N, SDNode *U);
 
 // Include the pieces autogenerated from the target description.
 #include "X86GenDAGISel.inc"
@@ -232,7 +232,7 @@ namespace {
   };
 }
 
-bool X86DAGToDAGISel::IsFoldableBy(SDNode *N, SDNode *U) {
+bool X86DAGToDAGISel::CanBeFoldedBy(SDNode *N, SDNode *U) {
   // Is it already folded by SelectAddr / SelectLEAAddr?
   if (isUnfoldable(N))
     return false;
@@ -711,7 +711,7 @@ bool X86DAGToDAGISel::TryFoldLoad(SDOperand P, SDOperand N,
   if (N.getOpcode() == ISD::LOAD &&
       N.hasOneUse() &&
       !CodeGenMap.count(N.getValue(0)) &&
-      !IsFoldableBy(N.Val, P.Val))
+      !CanBeFoldedBy(N.Val, P.Val))
     return SelectAddr(N.getOperand(1), Base, Scale, Index, Disp);
   return false;
 }
diff --git a/llvm/utils/TableGen/DAGISelEmitter.cpp b/llvm/utils/TableGen/DAGISelEmitter.cpp
index fa4d8492e44a..c1d5d3a23718 100644
--- a/llvm/utils/TableGen/DAGISelEmitter.cpp
+++ b/llvm/utils/TableGen/DAGISelEmitter.cpp
@@ -2276,7 +2276,7 @@ public:
               PInfo.hasProperty(SDNodeInfo::SDNPHasChain) ||
               PInfo.hasProperty(SDNodeInfo::SDNPInFlag) ||
               PInfo.hasProperty(SDNodeInfo::SDNPOptInFlag))
-            emitCheck("IsFoldableBy(" + RootName + ".Val, " + ParentName +
+            emitCheck("CanBeFoldedBy(" + RootName + ".Val, " + ParentName +
                       ".Val)");
         }
       }