diff --git a/include/llvm/ConstantHandling.h b/include/llvm/ConstantHandling.h
index cbb9789fb0e..9ce1b2cb087 100644
--- a/include/llvm/ConstantHandling.h
+++ b/include/llvm/ConstantHandling.h
@@ -65,7 +65,7 @@ public:
   static AnnotationID AID;    // AnnotationID for this class
 
   // Unary Operators...
-  virtual ConstPoolVal *not(const ConstPoolVal *V) const = 0;
+  virtual ConstPoolVal *op_not(const ConstPoolVal *V) const = 0;
 
   // Binary Operators...
   virtual ConstPoolVal *add(const ConstPoolVal *V1, 
@@ -124,7 +124,7 @@ private :
 
 
 inline ConstPoolVal *operator!(const ConstPoolVal &V) {
-  return ConstRules::get(V)->not(&V);
+  return ConstRules::get(V)->op_not(&V);
 }
 
 
diff --git a/lib/VMCore/ConstantFold.h b/lib/VMCore/ConstantFold.h
index cbb9789fb0e..9ce1b2cb087 100644
--- a/lib/VMCore/ConstantFold.h
+++ b/lib/VMCore/ConstantFold.h
@@ -65,7 +65,7 @@ public:
   static AnnotationID AID;    // AnnotationID for this class
 
   // Unary Operators...
-  virtual ConstPoolVal *not(const ConstPoolVal *V) const = 0;
+  virtual ConstPoolVal *op_not(const ConstPoolVal *V) const = 0;
 
   // Binary Operators...
   virtual ConstPoolVal *add(const ConstPoolVal *V1, 
@@ -124,7 +124,7 @@ private :
 
 
 inline ConstPoolVal *operator!(const ConstPoolVal &V) {
-  return ConstRules::get(V)->not(&V);
+  return ConstRules::get(V)->op_not(&V);
 }
 
 
diff --git a/lib/VMCore/ConstantFolding.h b/lib/VMCore/ConstantFolding.h
index cbb9789fb0e..9ce1b2cb087 100644
--- a/lib/VMCore/ConstantFolding.h
+++ b/lib/VMCore/ConstantFolding.h
@@ -65,7 +65,7 @@ public:
   static AnnotationID AID;    // AnnotationID for this class
 
   // Unary Operators...
-  virtual ConstPoolVal *not(const ConstPoolVal *V) const = 0;
+  virtual ConstPoolVal *op_not(const ConstPoolVal *V) const = 0;
 
   // Binary Operators...
   virtual ConstPoolVal *add(const ConstPoolVal *V1, 
@@ -124,7 +124,7 @@ private :
 
 
 inline ConstPoolVal *operator!(const ConstPoolVal &V) {
-  return ConstRules::get(V)->not(&V);
+  return ConstRules::get(V)->op_not(&V);
 }