diff --git a/Eigen/src/Core/BooleanRedux.h b/Eigen/src/Core/BooleanRedux.h
index f6afeb034..e9840257c 100644
--- a/Eigen/src/Core/BooleanRedux.h
+++ b/Eigen/src/Core/BooleanRedux.h
@@ -131,7 +131,7 @@ inline typename DenseBase<Derived>::Index DenseBase<Derived>::count() const
 
 /** \returns true is \c *this contains at least one Not A Number (NaN).
   *
-  * \sa isFinite()
+  * \sa hasNonFinite()
   */
 template<typename Derived>
 inline bool DenseBase<Derived>::hasNaN() const
@@ -144,7 +144,7 @@ inline bool DenseBase<Derived>::hasNaN() const
   * \sa hasNaN()
   */
 template<typename Derived>
-inline bool DenseBase<Derived>::isFinite() const
+inline bool DenseBase<Derived>::hasNonFinite() const
 {
   return !((derived()-derived()).hasNaN());
 }
diff --git a/Eigen/src/Core/DenseBase.h b/Eigen/src/Core/DenseBase.h
index 9551b8384..44fd660d9 100644
--- a/Eigen/src/Core/DenseBase.h
+++ b/Eigen/src/Core/DenseBase.h
@@ -348,7 +348,7 @@ template<typename Derived> class DenseBase
     bool isOnes(const RealScalar& prec = NumTraits<Scalar>::dummy_precision()) const;
     
     inline bool hasNaN() const;
-    inline bool isFinite() const;
+    inline bool hasNonFinite() const;
 
     inline Derived& operator*=(const Scalar& other);
     inline Derived& operator/=(const Scalar& other);
diff --git a/test/special_numbers.cpp b/test/special_numbers.cpp
index 910ddf21c..0d03b4c64 100644
--- a/test/special_numbers.cpp
+++ b/test/special_numbers.cpp
@@ -33,7 +33,7 @@ template<typename Scalar> void special_numbers()
   mboth = mnan + minf;
   
   VERIFY(!m1.hasNaN());
-  VERIFY(m1.isFinite());
+  VERIFY(m1.hasNonFinite());
   
   VERIFY(mnan.hasNaN());
   VERIFY((s1*mnan).hasNaN());
@@ -42,11 +42,11 @@ template<typename Scalar> void special_numbers()
   VERIFY(mboth.hasNaN());
   VERIFY(mboth.array().hasNaN());
   
-  VERIFY(!mnan.isFinite());
-  VERIFY(!minf.isFinite());
-  VERIFY(!(minf-mboth).isFinite());
-  VERIFY(!mboth.isFinite());
-  VERIFY(!mboth.array().isFinite());
+  VERIFY(!mnan.hasNonFinite());
+  VERIFY(!minf.hasNonFinite());
+  VERIFY(!(minf-mboth).hasNonFinite());
+  VERIFY(!mboth.hasNonFinite());
+  VERIFY(!mboth.array().hasNonFinite());
 }
 
 void test_special_numbers()