diff --git a/dune/gfe/harmonicenergystiffness.hh b/dune/gfe/harmonicenergystiffness.hh
index 1eff0930451028e497d695f79cca750ba097d67a..2ca8e2e575a18ae2953ae36612223923c1072a86 100644
--- a/dune/gfe/harmonicenergystiffness.hh
+++ b/dune/gfe/harmonicenergystiffness.hh
@@ -125,10 +125,10 @@ assembleEmbeddedGradient(const Entity& element,
         double weight = quad[pt].weight() * integrationElement;
 
         // The derivative of the local function defined on the reference element
-        Dune::FieldMatrix<double, TargetSpace::EmbeddedTangentVector::size, gridDim> referenceDerivative = localGeodesicFEFunction.evaluateDerivative(quadPos);
+        Dune::FieldMatrix<double, TargetSpace::EmbeddedTangentVector::dimension, gridDim> referenceDerivative = localGeodesicFEFunction.evaluateDerivative(quadPos);
 
         // The derivative of the function defined on the actual element
-        Dune::FieldMatrix<double, TargetSpace::EmbeddedTangentVector::size, gridDim> derivative;
+        Dune::FieldMatrix<double, TargetSpace::EmbeddedTangentVector::dimension, gridDim> derivative;
 
         for (size_t comp=0; comp<referenceDerivative.N(); comp++)
             jacobianInverseTransposed.mv(referenceDerivative[comp], derivative[comp]);
@@ -136,7 +136,7 @@ assembleEmbeddedGradient(const Entity& element,
         // loop over all the element's degrees of freedom and compute the gradient wrt it
         for (size_t i=0; i<localSolution.size(); i++) {
          
-            Tensor3<double, TargetSpace::EmbeddedTangentVector::size,TargetSpace::EmbeddedTangentVector::size,gridDim> referenceDerivativeDerivative;
+            Tensor3<double, TargetSpace::EmbeddedTangentVector::dimension,TargetSpace::EmbeddedTangentVector::dimension,gridDim> referenceDerivativeDerivative;
 #ifdef HARMONIC_ENERGY_FD_INNER_GRADIENT
 #warning Using finite differences to compute the inner gradients!
             localGeodesicFEFunction.evaluateFDDerivativeOfGradientWRTCoefficient(quadPos, i, referenceDerivativeDerivative);
@@ -145,9 +145,9 @@ assembleEmbeddedGradient(const Entity& element,
 #endif
             
             // multiply the transformation from the reference element to the actual element
-            Tensor3<double, TargetSpace::EmbeddedTangentVector::size,TargetSpace::EmbeddedTangentVector::size,gridDim> derivativeDerivative;
-            for (int ii=0; ii<TargetSpace::EmbeddedTangentVector::size; ii++)
-                for (int jj=0; jj<TargetSpace::EmbeddedTangentVector::size; jj++)
+            Tensor3<double, TargetSpace::EmbeddedTangentVector::dimension,TargetSpace::EmbeddedTangentVector::dimension,gridDim> derivativeDerivative;
+            for (int ii=0; ii<TargetSpace::EmbeddedTangentVector::dimension; ii++)
+                for (int jj=0; jj<TargetSpace::EmbeddedTangentVector::dimension; jj++)
                     for (int kk=0; kk<gridDim; kk++) {
                         derivativeDerivative[ii][jj][kk] = 0;
                         for (int ll=0; ll<gridDim; ll++)
@@ -158,7 +158,7 @@ assembleEmbeddedGradient(const Entity& element,
                 
                 for (int k=0; k<derivative.cols; k++) {
                     
-                    for (int l=0; l<TargetSpace::EmbeddedTangentVector::size; l++)
+                    for (int l=0; l<TargetSpace::EmbeddedTangentVector::dimension; l++)
                         localGradient[i][l] += weight*derivative[j][k] * derivativeDerivative[l][j][k];
                     
                 }
diff --git a/dune/gfe/localgeodesicfefunction.hh b/dune/gfe/localgeodesicfefunction.hh
index 6715677bf02dc9c76bc5ad2dd4f7eacf781fa3b0..663cbc0367cbb81646b52a46d8f1a0436aba7641 100644
--- a/dune/gfe/localgeodesicfefunction.hh
+++ b/dune/gfe/localgeodesicfefunction.hh
@@ -92,7 +92,7 @@ private:
     static Dune::FieldMatrix<double,embeddedDim,embeddedDim> pseudoInverse(const Dune::FieldMatrix<double,embeddedDim,embeddedDim>& dFdq,
                                                                            const TargetSpace& q)
     {
-        const int shortDim = TargetSpace::TangentVector::size;
+        const int shortDim = TargetSpace::TangentVector::dimension;
     
         // the orthonormal frame
         Dune::FieldMatrix<ctype,shortDim,embeddedDim> O = q.orthonormalFrame();
@@ -306,7 +306,7 @@ evaluateDerivativeOfValueWRTCoefficient(const Dune::FieldVector<ctype, dim>& loc
     Dune::FieldMatrix<ctype,embeddedDim,embeddedDim> dFdq(0);
     assembler.assembleEmbeddedHessian(q,dFdq);
 
-    const int shortDim = TargetSpace::TangentVector::size;
+    const int shortDim = TargetSpace::TangentVector::dimension;
     
     // the orthonormal frame
     Dune::FieldMatrix<ctype,shortDim,embeddedDim> O = q.orthonormalFrame();