diff --git a/src/amdis/common/FieldMatVec.inc.hpp b/src/amdis/common/FieldMatVec.inc.hpp
index 779dc8a1e9fa9e1602fa382f31519e5e70ae24a4..ae5abe411671b6382b69d96bae43a48591d84a03 100644
--- a/src/amdis/common/FieldMatVec.inc.hpp
+++ b/src/amdis/common/FieldMatVec.inc.hpp
@@ -126,10 +126,10 @@ namespace MatVec {
     return C;
   }
 
-  template <class T, int N>
-  class MatrixView<DiagonalMatrix<T,N>>
+  template <class T, int SIZE>
+  class MatrixView<DiagonalMatrix<T,SIZE>>
   {
-    using Matrix = DiagonalMatrix<T,N>;
+    using Matrix = DiagonalMatrix<T,SIZE>;
     using size_type = typename Matrix::size_type;
 
     struct RowView
@@ -145,7 +145,7 @@ namespace MatVec {
     };
 
   public:
-    MatrixView(DiagonalMatrix<T,N> const& mat)
+    MatrixView(Matrix const& mat)
       : mat_(mat)
     {}
 
@@ -166,7 +166,7 @@ namespace MatVec {
     }
 
   private:
-    DiagonalMatrix<T,N> const& mat_;
+    Matrix const& mat_;
   };
 
 } // end namespace MatVec
diff --git a/src/amdis/localoperators/FirstOrderTestPartialTrial.hpp b/src/amdis/localoperators/FirstOrderTestPartialTrial.hpp
index daf057fb8eef4e2993e09a498105740adb7075eb..b3d67ff3c869ce0c65e165c8832c8e6757164027 100644
--- a/src/amdis/localoperators/FirstOrderTestPartialTrial.hpp
+++ b/src/amdis/localoperators/FirstOrderTestPartialTrial.hpp
@@ -69,7 +69,7 @@ namespace AMDiS
 
         // The transposed inverse Jacobian of the map from the reference element to the element
         const auto jacobian = contextGeo.geometry().jacobianInverseTransposed(local);
-        auto&& jacobian_mat = as_matrix(jacobian);
+        auto&& jacobian_mat = Dune::MatVec::as_matrix(jacobian);
         assert(jacobian.M() == CG::dim);
 
         // The multiplicative factor in the integral transformation formula
diff --git a/src/amdis/localoperators/SecondOrderPartialTestPartialTrial.hpp b/src/amdis/localoperators/SecondOrderPartialTestPartialTrial.hpp
index df317b844bcda0f7d0da594708f2eab06f0035db..32dd3b3ea60c5511d44443cc071d2093febe84f2 100644
--- a/src/amdis/localoperators/SecondOrderPartialTestPartialTrial.hpp
+++ b/src/amdis/localoperators/SecondOrderPartialTestPartialTrial.hpp
@@ -67,7 +67,7 @@ namespace AMDiS
 
         // The transposed inverse Jacobian of the map from the reference element to the element
         const auto jacobian = contextGeo.geometry().jacobianInverseTransposed(local);
-        auto&& jacobian_mat = as_matrix(jacobian);
+        auto&& jacobian_mat = Dune::MatVec::as_matrix(jacobian);
 
         // The multiplicative factor in the integral transformation formula
         const auto factor = contextGeo.integrationElement(quad[iq].position()) * quad[iq].weight();