diff --git a/src/Core/Cast.h b/src/Core/Cast.h
index 5dc33092a..6ef4e77b0 100644
--- a/src/Core/Cast.h
+++ b/src/Core/Cast.h
@@ -26,7 +26,7 @@
 #ifndef EIGEN_CAST_H
 #define EIGEN_CAST_H
 
-template<typename NewScalar, typename MatrixType> class Cast : NoDefaultOperatorEquals,
+template<typename NewScalar, typename MatrixType> class Cast : NoOperatorEquals,
   public MatrixBase<NewScalar, Cast<NewScalar, MatrixType> >
 {
   public:
diff --git a/src/Core/Conjugate.h b/src/Core/Conjugate.h
index 04ba143c0..515c49e6a 100644
--- a/src/Core/Conjugate.h
+++ b/src/Core/Conjugate.h
@@ -26,7 +26,7 @@
 #ifndef EIGEN_CONJUGATE_H
 #define EIGEN_CONJUGATE_H
 
-template<typename MatrixType> class Conjugate : NoDefaultOperatorEquals,
+template<typename MatrixType> class Conjugate : NoOperatorEquals,
   public MatrixBase<typename MatrixType::Scalar, Conjugate<MatrixType> >
 {
   public:
diff --git a/src/Core/DiagonalMatrix.h b/src/Core/DiagonalMatrix.h
index 41152bd59..e7db09fc7 100644
--- a/src/Core/DiagonalMatrix.h
+++ b/src/Core/DiagonalMatrix.h
@@ -27,7 +27,7 @@
 #define EIGEN_DIAGONALMATRIX_H
 
 template<typename MatrixType, typename CoeffsVectorType>
-class DiagonalMatrix : NoDefaultOperatorEquals,
+class DiagonalMatrix : NoOperatorEquals,
   public MatrixBase<typename MatrixType::Scalar,
                     DiagonalMatrix<MatrixType, CoeffsVectorType> >
 {
@@ -48,7 +48,6 @@ class DiagonalMatrix : NoDefaultOperatorEquals,
     }
     
   private:
-    DiagonalMatrix& _ref() { return *this; }
     const DiagonalMatrix& _ref() const { return *this; }
     int _rows() const { return m_coeffs.size(); }
     int _cols() const { return m_coeffs.size(); }
diff --git a/src/Core/Difference.h b/src/Core/Difference.h
index 94412f79e..7f962b4f8 100644
--- a/src/Core/Difference.h
+++ b/src/Core/Difference.h
@@ -26,7 +26,7 @@
 #ifndef EIGEN_DIFFERENCE_H
 #define EIGEN_DIFFERENCE_H
 
-template<typename Lhs, typename Rhs> class Difference : NoDefaultOperatorEquals,
+template<typename Lhs, typename Rhs> class Difference : NoOperatorEquals,
   public MatrixBase<typename Lhs::Scalar, Difference<Lhs, Rhs> >
 {
   public:
diff --git a/src/Core/Identity.h b/src/Core/Identity.h
index 37000a45a..cf74fdeb7 100644
--- a/src/Core/Identity.h
+++ b/src/Core/Identity.h
@@ -26,7 +26,7 @@
 #ifndef EIGEN_IDENTITY_H
 #define EIGEN_IDENTITY_H
 
-template<typename MatrixType> class Identity : NoDefaultOperatorEquals,
+template<typename MatrixType> class Identity : NoOperatorEquals,
   public MatrixBase<typename MatrixType::Scalar, Identity<MatrixType> >
 {
   public:
@@ -42,7 +42,6 @@ template<typename MatrixType> class Identity : NoDefaultOperatorEquals,
     }
     
   private:
-    Identity& _ref() { return *this; }
     const Identity& _ref() const { return *this; }
     int _rows() const { return m_rows; }
     int _cols() const { return m_rows; }
diff --git a/src/Core/Map.h b/src/Core/Map.h
index 5b012aed9..420d318cb 100644
--- a/src/Core/Map.h
+++ b/src/Core/Map.h
@@ -44,7 +44,6 @@ template<typename MatrixType> class Map
     EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Map)
     
   private:
-    Map& _ref() { return *this; }
     const Map& _ref() const { return *this; }
     int _rows() const { return m_rows; }
     int _cols() const { return m_cols; }
diff --git a/src/Core/Minor.h b/src/Core/Minor.h
index c2b00cbf5..93789183f 100644
--- a/src/Core/Minor.h
+++ b/src/Core/Minor.h
@@ -54,7 +54,6 @@ template<typename MatrixType> class Minor
     EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Minor)
     
   private:
-    Minor& _ref() { return *this; }
     const Minor& _ref() const { return *this; }
     int _rows() const { return m_matrix.rows() - 1; }
     int _cols() const { return m_matrix.cols() - 1; }
diff --git a/src/Core/Ones.h b/src/Core/Ones.h
index de6a1d6b0..01a8250ef 100644
--- a/src/Core/Ones.h
+++ b/src/Core/Ones.h
@@ -26,7 +26,7 @@
 #ifndef EIGEN_ONES_H
 #define EIGEN_ONES_H
 
-template<typename MatrixType> class Ones : NoDefaultOperatorEquals,
+template<typename MatrixType> class Ones : NoOperatorEquals,
   public MatrixBase<typename MatrixType::Scalar, Ones<MatrixType> >
 {
   public:
diff --git a/src/Core/Opposite.h b/src/Core/Opposite.h
index 93ea645f8..0a0bcc24a 100644
--- a/src/Core/Opposite.h
+++ b/src/Core/Opposite.h
@@ -26,7 +26,7 @@
 #ifndef EIGEN_OPPOSITE_H
 #define EIGEN_OPPOSITE_H
 
-template<typename MatrixType> class Opposite : NoDefaultOperatorEquals,
+template<typename MatrixType> class Opposite : NoOperatorEquals,
   public MatrixBase<typename MatrixType::Scalar, Opposite<MatrixType> >
 {
   public:
diff --git a/src/Core/Product.h b/src/Core/Product.h
index 5a89d7776..39ceeaf90 100644
--- a/src/Core/Product.h
+++ b/src/Core/Product.h
@@ -60,7 +60,7 @@ struct ProductUnroller<Index, 0, Lhs, Rhs>
   static void run(int, int, const Lhs&, const Rhs&, typename Lhs::Scalar&) {}
 };
 
-template<typename Lhs, typename Rhs> class Product : NoDefaultOperatorEquals,
+template<typename Lhs, typename Rhs> class Product : NoOperatorEquals,
   public MatrixBase<typename Lhs::Scalar, Product<Lhs, Rhs> >
 {
   public:
diff --git a/src/Core/Random.h b/src/Core/Random.h
index c51ba08a8..353985243 100644
--- a/src/Core/Random.h
+++ b/src/Core/Random.h
@@ -26,7 +26,7 @@
 #ifndef EIGEN_RANDOM_H
 #define EIGEN_RANDOM_H
 
-template<typename MatrixType> class Random : NoDefaultOperatorEquals,
+template<typename MatrixType> class Random : NoOperatorEquals,
   public MatrixBase<typename MatrixType::Scalar, Random<MatrixType> >
 {
   public:
diff --git a/src/Core/ScalarMultiple.h b/src/Core/ScalarMultiple.h
index 268b5fa41..98264c2a6 100644
--- a/src/Core/ScalarMultiple.h
+++ b/src/Core/ScalarMultiple.h
@@ -26,7 +26,7 @@
 #ifndef EIGEN_SCALARMULTIPLE_H
 #define EIGEN_SCALARMULTIPLE_H
 
-template<typename MatrixType> class ScalarMultiple : NoDefaultOperatorEquals,
+template<typename MatrixType> class ScalarMultiple : NoOperatorEquals,
   public MatrixBase<typename MatrixType::Scalar, ScalarMultiple<MatrixType> >
 {
   public:
diff --git a/src/Core/Sum.h b/src/Core/Sum.h
index fa2b206da..62eec75ac 100644
--- a/src/Core/Sum.h
+++ b/src/Core/Sum.h
@@ -26,7 +26,7 @@
 #ifndef EIGEN_SUM_H
 #define EIGEN_SUM_H
 
-template<typename Lhs, typename Rhs> class Sum : NoDefaultOperatorEquals,
+template<typename Lhs, typename Rhs> class Sum : NoOperatorEquals,
     public MatrixBase<typename Lhs::Scalar, Sum<Lhs, Rhs> >
 {
   public:
diff --git a/src/Core/Util.h b/src/Core/Util.h
index c4729ab07..ad05c777c 100644
--- a/src/Core/Util.h
+++ b/src/Core/Util.h
@@ -127,11 +127,11 @@ enum AssertLevel
   InternalDebugging = 2
 };
 
-//classes inheriting NoDefaultOperatorEquals don't generate a default operator=.
-class NoDefaultOperatorEquals
+//classes inheriting NoOperatorEquals don't generate a default operator=.
+class NoOperatorEquals
 {
   private:
-    NoDefaultOperatorEquals& operator=(const NoDefaultOperatorEquals&);
+    NoOperatorEquals& operator=(const NoOperatorEquals&);
 };
 
 #endif // EIGEN_UTIL_H
diff --git a/src/Core/Zero.h b/src/Core/Zero.h
index 53703c4f5..8f01e074c 100644
--- a/src/Core/Zero.h
+++ b/src/Core/Zero.h
@@ -26,7 +26,7 @@
 #ifndef EIGEN_ZERO_H
 #define EIGEN_ZERO_H
 
-template<typename MatrixType> class Zero : NoDefaultOperatorEquals,
+template<typename MatrixType> class Zero : NoOperatorEquals,
   public MatrixBase<typename MatrixType::Scalar, Zero<MatrixType> >
 {
   public: