diff --git a/README.md b/README.md
index 9dac31a1e9cc340b33901dfa924b68c37cfd5122..1d3078c8a66ab268fd8d0e793159f1f7726c545f 100644
--- a/README.md
+++ b/README.md
@@ -605,9 +605,8 @@ Parameters:
 ```java
 shapefileWrite
 {
-    type        shapefileWrite;
-
-    libs    ("libfaAvalanche.so");
+    type    shapefileWrite;
+    libs    (faAvalanche);
 
     //fields     (".*"); //All fields
     fields      (h Us);
@@ -653,13 +652,12 @@ Parameters:
 ```java
 gridfileWrite
 {
-    type        gridfileWrite;
-
-    secondOrder on;
+    type    gridfileWrite;
+    libs    (faAvalanche);
 
-    libs    ("libfaAvalanche.so");
+    fields  (h Us);
 
-    fields      (h Us);
+    secondOrder on;
 
     writeOption autoWrite;
     //writeOption anyWrite;
@@ -690,11 +688,10 @@ Parameters:
 ```java
 autoAreaToVolumeMapping
 {
-    type        autoAreaToVolumeMapping;
-
-    libs    ("libfaAvalanche.so");
+    type    autoAreaToVolumeMapping;
+    libs    (faAvalanche);
 
-    fields     (".*");
+    fields  (".*");
 
     writeOption autoWrite;
     //writeOption anyWrite;
diff --git a/tutorials/simpleslope/system/autoAreaToVolumeMapping b/tutorials/simpleslope/system/autoAreaToVolumeMapping
index c142e8e5b0d1f613b4741f376e79b7ef92025f9d..e520b5db627664aff0f3dd985eda559ceaaa3339 100644
--- a/tutorials/simpleslope/system/autoAreaToVolumeMapping
+++ b/tutorials/simpleslope/system/autoAreaToVolumeMapping
@@ -1,13 +1,12 @@
 // -*- C++ -*-
-// Use the areaWrite function object
+// Use autoAreaToVolumeMapping function object
 
 autoAreaToVolumeMapping
 {
-    type        autoAreaToVolumeMapping;
-    
-    libs    ("libfaAvalanche.so");
-    
-    fields     (".*");
+    type    autoAreaToVolumeMapping;
+    libs    (faAvalanche);
+
+    fields  (".*");
 
     writeOption autoWrite;
     //writeOption noWrite;
diff --git a/tutorials/simpleslope/system/gridfileWrite b/tutorials/simpleslope/system/gridfileWrite
index e74e972cc1eb7f1d5fb6baf5713cfe587648da6f..3c43ee81644f647b4492af344eb1e618d9926c20 100644
--- a/tutorials/simpleslope/system/gridfileWrite
+++ b/tutorials/simpleslope/system/gridfileWrite
@@ -1,15 +1,14 @@
 // -*- C++ -*-
-// Use the areaWrite function object
+// Use gridfileWrite function object
 
 gridfileWrite
 {
-    type        gridfileWrite;
-    
-    secondOrder on;
+    type    gridfileWrite;
+    libs    (faAvalanche);
+
+    fields  (".*");
 
-    libs    ("libfaAvalanche.so");
-    
-    fields     (".*");
+    secondOrder on;
 
     writeOption autoWrite;
     //writeOption noWrite;
@@ -17,7 +16,6 @@ gridfileWrite
 
     postfix  ".asc";
 
-
     dx 0.01;
     dy 0.01;
 }
diff --git a/tutorials/simpleslope/system/shapefileWrite b/tutorials/simpleslope/system/shapefileWrite
index 2f2fbe7c4028c8c7301d23cfa0d231c267f9d8e0..6ee63bd7c57f66ee337b549274900d8784d690b3 100644
--- a/tutorials/simpleslope/system/shapefileWrite
+++ b/tutorials/simpleslope/system/shapefileWrite
@@ -1,13 +1,12 @@
 // -*- C++ -*-
-// Use the areaWrite function object
+// Use shapefileWrite function object
 
 shapefileWrite
 {
-    type        shapefileWrite;
-    
-    libs    ("libfaAvalanche.so");
-    
-    fields     (".*");
+    type    shapefileWrite;
+    libs    (faAvalanche);
+
+    fields  (".*");
 
     writeOption autoWrite;
     //writeOption noWrite;
diff --git a/tutorials/wolfsgrube/system/areaWrite b/tutorials/wolfsgrube/system/areaWrite
index dd2b052d911742475bde16433ea64a37ecdee9bc..0c03e770d20a3fc9de94fcf33a4584f216fab3cf 100644
--- a/tutorials/wolfsgrube/system/areaWrite
+++ b/tutorials/wolfsgrube/system/areaWrite
@@ -4,7 +4,7 @@
 areaWrite
 {
     type    areaWrite;
-    libs    ("libutilityFunctionObjects.so");
+    libs    (utilityFunctionObjects);
     log     true;
 
     writeControl    writeTime;
diff --git a/tutorials/wolfsgrube/system/autoAreaToVolumeMapping b/tutorials/wolfsgrube/system/autoAreaToVolumeMapping
index c142e8e5b0d1f613b4741f376e79b7ef92025f9d..e520b5db627664aff0f3dd985eda559ceaaa3339 100644
--- a/tutorials/wolfsgrube/system/autoAreaToVolumeMapping
+++ b/tutorials/wolfsgrube/system/autoAreaToVolumeMapping
@@ -1,13 +1,12 @@
 // -*- C++ -*-
-// Use the areaWrite function object
+// Use autoAreaToVolumeMapping function object
 
 autoAreaToVolumeMapping
 {
-    type        autoAreaToVolumeMapping;
-    
-    libs    ("libfaAvalanche.so");
-    
-    fields     (".*");
+    type    autoAreaToVolumeMapping;
+    libs    (faAvalanche);
+
+    fields  (".*");
 
     writeOption autoWrite;
     //writeOption noWrite;
diff --git a/tutorials/wolfsgrube/system/gridfileWrite b/tutorials/wolfsgrube/system/gridfileWrite
index 3928a613f6b72cd35da35a126eac1101467b06ea..b9be7aaf8a9e06adc1b25c791651f44a10305c1b 100644
--- a/tutorials/wolfsgrube/system/gridfileWrite
+++ b/tutorials/wolfsgrube/system/gridfileWrite
@@ -1,15 +1,14 @@
 // -*- C++ -*-
-// Use the areaWrite function object
+// Use gridfileWrite function object
 
 gridfileWrite
 {
-    type        gridfileWrite;
-    
-    secondOrder on;
+    type    gridfileWrite;
+    libs    (faAvalanche);
+
+    fields  (".*");
 
-    libs    ("libfaAvalanche.so");
-    
-    fields     (".*");
+    secondOrder on;
 
     writeOption autoWrite;
     //writeOption noWrite;
@@ -26,9 +25,8 @@ gridfileWrite
 
     postfix  ".asc";
 
-    //offset is interpreterpreted such that the same signs than in gridToSTLDict can be used
+    //offset is interpreted such that the same signs than in gridToSTLDict can be used
     offset (5000.0 -220000.0 0);
-
 }
 
 // ************************************************************************* //
diff --git a/tutorials/wolfsgrube/system/shapefileWrite b/tutorials/wolfsgrube/system/shapefileWrite
index 5529829bf4ff9578c5cae7414c7ef703fb3a9703..d6238dbfff2f9274c81d655561f0137186995360 100644
--- a/tutorials/wolfsgrube/system/shapefileWrite
+++ b/tutorials/wolfsgrube/system/shapefileWrite
@@ -1,13 +1,12 @@
 // -*- C++ -*-
-// Use the areaWrite function object
+// Use shapefileWrite function object
 
 shapefileWrite
 {
-    type        shapefileWrite;
-    
-    libs    ("libfaAvalanche.so");
-    
-    fields     (".*");
+    type    shapefileWrite;
+    libs    (faAvalanche);
+
+    fields  (".*");
 
     writeOption autoWrite;
     //writeOption noWrite;