diff --git a/dune/solvers/iterationsteps/mmgstep.cc b/dune/solvers/iterationsteps/mmgstep.cc
index 0d53f2cbbd3a5f7657d714bda71652bb55b46abb..a57e7008ed40f4870c14338091383a9486f9f86a 100644
--- a/dune/solvers/iterationsteps/mmgstep.cc
+++ b/dune/solvers/iterationsteps/mmgstep.cc
@@ -212,7 +212,7 @@ void MonotoneMGStep<OperatorType, DiscFuncType>::iterate()
 #ifndef NDEBUG
         // Debug: is the current iterate really admissible?
         for (int i=0; i<obstacles[level].size(); i++)
-            for (int j=0; j<DiscFuncType::block_type::size; j++)
+            for (int j=0; j<DiscFuncType::block_type::dimension; j++)
                 if (x[level][i][j] < obstacles[level][i].lower(j)
                     || x[level][i][j] > obstacles[level][i].upper(j)) {
                     
diff --git a/dune/solvers/solvers/cgsolver.hh b/dune/solvers/solvers/cgsolver.hh
index 3360d91ef322964dff1ee1f76404aae1ecfa3e4c..3ff937d52d91dc69ba1cbeaec2d716a7e496725f 100644
--- a/dune/solvers/solvers/cgsolver.hh
+++ b/dune/solvers/solvers/cgsolver.hh
@@ -11,7 +11,7 @@
 template <class MatrixType, class VectorType>
 class CGSolver : public IterativeSolver<VectorType>
 {
-    static const int blocksize = VectorType::block_type::size;
+    static const int blocksize = VectorType::block_type::dimension;
 
 public:     
 
diff --git a/dune/solvers/solvers/quadraticipopt.hh b/dune/solvers/solvers/quadraticipopt.hh
index b4a0bfb5ce027906cfa66131ec2c6c076f8a6bd0..0d558519e7a0e7247cac4ce144a933fb19cd4d1d 100644
--- a/dune/solvers/solvers/quadraticipopt.hh
+++ b/dune/solvers/solvers/quadraticipopt.hh
@@ -38,7 +38,7 @@
 template <class MatrixType, class VectorType>
 class QuadraticIPOptProblem : public Ipopt::TNLP
 {
-    enum {blocksize = VectorType::block_type::size};
+    enum {blocksize = VectorType::block_type::dimension};
 
     typedef typename VectorType::field_type field_type;
 
@@ -513,10 +513,10 @@ finalize_solution(Ipopt::SolverReturn status,
 */
 template <class MatrixType, class VectorType>
 class QuadraticIPOptSolver 
-    : public IterativeSolver<VectorType>, public CanIgnore<Dune::BitSetVector<VectorType::block_type::size> >
+    : public IterativeSolver<VectorType>, public CanIgnore<Dune::BitSetVector<VectorType::block_type::dimension> >
 {
 
-    enum {blocksize = VectorType::block_type::size};
+    enum {blocksize = VectorType::block_type::dimension};
 
     typedef typename VectorType::field_type field_type;
 
diff --git a/dune/solvers/solvers/tcgsolver.hh b/dune/solvers/solvers/tcgsolver.hh
index 0bd03648daf8cf87f2a50ebeb9afda6733b3944d..07d2779cae8c37c42e6ddacdb16affcf3544aa1f 100644
--- a/dune/solvers/solvers/tcgsolver.hh
+++ b/dune/solvers/solvers/tcgsolver.hh
@@ -11,7 +11,7 @@
 template <class MatrixType, class VectorType>
 class TruncatedCGSolver : public IterativeSolver<VectorType>
 {
-    static const int blocksize = VectorType::block_type::size;
+    static const int blocksize = VectorType::block_type::dimension;
 
     typedef typename VectorType::field_type field_type;
 
diff --git a/dune/solvers/transferoperators/compressedmultigridtransfer.hh b/dune/solvers/transferoperators/compressedmultigridtransfer.hh
index 29d665ae61362c766fd906b77f6c2976ffc99667..37b3ea74ba20374bb514ad094ead08f7972af2e0 100644
--- a/dune/solvers/transferoperators/compressedmultigridtransfer.hh
+++ b/dune/solvers/transferoperators/compressedmultigridtransfer.hh
@@ -23,12 +23,12 @@ template<
     class VectorType,
     class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension>,
     class MatrixType = Dune::BCRSMatrix< typename Dune::FieldMatrix<
-        typename VectorType::field_type, VectorType::block_type::size, VectorType::block_type::size> > >
+        typename VectorType::field_type, VectorType::block_type::dimension, VectorType::block_type::dimension> > >
 class CompressedMultigridTransfer :
     public MultigridTransfer<VectorType,BitVectorType,MatrixType>
 {
 
-    enum {blocksize = VectorType::block_type::size};
+    enum {blocksize = VectorType::block_type::dimension};
 
     typedef typename VectorType::field_type field_type;
 
diff --git a/dune/solvers/transferoperators/densemultigridtransfer.hh b/dune/solvers/transferoperators/densemultigridtransfer.hh
index 3a785e3ca3f14b26368fc66989c7b827634c0068..ae1258cefbfbb464d3603b16e68b8d277e6c9b75 100644
--- a/dune/solvers/transferoperators/densemultigridtransfer.hh
+++ b/dune/solvers/transferoperators/densemultigridtransfer.hh
@@ -23,12 +23,12 @@ template<
     class VectorType,
     class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension>,
     class MatrixType = Dune::BCRSMatrix< typename Dune::FieldMatrix<
-        typename VectorType::field_type, VectorType::block_type::size, VectorType::block_type::size> > >
+        typename VectorType::field_type, VectorType::block_type::dimension, VectorType::block_type::dimension> > >
 class DenseMultigridTransfer :
     public MultigridTransfer<VectorType,BitVectorType,MatrixType>
 {
 
-    enum {blocksize = VectorType::block_type::size};
+    enum {blocksize = VectorType::block_type::dimension};
 
     typedef typename VectorType::field_type field_type;
 
diff --git a/dune/solvers/transferoperators/multigridtransfer.hh b/dune/solvers/transferoperators/multigridtransfer.hh
index 455727a8b7af0586e9870d51257f8515bb9ba7b3..f7fbdf63dae2f952f0c6172537c9aeaf2bce614d 100644
--- a/dune/solvers/transferoperators/multigridtransfer.hh
+++ b/dune/solvers/transferoperators/multigridtransfer.hh
@@ -18,7 +18,7 @@ template<
     class VectorType,
     class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension>,
     class MatrixType = Dune::BCRSMatrix< typename Dune::FieldMatrix<
-        typename VectorType::field_type, VectorType::block_type::size, VectorType::block_type::size> > >
+        typename VectorType::field_type, VectorType::block_type::dimension, VectorType::block_type::dimension> > >
 class MultigridTransfer {
 
 public:
diff --git a/dune/solvers/transferoperators/truncatedcompressedmgtransfer.hh b/dune/solvers/transferoperators/truncatedcompressedmgtransfer.hh
index f7b4bd8276b0088aa57e912f4d0b4ca7b7b516f6..8fc17d5569dd84b1daa6ec0d8b08dd8e7a115ffa 100644
--- a/dune/solvers/transferoperators/truncatedcompressedmgtransfer.hh
+++ b/dune/solvers/transferoperators/truncatedcompressedmgtransfer.hh
@@ -25,13 +25,13 @@ template<
     class VectorType,
     class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension>,
     class MatrixType = Dune::BCRSMatrix< typename Dune::FieldMatrix<
-        typename VectorType::field_type, VectorType::block_type::size, VectorType::block_type::size> > >
+        typename VectorType::field_type, VectorType::block_type::dimension, VectorType::block_type::dimension> > >
 class TruncatedCompressedMGTransfer :
     public CompressedMultigridTransfer<VectorType, BitVectorType, MatrixType>,
     public TruncatedMGTransfer<VectorType, BitVectorType, MatrixType>
 {
 
-    enum {blocksize = VectorType::block_type::size};
+    enum {blocksize = VectorType::block_type::dimension};
 
     typedef typename VectorType::field_type field_type;
 
diff --git a/dune/solvers/transferoperators/truncateddensemgtransfer.hh b/dune/solvers/transferoperators/truncateddensemgtransfer.hh
index 46ae1c806da962006f426cf5d619a9e654693384..2159caa381eaa8fc157ac849056709dd31a4b753 100644
--- a/dune/solvers/transferoperators/truncateddensemgtransfer.hh
+++ b/dune/solvers/transferoperators/truncateddensemgtransfer.hh
@@ -24,13 +24,13 @@ template<
     class VectorType,
     class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension>,
     class MatrixType = Dune::BCRSMatrix< typename Dune::FieldMatrix<
-        typename VectorType::field_type, VectorType::block_type::size, VectorType::block_type::size> > >
+        typename VectorType::field_type, VectorType::block_type::dimension, VectorType::block_type::dimension> > >
 class TruncatedDenseMGTransfer :
     public DenseMultigridTransfer<VectorType, BitVectorType, MatrixType>,
     public TruncatedMGTransfer<VectorType, BitVectorType, MatrixType>
 {
 
-    enum {blocksize = VectorType::block_type::size};
+    enum {blocksize = VectorType::block_type::dimension};
 
     typedef typename VectorType::field_type field_type;
 
diff --git a/dune/solvers/transferoperators/truncatedmgtransfer.hh b/dune/solvers/transferoperators/truncatedmgtransfer.hh
index d6a21635a0c9365c1a245ec4b417fa9a8aeabe0d..f6b6653a08c2347b43bbaf0785063b35ddc60fdb 100644
--- a/dune/solvers/transferoperators/truncatedmgtransfer.hh
+++ b/dune/solvers/transferoperators/truncatedmgtransfer.hh
@@ -21,11 +21,11 @@ template<
     class VectorType,
     class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension>,
     class MatrixType = Dune::BCRSMatrix< typename Dune::FieldMatrix<
-        typename VectorType::field_type, VectorType::block_type::size, VectorType::block_type::size> > >
+        typename VectorType::field_type, VectorType::block_type::dimension, VectorType::block_type::dimension> > >
 class TruncatedMGTransfer
 {
 
-    enum {blocksize = VectorType::block_type::size};
+    enum {blocksize = VectorType::block_type::dimension};
 
     typedef typename VectorType::field_type field_type;