diff --git a/dune/gfe/parallel/globalindex.hh b/dune/gfe/parallel/globalindex.hh
index 38ebb47b94f3bd214415c70aa469988182f7c6d1..4bcac66675a8618c729aa403cbd275c78b95dbac 100644
--- a/dune/gfe/parallel/globalindex.hh
+++ b/dune/gfe/parallel/globalindex.hh
@@ -70,7 +70,7 @@
 namespace Dune {
 
 template<class GridView, int CODIM>
-class GlobalUniqueIndex
+class GlobalIndexSet
 {
 private:
   /** define data types */
@@ -191,7 +191,7 @@ public:
   /*  later query the global index, by directly passing the entity in question: then the respective global              */
   /*  index is returned.                                                                                                */
   /**********************************************************************************************************************/
-  GlobalUniqueIndex(const GridView& gridview)
+  GlobalIndexSet(const GridView& gridview)
     :       gridview_(gridview),
 	    uniqueEntityPartition_(gridview)
   {
diff --git a/dune/gfe/parallel/globalp2mapper.hh b/dune/gfe/parallel/globalp2mapper.hh
index 95dab259308e5d1f8d4743624940486afda98cce..43fa20b6d6cd2d26ffb484aa13f604828db1e352 100644
--- a/dune/gfe/parallel/globalp2mapper.hh
+++ b/dune/gfe/parallel/globalp2mapper.hh
@@ -36,9 +36,9 @@ namespace Dune {
 
       P2BasisMapper<GridView> p2Mapper(gridView);
 
-      GlobalUniqueIndex<GridView,2> globalVertexIndex(gridView);
-      GlobalUniqueIndex<GridView,1> globalEdgeIndex(gridView);
-      GlobalUniqueIndex<GridView,0> globalElementIndex(gridView);
+      GlobalIndexSet<GridView,2> globalVertexIndex(gridView);
+      GlobalIndexSet<GridView,1> globalEdgeIndex(gridView);
+      GlobalIndexSet<GridView,0> globalElementIndex(gridView);
 
       // total number of degrees of freedom
       nGlobalEntity_ = globalVertexIndex.nGlobalEntity() + globalEdgeIndex.nGlobalEntity() + globalElementIndex.nGlobalEntity();
diff --git a/dune/gfe/riemanniantrsolver.cc b/dune/gfe/riemanniantrsolver.cc
index 435bfccec51cb0c71bae76405de03b245c928a7a..7866299a0752211ff8d2483d48f8a327edc194b6 100644
--- a/dune/gfe/riemanniantrsolver.cc
+++ b/dune/gfe/riemanniantrsolver.cc
@@ -181,7 +181,7 @@ setup(const GridType& grid,
 
         // If we are on more than 1 processors, join all local transfer matrices on rank 0,
         // and construct a single global transfer operator there.
-        typedef Dune::GlobalUniqueIndex<typename GridType::LeafGridView, gridDim> LeafP1GUIndex;
+        typedef Dune::GlobalIndexSet<typename GridType::LeafGridView, gridDim> LeafP1GUIndex;
         LeafP1GUIndex p1Index(grid_->leafGridView());
 
         typedef typename TruncatedCompressedMGTransfer<CorrectionType>::TransferOperatorType TransferOperatorType;
@@ -198,7 +198,7 @@ setup(const GridType& grid,
 
           // If we are on more than 1 processors, join all local transfer matrices on rank 0,
           // and construct a single global transfer operator there.
-          typedef Dune::GlobalUniqueIndex<typename GridType::LevelGridView, gridDim> LevelGUIndex;
+          typedef Dune::GlobalIndexSet<typename GridType::LevelGridView, gridDim> LevelGUIndex;
           LevelGUIndex fineGUIndex(grid_->levelGridView(i+2));
           LevelGUIndex coarseGUIndex(grid_->levelGridView(i+1));
 
@@ -221,7 +221,7 @@ setup(const GridType& grid,
 
         // If we are on more than 1 processors, join all local transfer matrices on rank 0,
         // and construct a single global transfer operator there.
-        typedef Dune::GlobalUniqueIndex<typename GridType::LevelGridView, gridDim> LevelGUIndex;
+        typedef Dune::GlobalIndexSet<typename GridType::LevelGridView, gridDim> LevelGUIndex;
         LevelGUIndex fineGUIndex(grid_->levelGridView(i+1));
         LevelGUIndex coarseGUIndex(grid_->levelGridView(i));