diff --git a/src/dune-microstructure.cc b/src/dune-microstructure.cc
index c14ea1cb7d8e8dbefe5465955f2ff40b987b313e..d188d12287208c1c3166454dba5109697b5d243d 100644
--- a/src/dune-microstructure.cc
+++ b/src/dune-microstructure.cc
@@ -58,7 +58,7 @@ using namespace Dune;
 template<class Basis>
 auto arbitraryComponentwiseIndices(const Basis& basis,
                                    const int elementNumber,
-                                   const int localIdx
+                                   const int leafIdx
                                    )
 {
   // (Local Approach -- works for non Lagrangian-Basis too) 
@@ -77,7 +77,7 @@ auto arbitraryComponentwiseIndices(const Basis& basis,
       
       for (int k = 0; k < 3; k++)
       {
-        auto rowLocal = localView.tree().child(k).localIndex(localIdx);    // TODO braucht hier Local to Leaf Idx Map
+        auto rowLocal = localView.tree().child(k).localIndex(leafIdx);    //Input: LeafIndex! TODO braucht hier (Inverse )  Local-to-Leaf Idx Map
         std::cout << "rowLocal:" << rowLocal << std::endl;
         row[k] = localView.index(rowLocal);
         std::cout << "row[k]:" << row[k] << std::endl;
@@ -425,24 +425,24 @@ void getOccupationPattern(const Basis& basis, MatrixIndexSet& nb, ParameterSet&
   //////////////////////////////////////////////////////////////////
   if(parameterSet.template get<bool>("set_IntegralZero", true)){ 
     FieldVector<int,3> row;
-    unsigned int arbitraryLocalIndex =  parameterSet.template get<unsigned int>("arbitraryLocalIndex", 0);  
+    unsigned int arbitraryLeafIndex =  parameterSet.template get<unsigned int>("arbitraryLeafIndex", 0);  
     unsigned int arbitraryElementNumber =  parameterSet.template get<unsigned int>("arbitraryElementNumber", 0);
     
     
     
-//     assert(arbitraryLocalIndex < localView.size() );              // "localIndex is larger than #shapeFunctions"               TODO ERROR 
+//     assert(arbitraryLeafIndex < localView.size() );              // "localIndex is larger than #shapeFunctions"               TODO ERROR 
     
     
     const auto& localFiniteElement = localView.tree().child(0).finiteElement();        // macht keinen Unterschied ob hier k oder 0..
     const auto nSf = localFiniteElement.localBasis().size();     
-    assert(arbitraryLocalIndex < nSf );       
+    assert(arbitraryLeafIndex < nSf );       
     
     std::cout << "arbitraryElementNumber:" << arbitraryElementNumber << std::endl;
     std::cout << "basis.gridView().size(0:" << basis.gridView().size(0) << std::endl;
     assert(arbitraryElementNumber  < basis.gridView().size(0));   // "arbitraryElementNumber larger than total Number of Elements"
     
     //Determine 3 global indices (one for each component of an arbitrary local FE-function)
-    row = arbitraryComponentwiseIndices(basis,arbitraryElementNumber,arbitraryLocalIndex);
+    row = arbitraryComponentwiseIndices(basis,arbitraryElementNumber,arbitraryLeafIndex);
     
     printvector(std::cout, row, "row" , "--");
     
@@ -836,11 +836,11 @@ void setOneBaseFunctionToZero(const Basis& basis,
   constexpr int dim = 3;
 
   FieldVector<int,3> row;
-  unsigned int arbitraryLocalIndex =  parameterSet.template get<unsigned int>("arbitraryLocalIndex", 0);  
+  unsigned int arbitraryLeafIndex =  parameterSet.template get<unsigned int>("arbitraryLeafIndex", 0);  
   unsigned int arbitraryElementNumber =  parameterSet.template get<unsigned int>("arbitraryElementNumber", 0);
 
   //Determine 3 global indices (one for each component of an arbitrary local FE-function)
-  row = arbitraryComponentwiseIndices(basis,arbitraryElementNumber,arbitraryLocalIndex);
+  row = arbitraryComponentwiseIndices(basis,arbitraryElementNumber,arbitraryLeafIndex);
 
   for (int k = 0; k < dim; k++)
   {
@@ -1653,11 +1653,11 @@ int main(int argc, char *argv[])
  //////////////////////////////////////////////////////////////////////
   // Determine global indices of components for arbitrary (local) index        
   //////////////////////////////////////////////////////////////////////
-  int arbitraryLocalIndex =  parameterSet.get<unsigned int>("arbitraryLocalIndex", 0);  // localIdx..assert Number < #ShapeFcts .. also input Element? 
+  int arbitraryLeafIndex =  parameterSet.get<unsigned int>("arbitraryLeafIndex", 0);  // localIdx..assert Number < #ShapeFcts .. also input Element? 
   int arbitraryElementNumber =  parameterSet.get<unsigned int>("arbitraryElementNumber", 0);
 
   FieldVector<int,3> row;                             
-  row = arbitraryComponentwiseIndices(Basis_CE,arbitraryElementNumber,arbitraryLocalIndex);
+  row = arbitraryComponentwiseIndices(Basis_CE,arbitraryElementNumber,arbitraryLeafIndex);
   printvector(std::cout, row, "row" , "--");
 
   /////////////////////////////////////////////////////////
@@ -1676,11 +1676,11 @@ int main(int argc, char *argv[])
   //////////////////////////////////////////////////////////////////////
   // Determine global indices of components for arbitrary (local) index        
   //////////////////////////////////////////////////////////////////////
-//   int arbitraryLocalIndex =  parameterSet.get<unsigned int>("arbitraryLocalIndex", 0);  // localIdx..assert Number < #ShapeFcts .. also input Element? 
+//   int arbitraryLeafIndex =  parameterSet.get<unsigned int>("arbitraryLeafIndex", 0);  // localIdx..assert Number < #ShapeFcts .. also input Element? 
 //   int arbitraryElementNumber =  parameterSet.get<unsigned int>("arbitraryElementNumber", 0);
 // 
 //   FieldVector<int,3> row;                             
-//   row = arbitraryComponentwiseIndices(Basis_CE,arbitraryElementNumber,arbitraryLocalIndex);
+//   row = arbitraryComponentwiseIndices(Basis_CE,arbitraryElementNumber,arbitraryLeafIndex);
 //   printvector(std::cout, row, "row" , "--");
 //