diff --git a/dumux/boxmodels/1p/1pfluxvariables.hh b/dumux/boxmodels/1p/1pfluxvariables.hh
index 511f4eab7e184311596ed494fdf6746dfee809e4..8c52db76ee3429beef0ac73e52c6b4435fa1a4e3 100644
--- a/dumux/boxmodels/1p/1pfluxvariables.hh
+++ b/dumux/boxmodels/1p/1pfluxvariables.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2011 by Katherina Baber
  *   Copyright (C) 2008-2009 by Onur Dogan                                   *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/1p/1pindices.hh b/dumux/boxmodels/1p/1pindices.hh
index e6e840b48d4573c4947f090522be2e269b134e36..996cfe44f4eef0fc23e0310b77841e7d1225c940 100644
--- a/dumux/boxmodels/1p/1pindices.hh
+++ b/dumux/boxmodels/1p/1pindices.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/1p/1plocalresidual.hh b/dumux/boxmodels/1p/1plocalresidual.hh
index eeb39d9d831fb97be764dc6eb6114d883049e9b7..76646e596d005d35289258b199a686958f4d3fab 100644
--- a/dumux/boxmodels/1p/1plocalresidual.hh
+++ b/dumux/boxmodels/1p/1plocalresidual.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
  *   Copyright (C) 2009 by Onur Dogan                                        *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/1p/1pmodel.hh b/dumux/boxmodels/1p/1pmodel.hh
index 8a59e132385783d24215b387d1b242de3bdcf6bc..2129d9df7d0cd8de1657eb467b8eec6b636374b6 100644
--- a/dumux/boxmodels/1p/1pmodel.hh
+++ b/dumux/boxmodels/1p/1pmodel.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
  *   Copyright (C) 2009 by Onur Dogan                                        *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/1p/1pproblem.hh b/dumux/boxmodels/1p/1pproblem.hh
index 21a84fe155531581dfec653ad9d12aad1d304855..85e40f8fb68a7ca52ae3a73f35bbeb8418d3a8bd 100644
--- a/dumux/boxmodels/1p/1pproblem.hh
+++ b/dumux/boxmodels/1p/1pproblem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/1p/1pproperties.hh b/dumux/boxmodels/1p/1pproperties.hh
index c0027dfc7cc8752300665c8ad40a75cb25ed8016..f3674f21479a81c6f4073dcf274c7e797e888f9c 100644
--- a/dumux/boxmodels/1p/1pproperties.hh
+++ b/dumux/boxmodels/1p/1pproperties.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/1p/1ppropertydefaults.hh b/dumux/boxmodels/1p/1ppropertydefaults.hh
index 4e53006fd21944d1758c383aaec1cb5e806b062c..073c7e06be29fcf9a01522b688a24251ce67475a 100644
--- a/dumux/boxmodels/1p/1ppropertydefaults.hh
+++ b/dumux/boxmodels/1p/1ppropertydefaults.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/1p/1pvolumevariables.hh b/dumux/boxmodels/1p/1pvolumevariables.hh
index 9fd599144295210a835b8fe7248f5cb35fb58df0..d8253c4887895159b34e7e0671a9eccd77a1f6a8 100644
--- a/dumux/boxmodels/1p/1pvolumevariables.hh
+++ b/dumux/boxmodels/1p/1pvolumevariables.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008 by Onur Dogan                                        *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
index 0d382e713cef31f8f535e32c06775aeca04d5907..ca4e585e2692bc8cb3423e987f899d23c9250f9a 100644
--- a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2009 by Karin Erbertseder                                 *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/1p2c/1p2cindices.hh b/dumux/boxmodels/1p2c/1p2cindices.hh
index 09e4abab5e261561be7bcb226d404bb7e158a9e7..76128c656224277ffbbf20dca2dc8597aa19ca4b 100644
--- a/dumux/boxmodels/1p2c/1p2cindices.hh
+++ b/dumux/boxmodels/1p2c/1p2cindices.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2009 by Karin Erbertseder                                 *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/1p2c/1p2clocalresidual.hh b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
index 7d3904ab6acff25fde45acc883fb7c10d0ded4c1..a8f23bdd663673a5c1e9ef45d75859228d5882f8 100644
--- a/dumux/boxmodels/1p2c/1p2clocalresidual.hh
+++ b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2009 by Karin Erbertseder                                 *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/1p2c/1p2cmodel.hh b/dumux/boxmodels/1p2c/1p2cmodel.hh
index 1f896601561befb3de9ae3bf39525a6562a8ce89..1d4a893954c5ffd71a8163ea5a5fd5b0f13ebe70 100644
--- a/dumux/boxmodels/1p2c/1p2cmodel.hh
+++ b/dumux/boxmodels/1p2c/1p2cmodel.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2009 by Karin Erbertseder                                 *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/1p2c/1p2cproblem.hh b/dumux/boxmodels/1p2c/1p2cproblem.hh
index 6d0a054806eaf002835092cf71a9c1cad02f5431..8a4ee0dc8dd505dbe83604296188e28ebdfc2ba3 100644
--- a/dumux/boxmodels/1p2c/1p2cproblem.hh
+++ b/dumux/boxmodels/1p2c/1p2cproblem.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2009 by Karin Erbertseder                                 *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/1p2c/1p2cproperties.hh b/dumux/boxmodels/1p2c/1p2cproperties.hh
index 30e141315dc11bd07389936bcdcdc848530e0f57..1a4d5c1bbd1d14f80225304403b59f6e248a00a9 100644
--- a/dumux/boxmodels/1p2c/1p2cproperties.hh
+++ b/dumux/boxmodels/1p2c/1p2cproperties.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2009 by Karin Erbertseder                                 *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh b/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh
index 99a5cbdf8904abe7b8d175d5721a9c7cb664e06a..acf845de2ec31ca6d6aa1ec7634b983f45b0d401 100644
--- a/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh
+++ b/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2009 by Karin Erbertseder                                 *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/1p2c/1p2cvolumevariables.hh b/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
index 2cd4ca9fb434d0d40f88b0e81c4f4df28773846c..7bfaaf91d382e21be5bf7587e9158d6a8e0e38a1 100644
--- a/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2009-2011 by Andreas Lauser                               *
  *   Copyright (C) 2009 by Karin Erbertseder                                 *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p/2pfluxvariables.hh b/dumux/boxmodels/2p/2pfluxvariables.hh
index c4f0f41bcee8d32ddc137b9cdeb53c20034b2614..bbf97881b50f0a636ad9e1d663a14193e3e60256 100644
--- a/dumux/boxmodels/2p/2pfluxvariables.hh
+++ b/dumux/boxmodels/2p/2pfluxvariables.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p/2pindices.hh b/dumux/boxmodels/2p/2pindices.hh
index 433b2981f08426eacdaa88b3ff30a33ea0f8e267..e09647895939c5befe2276dd70e90c4bee0871b8 100644
--- a/dumux/boxmodels/2p/2pindices.hh
+++ b/dumux/boxmodels/2p/2pindices.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p/2plocalresidual.hh b/dumux/boxmodels/2p/2plocalresidual.hh
index 1c9a2a1f0e366e4bb43bbde84f45b271e99c4627..989edd6a738460905e74e15298b420e3e2c899ef 100644
--- a/dumux/boxmodels/2p/2plocalresidual.hh
+++ b/dumux/boxmodels/2p/2plocalresidual.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2007-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p/2pmodel.hh b/dumux/boxmodels/2p/2pmodel.hh
index fd46ba12e4cb6890823f9b60daf614dbc54bba63..406254d59bb1bb4f721819bbb211f680613c3391 100644
--- a/dumux/boxmodels/2p/2pmodel.hh
+++ b/dumux/boxmodels/2p/2pmodel.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2007-2007 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p/2pproblem.hh b/dumux/boxmodels/2p/2pproblem.hh
index b34ded32a03736c46d3fc6d133fb7f9bc13d39d4..e8b14d3311e85589bd09afa51bf88ba951905881 100644
--- a/dumux/boxmodels/2p/2pproblem.hh
+++ b/dumux/boxmodels/2p/2pproblem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p/2pproperties.hh b/dumux/boxmodels/2p/2pproperties.hh
index 3464af4803752c72c85084afb5928493b71a2e4b..d006a091929d398b5a384f98c4f5e9320b477a94 100644
--- a/dumux/boxmodels/2p/2pproperties.hh
+++ b/dumux/boxmodels/2p/2pproperties.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p/2ppropertydefaults.hh b/dumux/boxmodels/2p/2ppropertydefaults.hh
index 7ad923dc8554f72a625af145d787a605f1e9ebef..a92f48c536fdeead6063087c6f118fe6c55d4e57 100644
--- a/dumux/boxmodels/2p/2ppropertydefaults.hh
+++ b/dumux/boxmodels/2p/2ppropertydefaults.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p/2pvolumevariables.hh b/dumux/boxmodels/2p/2pvolumevariables.hh
index 03a3c7125c4356cd84200e441ace690c949c2378..157f5afcabb1ee71e0899a90ce63215b2a43ef20 100644
--- a/dumux/boxmodels/2p/2pvolumevariables.hh
+++ b/dumux/boxmodels/2p/2pvolumevariables.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2011 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2011 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p2c/2p2cfluxvariables.hh b/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
index dc31f3756768e2da64639d0b179c58bbbf0cc7b3..0164a00f95a049fa31a127ff9d253a6c7603abba 100644
--- a/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
+++ b/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p2c/2p2cindices.hh b/dumux/boxmodels/2p2c/2p2cindices.hh
index b578c2e5edd19bf73a54b77c8faaf8d0d5795e5d..01cad0b8dcdf8ecdb6ce7fe11adc0e370f1ba97d 100644
--- a/dumux/boxmodels/2p2c/2p2cindices.hh
+++ b/dumux/boxmodels/2p2c/2p2cindices.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Klaus Mosthaf, Andreas Lauser, Bernd Flemisch     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p2c/2p2clocalresidual.hh b/dumux/boxmodels/2p2c/2p2clocalresidual.hh
index 883fe53f9a90ab73bc583b45e770a49beba276b2..4aa9b3bf465cc93cc5fbf5573fa39e49bd396602 100644
--- a/dumux/boxmodels/2p2c/2p2clocalresidual.hh
+++ b/dumux/boxmodels/2p2c/2p2clocalresidual.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Bernd Flemisch                               *
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p2c/2p2cmodel.hh b/dumux/boxmodels/2p2c/2p2cmodel.hh
index e7bfdedfe12874301fdc5edf7c915b2d4082b56e..b2f0cdf80520005e0adfdf4fde746c222e253180 100644
--- a/dumux/boxmodels/2p2c/2p2cmodel.hh
+++ b/dumux/boxmodels/2p2c/2p2cmodel.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Klaus Mosthaf, Andreas Lauser, Bernd Flemisch     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh b/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh
index 693bfa4b9a4b7358359a10499067aa1069f32dfc..d1a34209a7cca72bc4c0b58a93679ad726bf5824 100644
--- a/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh
+++ b/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Bernd Flemisch, Andreas Lauser                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p2c/2p2cproblem.hh b/dumux/boxmodels/2p2c/2p2cproblem.hh
index 984d0f098a9401b4b05421ffe05efeb9ed6bccff..7771c7cc1fe5e51625e97af8d227fd1bd112268f 100644
--- a/dumux/boxmodels/2p2c/2p2cproblem.hh
+++ b/dumux/boxmodels/2p2c/2p2cproblem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p2c/2p2cproperties.hh b/dumux/boxmodels/2p2c/2p2cproperties.hh
index 2d5498dd80c1c207d8732326f7740f09791c5cea..d4f45398a77d8cf9af96a38f22a47f18e4ab804d 100644
--- a/dumux/boxmodels/2p2c/2p2cproperties.hh
+++ b/dumux/boxmodels/2p2c/2p2cproperties.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2008-2009 by Melanie Darcis                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh b/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh
index a7b03326721b43607ce4fd2669774386c006e67c..7711abce8de7b1f352255558cb6463f1a604e692 100644
--- a/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh
+++ b/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Klaus Mosthaf, Andreas Lauser, Bernd Flemisch     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p2c/2p2cvolumevariables.hh b/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
index 8d5bd5801977709443193463ed338f1e817d82e3..b5ab58c16d861194041584442ae3a4f0dc994ba5 100644
--- a/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
+++ b/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2008,2009 by Klaus Mosthaf,                               *
  *                              Andreas Lauser,                              *
  *                              Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh b/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
index a85c56f252e48356d96a2dbc197ac26d845f52ce..54d49e5250c88305bc372e436e978640954f78ba 100644
--- a/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2008-2009 by Melanie Darcis                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p2cni/2p2cniindices.hh b/dumux/boxmodels/2p2cni/2p2cniindices.hh
index 7221f35e82d3a20bccc0c72c35b1eb293e192209..5fc42139665cf499f7c65a6c269fdc7ca1382372 100644
--- a/dumux/boxmodels/2p2cni/2p2cniindices.hh
+++ b/dumux/boxmodels/2p2cni/2p2cniindices.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2008-2009 by Melanie Darcis                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh b/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh
index e3dc0d3ab2577be0622d9c399967b5183cf1daaa..e8b0b004fc35133356e689953267488088cec3b0 100644
--- a/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2008-2009 by Melanie Darcis                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p2cni/2p2cnimodel.hh b/dumux/boxmodels/2p2cni/2p2cnimodel.hh
index 241c228ec5e809c07e247d1ed2e5a03706c031a8..2f551b8fb18a8f4def11560643aa9d8e5991d48c 100644
--- a/dumux/boxmodels/2p2cni/2p2cnimodel.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnimodel.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2008-2009 by Melanie Darcis                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p2cni/2p2cniproblem.hh b/dumux/boxmodels/2p2cni/2p2cniproblem.hh
index 7666f7a4b0413fa65275fb3fb6e00301e9263ebe..b9974e800ffc16f749b588903fd7e61c035f0e2e 100644
--- a/dumux/boxmodels/2p2cni/2p2cniproblem.hh
+++ b/dumux/boxmodels/2p2cni/2p2cniproblem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p2cni/2p2cniproperties.hh b/dumux/boxmodels/2p2cni/2p2cniproperties.hh
index 4a9217bd961d8e46186c08d5f0758bb9d4792c56..8d0a8facce38b3212ed899d66f227830b6c3ab25 100644
--- a/dumux/boxmodels/2p2cni/2p2cniproperties.hh
+++ b/dumux/boxmodels/2p2cni/2p2cniproperties.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Klaus Mosthaf, Andreas Lauser, Bernd Flemisch     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh b/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh
index 3cc12d87fe4d7dc8a48d3afaa48545b651cbf133..ae9839896d83387f9c12c9327788f846debd68dc 100644
--- a/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2008-2009 by Melanie Darcis                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh b/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh
index a0638f62d0be27428e72ebeee5033d02c1cabe47..48c6a9d0056bc8a3d1d3c97fcaffd836131e2e47 100644
--- a/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *                                                                           *
  *   This program is free software: you can redistribute it and/or modify    *
diff --git a/dumux/boxmodels/2pni/2pnifluxvariables.hh b/dumux/boxmodels/2pni/2pnifluxvariables.hh
index 4d01e24ef2f5d5507dd8fb1853c6ce201402a2de..51451e21d8a99f77f84824688b212bc2dadf009e 100644
--- a/dumux/boxmodels/2pni/2pnifluxvariables.hh
+++ b/dumux/boxmodels/2pni/2pnifluxvariables.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2pni/2pniindices.hh b/dumux/boxmodels/2pni/2pniindices.hh
index b41bf743bfc22d03b65d1e52e986d48214a6427b..b5911e8df70f7d832ed323f3862a0020f4ed3d2f 100644
--- a/dumux/boxmodels/2pni/2pniindices.hh
+++ b/dumux/boxmodels/2pni/2pniindices.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2008 by Klaus Mosthaf                                     *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008 Bernd Flemisch                                       *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2pni/2pnilocalresidual.hh b/dumux/boxmodels/2pni/2pnilocalresidual.hh
index bc0353033b7e7132f46c2124a5c0dbd88e0441ad..8500dc7c6720b022b7b07205e1533a82c02d271c 100644
--- a/dumux/boxmodels/2pni/2pnilocalresidual.hh
+++ b/dumux/boxmodels/2pni/2pnilocalresidual.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2008-2009 by Melanie Darcis                               *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2pni/2pnimodel.hh b/dumux/boxmodels/2pni/2pnimodel.hh
index e027b67ab153e020fd5637c794f65243d1af7716..22233737f0d15cc4f69c4650b067e0ea1c6beed8 100644
--- a/dumux/boxmodels/2pni/2pnimodel.hh
+++ b/dumux/boxmodels/2pni/2pnimodel.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Andreas Lauser, Bernd Flemisch                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2pni/2pniproblem.hh b/dumux/boxmodels/2pni/2pniproblem.hh
index 76d11d6b1c01d50360fb5df4b3e8df268766996c..040b84e98c8831a6ea20ae3b8d5c89efca87737a 100644
--- a/dumux/boxmodels/2pni/2pniproblem.hh
+++ b/dumux/boxmodels/2pni/2pniproblem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2pni/2pniproperties.hh b/dumux/boxmodels/2pni/2pniproperties.hh
index 344b16b2e9402f50828762a1ead45c7bc860cb90..2b73505f5c453b2549cec9a59790d6ed5ef77601 100644
--- a/dumux/boxmodels/2pni/2pniproperties.hh
+++ b/dumux/boxmodels/2pni/2pniproperties.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2008 by Klaus Mosthaf                                     *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008 Bernd Flemisch                                       *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2pni/2pnipropertydefaults.hh b/dumux/boxmodels/2pni/2pnipropertydefaults.hh
index 3af161a379326196b82752c1152f966f19fdcb15..c488ebabf827df30b80914d29a8c679ee8b123ab 100644
--- a/dumux/boxmodels/2pni/2pnipropertydefaults.hh
+++ b/dumux/boxmodels/2pni/2pnipropertydefaults.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2008 by Klaus Mosthaf                                     *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008 Bernd Flemisch                                       *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/2pni/2pnivolumevariables.hh b/dumux/boxmodels/2pni/2pnivolumevariables.hh
index e954f871d0455b71063cd5249df9271d84529975..8c44146814aafba6a94b590aedc58a7ac948b26c 100644
--- a/dumux/boxmodels/2pni/2pnivolumevariables.hh
+++ b/dumux/boxmodels/2pni/2pnivolumevariables.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Melanie Darcis                               *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *                                                                           *
  *   This program is free software: you can redistribute it and/or modify    *
diff --git a/dumux/boxmodels/3p3c/3p3cfluxvariables.hh b/dumux/boxmodels/3p3c/3p3cfluxvariables.hh
index 06a976e19e8f71badf6ed7efba87e0c154cf8edb..8639d9be2472b089134386b840026d76fbc1c5ef 100644
--- a/dumux/boxmodels/3p3c/3p3cfluxvariables.hh
+++ b/dumux/boxmodels/3p3c/3p3cfluxvariables.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/3p3c/3p3cindices.hh b/dumux/boxmodels/3p3c/3p3cindices.hh
index 570dcb8bef04a67f7f0ea647f6c6bd6b75bd21c8..b2cac440d2c3ceffe88dc60decb6c0b401e6ce16 100644
--- a/dumux/boxmodels/3p3c/3p3cindices.hh
+++ b/dumux/boxmodels/3p3c/3p3cindices.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/3p3c/3p3clocalresidual.hh b/dumux/boxmodels/3p3c/3p3clocalresidual.hh
index e16808b0ee79e3cc3731a401643877ae442568d1..967c5d7516cd198a8775a1b33ee64838ab2b0d3c 100644
--- a/dumux/boxmodels/3p3c/3p3clocalresidual.hh
+++ b/dumux/boxmodels/3p3c/3p3clocalresidual.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Bernd Flemisch                               *
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/3p3c/3p3cmodel.hh b/dumux/boxmodels/3p3c/3p3cmodel.hh
index f994187f41d30dc04fd724f40b8586de26dc4cbd..a6118389b87c69eea9907c729e8c6ab24e259adc 100644
--- a/dumux/boxmodels/3p3c/3p3cmodel.hh
+++ b/dumux/boxmodels/3p3c/3p3cmodel.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/3p3c/3p3cnewtoncontroller.hh b/dumux/boxmodels/3p3c/3p3cnewtoncontroller.hh
index 4c4299c04bb214b421466f00237aad8115f6da52..db4b2c05c799d036b319b645101c28178a0d6de1 100644
--- a/dumux/boxmodels/3p3c/3p3cnewtoncontroller.hh
+++ b/dumux/boxmodels/3p3c/3p3cnewtoncontroller.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2011-2012 by Holger Class                                 *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/3p3c/3p3cproblem.hh b/dumux/boxmodels/3p3c/3p3cproblem.hh
index 1f4c4359a1723baf14d09b6d613db0960b476491..798db6b21a6150348b6f80b1e40b0a483c29313c 100644
--- a/dumux/boxmodels/3p3c/3p3cproblem.hh
+++ b/dumux/boxmodels/3p3c/3p3cproblem.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2011 by Holger Class                                      *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/3p3c/3p3cproperties.hh b/dumux/boxmodels/3p3c/3p3cproperties.hh
index a330cd67754140a4f8190d1cb3c2d7d2416de41f..9124731b6414af3f091b44c023b00d1e5531027b 100644
--- a/dumux/boxmodels/3p3c/3p3cproperties.hh
+++ b/dumux/boxmodels/3p3c/3p3cproperties.hh
@@ -6,7 +6,7 @@
  *   Copyright (C) 2008-2009 by Melanie Darcis                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh b/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh
index 3d3a4a0da6d1ca6ad039ebab78f59bff31ea0a38..0afbbb8274ded4b952a89f30138abbbefa9b0fa0 100644
--- a/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh
+++ b/dumux/boxmodels/3p3c/3p3cpropertydefaults.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2008-2011 by Andreas Lauser                               *
  *   Copyright (C) 2008-2010 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2010 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/3p3c/3p3cvolumevariables.hh b/dumux/boxmodels/3p3c/3p3cvolumevariables.hh
index 6e34786d48ed0f7522f109c6006eec6c8f92a462..93e973eb03301394429f2e1c56461f851d7c6a00 100644
--- a/dumux/boxmodels/3p3c/3p3cvolumevariables.hh
+++ b/dumux/boxmodels/3p3c/3p3cvolumevariables.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/3p3cni/3p3cnifluxvariables.hh b/dumux/boxmodels/3p3cni/3p3cnifluxvariables.hh
index c5d88884cccdad61ce8f963b2f2efbcfff284407..2e2a88373f2f1aa9df83dd34a337fde75c21c14b 100644
--- a/dumux/boxmodels/3p3cni/3p3cnifluxvariables.hh
+++ b/dumux/boxmodels/3p3cni/3p3cnifluxvariables.hh
@@ -6,7 +6,7 @@
  *   Copyright (C) 2008-2009 by Melanie Darcis                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/3p3cni/3p3cniindices.hh b/dumux/boxmodels/3p3cni/3p3cniindices.hh
index 305a20856aa05738976e38dcfb33728b7b0d56d0..7dcb774bd1483340037b108e9859ce7f9dc6619c 100644
--- a/dumux/boxmodels/3p3cni/3p3cniindices.hh
+++ b/dumux/boxmodels/3p3cni/3p3cniindices.hh
@@ -6,7 +6,7 @@
  *   Copyright (C) 2008-2009 by Melanie Darcis                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/3p3cni/3p3cnilocalresidual.hh b/dumux/boxmodels/3p3cni/3p3cnilocalresidual.hh
index 582cda3e315d6994e2b5aa3af7c0708e7fb4363d..a787b5f063e953211ee8cc90d2bd79af7d1fa4ed 100644
--- a/dumux/boxmodels/3p3cni/3p3cnilocalresidual.hh
+++ b/dumux/boxmodels/3p3cni/3p3cnilocalresidual.hh
@@ -6,7 +6,7 @@
  *   Copyright (C) 2008-2009 by Melanie Darcis                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/3p3cni/3p3cnimodel.hh b/dumux/boxmodels/3p3cni/3p3cnimodel.hh
index f13a52a4ac159f65c5f139393774cb4dbd61a438..233712bd74a76fb31ccffc9fd8cf7926b73b36c2 100644
--- a/dumux/boxmodels/3p3cni/3p3cnimodel.hh
+++ b/dumux/boxmodels/3p3cni/3p3cnimodel.hh
@@ -6,7 +6,7 @@
  *   Copyright (C) 2008-2009 by Melanie Darcis                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/3p3cni/3p3cniproblem.hh b/dumux/boxmodels/3p3cni/3p3cniproblem.hh
index 0dac26925c32f2c9d4f1dffaa07b151233426a60..74d92431e23f29dc40eed21f6d03396c40a554e9 100644
--- a/dumux/boxmodels/3p3cni/3p3cniproblem.hh
+++ b/dumux/boxmodels/3p3cni/3p3cniproblem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/3p3cni/3p3cniproperties.hh b/dumux/boxmodels/3p3cni/3p3cniproperties.hh
index b3c259fe17838380b69b19ddbfed5930f02110d0..7f840fa3f97702139d78c5ebc6c38d804926c726 100644
--- a/dumux/boxmodels/3p3cni/3p3cniproperties.hh
+++ b/dumux/boxmodels/3p3cni/3p3cniproperties.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2011 by Holger Class                                      *
  *   Copyright (C) 2008 by Klaus Mosthaf, Andreas Lauser, Bernd Flemisch     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/3p3cni/3p3cnipropertydefaults.hh b/dumux/boxmodels/3p3cni/3p3cnipropertydefaults.hh
index 817684adcca0a8716784548a7945d256bf721b7e..0038549efc0b3195b608bc2841e00b243f162102 100644
--- a/dumux/boxmodels/3p3cni/3p3cnipropertydefaults.hh
+++ b/dumux/boxmodels/3p3cni/3p3cnipropertydefaults.hh
@@ -6,7 +6,7 @@
  *   Copyright (C) 2008-2009 by Melanie Darcis                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/3p3cni/3p3cnivolumevariables.hh b/dumux/boxmodels/3p3cni/3p3cnivolumevariables.hh
index 2b83d4ed5bd93c6dbf77fcecf7424c9e514d26d7..09f9360c1dc9110748632bafb2b12ae9f8a1dfc1 100644
--- a/dumux/boxmodels/3p3cni/3p3cnivolumevariables.hh
+++ b/dumux/boxmodels/3p3cni/3p3cnivolumevariables.hh
@@ -6,7 +6,7 @@
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *                                                                           *
  *   This program is free software: you can redistribute it and/or modify    *
diff --git a/dumux/boxmodels/MpNc/MpNcfluxvariables.hh b/dumux/boxmodels/MpNc/MpNcfluxvariables.hh
index 89333760abb3e6c30fbdb26406f8f2497eae514d..78df9b7faecc580bb57910434c24e90925a2fa95 100644
--- a/dumux/boxmodels/MpNc/MpNcfluxvariables.hh
+++ b/dumux/boxmodels/MpNc/MpNcfluxvariables.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/MpNcindices.hh b/dumux/boxmodels/MpNc/MpNcindices.hh
index 146e39d53ebb8d3e85d13029cc74af24305ef8e8..aa84ce8c7cf944f55818f57461583c4616e1e61b 100644
--- a/dumux/boxmodels/MpNc/MpNcindices.hh
+++ b/dumux/boxmodels/MpNc/MpNcindices.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/MpNclocalresidual.hh b/dumux/boxmodels/MpNc/MpNclocalresidual.hh
index 9774a03f391122e53a982676b38dce3e94d870a7..3829aae03b21ae009aae8ac1da3a2259773816a1 100644
--- a/dumux/boxmodels/MpNc/MpNclocalresidual.hh
+++ b/dumux/boxmodels/MpNc/MpNclocalresidual.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/MpNcmodel.hh b/dumux/boxmodels/MpNc/MpNcmodel.hh
index f1f05de3ffeab2adacbcc8e1965fbac7b44327fe..68fd293fdfabe550906ef4a68bd985c87284d340 100644
--- a/dumux/boxmodels/MpNc/MpNcmodel.hh
+++ b/dumux/boxmodels/MpNc/MpNcmodel.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009-2012 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/MpNcnewtoncontroller.hh b/dumux/boxmodels/MpNc/MpNcnewtoncontroller.hh
index 9c3f0a9bbb4626446bacb0709b0d651913b94e61..eb411d36d0cf171c3595f03dcea1893889399129 100644
--- a/dumux/boxmodels/MpNc/MpNcnewtoncontroller.hh
+++ b/dumux/boxmodels/MpNc/MpNcnewtoncontroller.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/MpNcproblem.hh b/dumux/boxmodels/MpNc/MpNcproblem.hh
index 43eb2eef1a1095f06a60406aa3fb745df6b525d3..94c40f5b33e5923e7488367acfda677cb79800f8 100644
--- a/dumux/boxmodels/MpNc/MpNcproblem.hh
+++ b/dumux/boxmodels/MpNc/MpNcproblem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/MpNcproperties.hh b/dumux/boxmodels/MpNc/MpNcproperties.hh
index 29ff49fabd67995db050f994db5570ff4792cd94..0e59947c24a119cc00a6471e4fd5f12b905f2ed6 100644
--- a/dumux/boxmodels/MpNc/MpNcproperties.hh
+++ b/dumux/boxmodels/MpNc/MpNcproperties.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/MpNcpropertydefaults.hh b/dumux/boxmodels/MpNc/MpNcpropertydefaults.hh
index 07d6626bae6ec69dff93c18a73f9f8828bd20d06..5e1a6b82f96ce7c14ac5ae7f952d472b2bd1b55f 100644
--- a/dumux/boxmodels/MpNc/MpNcpropertydefaults.hh
+++ b/dumux/boxmodels/MpNc/MpNcpropertydefaults.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/MpNcvolumevariables.hh b/dumux/boxmodels/MpNc/MpNcvolumevariables.hh
index ca75a251cd70bc349740004b129be7d795c96550..a1b559ffdebadfe36c094077d03ebc55c36a7b66 100644
--- a/dumux/boxmodels/MpNc/MpNcvolumevariables.hh
+++ b/dumux/boxmodels/MpNc/MpNcvolumevariables.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2009-2011 by Andreas Lauser                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf,                               *
  *   Copyright (C) 2008-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/MpNcvolumevariablesia.hh b/dumux/boxmodels/MpNc/MpNcvolumevariablesia.hh
index b3b12041bcd3f83339d4ce50a09efe2c558298cd..a6767bd2fbb5d8f32660106bc411ac8b8187f0e8 100644
--- a/dumux/boxmodels/MpNc/MpNcvolumevariablesia.hh
+++ b/dumux/boxmodels/MpNc/MpNcvolumevariablesia.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010-2011 by Philipp Nuske                                *
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/MpNcvtkwriter.hh b/dumux/boxmodels/MpNc/MpNcvtkwriter.hh
index ce7875f7f78a787741252a60fd9219760782e553..f3ed86353b274ca53b31a4218c22781ed29f5ec5 100644
--- a/dumux/boxmodels/MpNc/MpNcvtkwriter.hh
+++ b/dumux/boxmodels/MpNc/MpNcvtkwriter.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/MpNcvtkwritercommon.hh b/dumux/boxmodels/MpNc/MpNcvtkwritercommon.hh
index 1f609349cf71386e85c97579b3bfd4df6fb1c891..36f58f28c8955b8e826f2c9a779f9788168765d6 100644
--- a/dumux/boxmodels/MpNc/MpNcvtkwritercommon.hh
+++ b/dumux/boxmodels/MpNc/MpNcvtkwritercommon.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/MpNcvtkwritermodule.hh b/dumux/boxmodels/MpNc/MpNcvtkwritermodule.hh
index 6fd7906f70c51c4c229e4abf4bca162f3b16fe96..c4104102ad141fb5732e0c6eec552ea2694aa1b7 100644
--- a/dumux/boxmodels/MpNc/MpNcvtkwritermodule.hh
+++ b/dumux/boxmodels/MpNc/MpNcvtkwritermodule.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/diffusion/diffusion.hh b/dumux/boxmodels/MpNc/diffusion/diffusion.hh
index dc0408a6c87f359fee1f7e4779e6a0d47f20af40..0bdeb57cc6743d532aa3d8c5cd6d0b0425778257 100644
--- a/dumux/boxmodels/MpNc/diffusion/diffusion.hh
+++ b/dumux/boxmodels/MpNc/diffusion/diffusion.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/diffusion/fluxvariables.hh b/dumux/boxmodels/MpNc/diffusion/fluxvariables.hh
index 8f99804257b0b3352a72b5e4c92789f0ad646b67..c747fa17c945af2d31499865b7eafa2b46cd5f4e 100644
--- a/dumux/boxmodels/MpNc/diffusion/fluxvariables.hh
+++ b/dumux/boxmodels/MpNc/diffusion/fluxvariables.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/diffusion/volumevariables.hh b/dumux/boxmodels/MpNc/diffusion/volumevariables.hh
index fc550c0e6bb1d1ac61cfacda9fc9989ef954b365..89013616a69f876f0a0efe1a3856753c18eab06d 100644
--- a/dumux/boxmodels/MpNc/diffusion/volumevariables.hh
+++ b/dumux/boxmodels/MpNc/diffusion/volumevariables.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/energy/MpNcfluxvariablesenergy.hh b/dumux/boxmodels/MpNc/energy/MpNcfluxvariablesenergy.hh
index a7309e296fc630c772e06005264a90c38a5e727c..046836d9f389b7c47bab66df1f91ffb5c35e5eb4 100644
--- a/dumux/boxmodels/MpNc/energy/MpNcfluxvariablesenergy.hh
+++ b/dumux/boxmodels/MpNc/energy/MpNcfluxvariablesenergy.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2008,2009 by Andreas Lauser                               *
  *   Copyright (C) 2008,2009 by Melanie Darcis                               *
  *                                                                           *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/energy/MpNcindicesenergy.hh b/dumux/boxmodels/MpNc/energy/MpNcindicesenergy.hh
index 285ba28b5faa6ff5fee2508f8b65053d2dddeec9..c44fc4a064ed6ca6706ede89871a7d20fdeca1ae 100644
--- a/dumux/boxmodels/MpNc/energy/MpNcindicesenergy.hh
+++ b/dumux/boxmodels/MpNc/energy/MpNcindicesenergy.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009-2011 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/energy/MpNclocalresidualenergy.hh b/dumux/boxmodels/MpNc/energy/MpNclocalresidualenergy.hh
index 2c0ab067765b9874927441eb40026490364acf51..053967450f769f8a5c158f337c1a316efb7701ef 100644
--- a/dumux/boxmodels/MpNc/energy/MpNclocalresidualenergy.hh
+++ b/dumux/boxmodels/MpNc/energy/MpNclocalresidualenergy.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009-2011 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/energy/MpNcvolumevariablesenergy.hh b/dumux/boxmodels/MpNc/energy/MpNcvolumevariablesenergy.hh
index 9a1b428726614f7b9e732c0133efca20d9f98503..0c35b629bb7c270bcea30ad85806521eb8504e57 100644
--- a/dumux/boxmodels/MpNc/energy/MpNcvolumevariablesenergy.hh
+++ b/dumux/boxmodels/MpNc/energy/MpNcvolumevariablesenergy.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2011 by Andreas Lauser                               *
  *   Copyright (C) 2008-2009 by Melanie Darcis                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/energy/MpNcvtkwriterenergy.hh b/dumux/boxmodels/MpNc/energy/MpNcvtkwriterenergy.hh
index a98953e0d1edf2566e46d8bd0d27952c90f909b3..f8a08ec7bd45d7cbdd01fcd23d54c06e6869ed34 100644
--- a/dumux/boxmodels/MpNc/energy/MpNcvtkwriterenergy.hh
+++ b/dumux/boxmodels/MpNc/energy/MpNcvtkwriterenergy.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/mass/MpNcindicesmass.hh b/dumux/boxmodels/MpNc/mass/MpNcindicesmass.hh
index a816f90f98d5afafe0bd73dbac121b644076bb32..1b76621cac88dec3b61246ab2d84e865f1ddc2d1 100644
--- a/dumux/boxmodels/MpNc/mass/MpNcindicesmass.hh
+++ b/dumux/boxmodels/MpNc/mass/MpNcindicesmass.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010-2011 by Philipp Nuske                                *
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh b/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh
index e3e89fe8036bd2c4ba89e7504c6588b14bf51e1c..ad6f49a70b89423b382ed1c72cecb02dce56215f 100644
--- a/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh
+++ b/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2009-2011 by Andreas Lauser                               *
  *   Copyright (C) 2011 by Philipp Nuske                                     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/mass/MpNcvolumevariablesmass.hh b/dumux/boxmodels/MpNc/mass/MpNcvolumevariablesmass.hh
index d57ca476329f819f8ac8cc9b89df5af3c535e2a1..7d54eff9111b5a95311cfa13294696e12527cb38 100644
--- a/dumux/boxmodels/MpNc/mass/MpNcvolumevariablesmass.hh
+++ b/dumux/boxmodels/MpNc/mass/MpNcvolumevariablesmass.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010-2011 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/MpNc/mass/MpNcvtkwritermass.hh b/dumux/boxmodels/MpNc/mass/MpNcvtkwritermass.hh
index 23d1117e3fa63d352ace2aad66ce2f146cfdbd51..6a83059dffcf8c206e61b2dd905e728698e15f7f 100644
--- a/dumux/boxmodels/MpNc/mass/MpNcvtkwritermass.hh
+++ b/dumux/boxmodels/MpNc/mass/MpNcvtkwritermass.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/common/boxassembler.hh b/dumux/boxmodels/common/boxassembler.hh
index 464ecd199f6cc9ff48d135aed5ca44933b2fac22..4f8249e11cf8ef1c25ac6c7896cbbfafaaa320e5 100644
--- a/dumux/boxmodels/common/boxassembler.hh
+++ b/dumux/boxmodels/common/boxassembler.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010-2011 by Andreas Lauser                               *
  *   Copyright (C) 2009-2010 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/common/boxelementboundarytypes.hh b/dumux/boxmodels/common/boxelementboundarytypes.hh
index cb7d270518f65ab8d61942f75684dcf2664890cd..44998ebbf5042548f657495b91aa0182ccf8e8e6 100644
--- a/dumux/boxmodels/common/boxelementboundarytypes.hh
+++ b/dumux/boxmodels/common/boxelementboundarytypes.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/common/boxelementvolumevariables.hh b/dumux/boxmodels/common/boxelementvolumevariables.hh
index e4687602880c93a9513894f0015d41661f36f061..bed72fa53111d5240c71c0d5056ec781a21d562b 100644
--- a/dumux/boxmodels/common/boxelementvolumevariables.hh
+++ b/dumux/boxmodels/common/boxelementvolumevariables.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/common/boxfvelementgeometry.hh b/dumux/boxmodels/common/boxfvelementgeometry.hh
index 3b8620c6e208ddff76c4f91351dcd89b3b94dc53..6d70ab3a2321d0d141273f3eaf230cb229279ab3 100644
--- a/dumux/boxmodels/common/boxfvelementgeometry.hh
+++ b/dumux/boxmodels/common/boxfvelementgeometry.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/common/boxlocaljacobian.hh b/dumux/boxmodels/common/boxlocaljacobian.hh
index 465676852383a86c2a1ca966892a2ea6909ae894..c856138b22d2235da4a5b34eb1dcf315ffe959bd 100644
--- a/dumux/boxmodels/common/boxlocaljacobian.hh
+++ b/dumux/boxmodels/common/boxlocaljacobian.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2007-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/common/boxlocalresidual.hh b/dumux/boxmodels/common/boxlocalresidual.hh
index ecc23e2daac0513740627cf875f199456853e422..d9adae11b46260685ac4cd34392f91bc40548456 100644
--- a/dumux/boxmodels/common/boxlocalresidual.hh
+++ b/dumux/boxmodels/common/boxlocalresidual.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2011 by Andreas Lauser                               *
  *   Copyright (C) 2007-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/common/boxmodel.hh b/dumux/boxmodels/common/boxmodel.hh
index a3df8814baaccac8000138d3e5338a1cdada6b72..2463f7e1d202f8ea236d5696c153fa4cbcf1035f 100644
--- a/dumux/boxmodels/common/boxmodel.hh
+++ b/dumux/boxmodels/common/boxmodel.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
  *   Copyright (C) 2008-2010 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/common/boxproblem.hh b/dumux/boxmodels/common/boxproblem.hh
index 75c362e311e7adc54af2a1da7d470abc12ce969b..a9665948b77f9d06baacea271d6ec2b0e9bb2685 100644
--- a/dumux/boxmodels/common/boxproblem.hh
+++ b/dumux/boxmodels/common/boxproblem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/common/boxproperties.hh b/dumux/boxmodels/common/boxproperties.hh
index 12c20cec60aa81a8a66ced1b19ca1e6b3f19cc77..ca54b0c383bca0680d9c5f2dbc47c4254eda81f1 100644
--- a/dumux/boxmodels/common/boxproperties.hh
+++ b/dumux/boxmodels/common/boxproperties.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/common/boxpropertydefaults.hh b/dumux/boxmodels/common/boxpropertydefaults.hh
index dcf8f42046720994cc718dc69877e3f6e1166992..6fab788fa88e489957a7271b86e27e34f2172737 100644
--- a/dumux/boxmodels/common/boxpropertydefaults.hh
+++ b/dumux/boxmodels/common/boxpropertydefaults.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
  *   Copyright (C) 2008-2010 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/common/boxvolumevariables.hh b/dumux/boxmodels/common/boxvolumevariables.hh
index 76de27762bdb7a43d7bb32fbffb426c170444859..1cb5d642628f70c46a8b5ca7519cf159cf2c34f9 100644
--- a/dumux/boxmodels/common/boxvolumevariables.hh
+++ b/dumux/boxmodels/common/boxvolumevariables.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/richards/richardsfluxvariables.hh b/dumux/boxmodels/richards/richardsfluxvariables.hh
index 01b289ccc934039fd4ac4fce0715370f4077c406..4124273754609289bbf3d663b18e1ada7ab5af4e 100644
--- a/dumux/boxmodels/richards/richardsfluxvariables.hh
+++ b/dumux/boxmodels/richards/richardsfluxvariables.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2009 by Onur Dogan                                        *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/richards/richardsindices.hh b/dumux/boxmodels/richards/richardsindices.hh
index a320fd12e645ced11f79675223434708abaf097d..0980c46071fd90e91666a2b53232be1543e4406c 100644
--- a/dumux/boxmodels/richards/richardsindices.hh
+++ b/dumux/boxmodels/richards/richardsindices.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/richards/richardslocalresidual.hh b/dumux/boxmodels/richards/richardslocalresidual.hh
index c808bffa0ba74c08c9cf20b498182de918b992c0..be09347c506fe6fb09c38fcf56bc7448f2002822 100644
--- a/dumux/boxmodels/richards/richardslocalresidual.hh
+++ b/dumux/boxmodels/richards/richardslocalresidual.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2009 by Onur Dogan                                        *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/richards/richardsmodel.hh b/dumux/boxmodels/richards/richardsmodel.hh
index 42d6c4500f83741a4ce157c9ab31088ac6f66c2c..df69183cae96b61857ac29d9326d443c062f299d 100644
--- a/dumux/boxmodels/richards/richardsmodel.hh
+++ b/dumux/boxmodels/richards/richardsmodel.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
  *   Copyright (C) 2009 by Onur Dogan                                        *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/richards/richardsnewtoncontroller.hh b/dumux/boxmodels/richards/richardsnewtoncontroller.hh
index d271871de6603848caed655c8c7b726a347535de..7bbcd9707a9f3bbb5ee217327bac91c11690e35f 100644
--- a/dumux/boxmodels/richards/richardsnewtoncontroller.hh
+++ b/dumux/boxmodels/richards/richardsnewtoncontroller.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/richards/richardsproblem.hh b/dumux/boxmodels/richards/richardsproblem.hh
index 65f4ee52f9c117ebfdd99ad1b37fd6353185e799..105b44b627b5b1e7481abd2aa80b94b050605273 100644
--- a/dumux/boxmodels/richards/richardsproblem.hh
+++ b/dumux/boxmodels/richards/richardsproblem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/richards/richardsproperties.hh b/dumux/boxmodels/richards/richardsproperties.hh
index 80b793fd53756e002116132bdf778240adcd3bbf..7e7acc3fe4e4c03283c890ff6a5ad50a611580f7 100644
--- a/dumux/boxmodels/richards/richardsproperties.hh
+++ b/dumux/boxmodels/richards/richardsproperties.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/richards/richardspropertydefaults.hh b/dumux/boxmodels/richards/richardspropertydefaults.hh
index 4d7be5b515abe16e64650d665079a7d562997b05..2d46e2ef4d7b9202980b73b6c6eff08419dd7a61 100644
--- a/dumux/boxmodels/richards/richardspropertydefaults.hh
+++ b/dumux/boxmodels/richards/richardspropertydefaults.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/boxmodels/richards/richardsvolumevariables.hh b/dumux/boxmodels/richards/richardsvolumevariables.hh
index 5092f62c73efda805f5d92aa4b43a2b050ba5998..546c826f1a5e43dba29a4025d3af341f3d726746 100644
--- a/dumux/boxmodels/richards/richardsvolumevariables.hh
+++ b/dumux/boxmodels/richards/richardsvolumevariables.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2009 by Onur Dogan                                        *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/common/basicproperties.hh b/dumux/common/basicproperties.hh
index c2b410fee977d55b9d82ef7a2ac97df2b03a3fa9..3342ac67799a7f9d1c35c4ff179cb18ce1c4125a 100644
--- a/dumux/common/basicproperties.hh
+++ b/dumux/common/basicproperties.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/common/boundaryconditions.hh b/dumux/common/boundaryconditions.hh
index bada7f74ca8810d4188676bc2daa8641c5c8d634..3264ac21345f72916f12687f6f2eb77ed45581fe 100644
--- a/dumux/common/boundaryconditions.hh
+++ b/dumux/common/boundaryconditions.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009-2010 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/common/boundarytypes.hh b/dumux/common/boundarytypes.hh
index e8d64f2e675117f244462030dddeb6508375e4ca..c2f931f176732c10ab29e833abe7a372b202de54 100644
--- a/dumux/common/boundarytypes.hh
+++ b/dumux/common/boundarytypes.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/common/dgfgridcreator.hh b/dumux/common/dgfgridcreator.hh
index 71a7e3c6e30adbbb57f487fb233291b6d9891348..569d7b8e00bdd3bfd6cd94003f23ccaf6428c27e 100644
--- a/dumux/common/dgfgridcreator.hh
+++ b/dumux/common/dgfgridcreator.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2012 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/common/exceptions.hh b/dumux/common/exceptions.hh
index 6ae68eab1d289571e9be21433061d3cb27ad48f1..449f34f995e951afbd2ea845fedc90f13926d04f 100644
--- a/dumux/common/exceptions.hh
+++ b/dumux/common/exceptions.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/common/fixedlengthspline_.hh b/dumux/common/fixedlengthspline_.hh
index 29b210e2a80ceec62bdf2e1e7af34c5474d77364..1b9efcc8a893f367060de66429051ae616c7b588 100644
--- a/dumux/common/fixedlengthspline_.hh
+++ b/dumux/common/fixedlengthspline_.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/common/math.hh b/dumux/common/math.hh
index 1255f9ca0f482c17f1f902243bb9ca3253445363..a86af86af7ab1b82bcb7dc63081c3be66201348d 100644
--- a/dumux/common/math.hh
+++ b/dumux/common/math.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/common/parameters.hh b/dumux/common/parameters.hh
index 36851b84a05449fb421983196ef26e38c7548ed0..e65f46cf4bb5d89acde768cd6ecc1d11184f50aa 100644
--- a/dumux/common/parameters.hh
+++ b/dumux/common/parameters.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/common/propertysystem.hh b/dumux/common/propertysystem.hh
index 0d3368c78521d7d95e44e71049158c297fbca529..cb0ad7c89bcaedce183bd0878cb471b67a7a766b 100644
--- a/dumux/common/propertysystem.hh
+++ b/dumux/common/propertysystem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009-2011 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/common/quad.hh b/dumux/common/quad.hh
index c5f9ba26c94d1e1a1ed738f09db0a53fb20cc6df..4aacb2f287340b8569873b0fe339490b2a7ad8aa 100644
--- a/dumux/common/quad.hh
+++ b/dumux/common/quad.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/common/spline.hh b/dumux/common/spline.hh
index 1ea611a4d46280664d8f93e92a5c3082336891ec..d2b82801dd933e242c2d98a8f41e904d6cb31b8e 100644
--- a/dumux/common/spline.hh
+++ b/dumux/common/spline.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/common/splinecommon_.hh b/dumux/common/splinecommon_.hh
index 58f2e1946023397561bbdf1be4575a8c15df1b3c..712cfa39d37d7d9dbfab568060c64f024240ece6 100644
--- a/dumux/common/splinecommon_.hh
+++ b/dumux/common/splinecommon_.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/common/start.hh b/dumux/common/start.hh
index d01717ddf7911c6078aecd4213e3aa4aab320869..bd9af822118cff247b9d40ffb82f2be5338a0a50 100644
--- a/dumux/common/start.hh
+++ b/dumux/common/start.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/common/tabulated2dfunction.hh b/dumux/common/tabulated2dfunction.hh
index 40e4de16232728a41a0e4a09396467cdff821eab..bb3c7383454fc20ac721ea18d99d1dbf60fd52ae 100644
--- a/dumux/common/tabulated2dfunction.hh
+++ b/dumux/common/tabulated2dfunction.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/common/timemanager.hh b/dumux/common/timemanager.hh
index f828ddc6b5a99b3567e8fe6e3c1109ce5e6426af..f4de7fbb7b0f1e012d66d0734da7c3e3844adfd2 100644
--- a/dumux/common/timemanager.hh
+++ b/dumux/common/timemanager.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008-2011 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/common/valgrind.hh b/dumux/common/valgrind.hh
index a64a81b04867b1c5761af7eedb16e90b9f97817c..0e4838db2ca6af7caf07b0e9553f9e2236fbbf6b 100644
--- a/dumux/common/valgrind.hh
+++ b/dumux/common/valgrind.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/common/variablelengthspline_.hh b/dumux/common/variablelengthspline_.hh
index d4dee76a07c22e20e35c7f1636de50bdf7c49df8..526e69e32b21dd97bad7f7a08bedc4355661ac6d 100644
--- a/dumux/common/variablelengthspline_.hh
+++ b/dumux/common/variablelengthspline_.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/1p/1pindices.hh b/dumux/decoupled/1p/1pindices.hh
index 7541b7229b6088a453bfb7a543daf8c00d19d1fa..74e2768c479988873233f3293caabf2a303473ae 100644
--- a/dumux/decoupled/1p/1pindices.hh
+++ b/dumux/decoupled/1p/1pindices.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/1p/1pproperties.hh b/dumux/decoupled/1p/1pproperties.hh
index 6ba714978b92d73180ecacb3411fd1a82a58d588..9ac6c5c41f7c33a95a27e40e98a4c6f221d66aa1 100644
--- a/dumux/decoupled/1p/1pproperties.hh
+++ b/dumux/decoupled/1p/1pproperties.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2010 by Markus Wolff                                      *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/1p/cellData1p.hh b/dumux/decoupled/1p/cellData1p.hh
index 863dee5434ed4e75ae630c8c7cb247d456cb8853..7a36e91a0368b119d0cc344523b9f6b7698819fc 100644
--- a/dumux/decoupled/1p/cellData1p.hh
+++ b/dumux/decoupled/1p/cellData1p.hh
@@ -1,6 +1,8 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh b/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh
index c2cb39958bf7fabeb9605413592efe15801fb8d8..44c8fd863f0c5c3c22022d0445c087637da160ee 100644
--- a/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh
+++ b/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Markus Wolff                                      *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/1p/diffusion/diffusionproperties1p.hh b/dumux/decoupled/1p/diffusion/diffusionproperties1p.hh
index 840861299e13a5be039142f234dd3d887dfaefee..bf259d0d19b86b79c6bc1c38d9c83fb69e346a1c 100644
--- a/dumux/decoupled/1p/diffusion/diffusionproperties1p.hh
+++ b/dumux/decoupled/1p/diffusion/diffusionproperties1p.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh b/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
index 512e973296a021b94253ee92bb27c50de3619f18..ac199a647e5ccb87ede74c0d400dbde2c8fd4ac9 100644
--- a/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
+++ b/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2010 by Markus Wolff                                 *
  *   Copyright (C) 2007-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/1p/diffusion/fv/fvpressureproperties1p.hh b/dumux/decoupled/1p/diffusion/fv/fvpressureproperties1p.hh
index beac634b22d73e900b9393729c352eab1ffa1139..e214915f1facfa4f9b33a7491cc8fe199896e401 100644
--- a/dumux/decoupled/1p/diffusion/fv/fvpressureproperties1p.hh
+++ b/dumux/decoupled/1p/diffusion/fv/fvpressureproperties1p.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh b/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
index 7c6c889ede4334e88bbb5e657fe03011f1c3233a..3c1e689407a385103b5ce5d08f29fa282ebcfafb 100644
--- a/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
+++ b/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/1p/fluxData1p.hh b/dumux/decoupled/1p/fluxData1p.hh
index 50ee0e8fd094fb044f8b89fadc3b1ad91cffaf8f..56342231c2224b5065279821cc5873254e0cd98c 100644
--- a/dumux/decoupled/1p/fluxData1p.hh
+++ b/dumux/decoupled/1p/fluxData1p.hh
@@ -1,6 +1,8 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/2pfluidstate.hh b/dumux/decoupled/2p/2pfluidstate.hh
index f88001725f2e802b64c32bd9cdaade6c095502af..42d108c2a832458b2ef96ca0342a8e8f731c70e7 100644
--- a/dumux/decoupled/2p/2pfluidstate.hh
+++ b/dumux/decoupled/2p/2pfluidstate.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/2pindices.hh b/dumux/decoupled/2p/2pindices.hh
index f436c038be6220cc8fee58ad51536dc12c53df13..663f17bd1d4ac609f3aca6a03d02303e8def4972 100644
--- a/dumux/decoupled/2p/2pindices.hh
+++ b/dumux/decoupled/2p/2pindices.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/2pproperties.hh b/dumux/decoupled/2p/2pproperties.hh
index 11d7a2176bb78fe72336619dc79772015c0dd843..bc9cc269a7beeeb54be8684bb9572231f3932a4c 100644
--- a/dumux/decoupled/2p/2pproperties.hh
+++ b/dumux/decoupled/2p/2pproperties.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/2pproperties_old.hh b/dumux/decoupled/2p/2pproperties_old.hh
index cb0bd30b7c351187abf83509185288e18b008119..bc54f00aede8a906520c137bf6c4bdec24ec1709 100644
--- a/dumux/decoupled/2p/2pproperties_old.hh
+++ b/dumux/decoupled/2p/2pproperties_old.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/cellData2p.hh b/dumux/decoupled/2p/cellData2p.hh
index a9d4a9bc754167e2940b83c9c582c078d7828437..a71984bda44cafb3a605b0bb265084b357d50a37 100644
--- a/dumux/decoupled/2p/cellData2p.hh
+++ b/dumux/decoupled/2p/cellData2p.hh
@@ -1,6 +1,8 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/cellData2p_adaptive.hh b/dumux/decoupled/2p/cellData2p_adaptive.hh
index bc704a4ac4bf21d66a5cf0984b3c2eaf86d70b4a..dac08ecd4aa36227421b7bc5990fe634008ab4c2 100644
--- a/dumux/decoupled/2p/cellData2p_adaptive.hh
+++ b/dumux/decoupled/2p/cellData2p_adaptive.hh
@@ -1,6 +1,8 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh b/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh
index 6d36d90b4a3f03b14ac67ff4bed8b314b75940d8..af081ea12ecb720709d18e96362199913d0a02f7 100644
--- a/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh
+++ b/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Markus Wolff                                      *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/diffusion/diffusionproperties2p.hh b/dumux/decoupled/2p/diffusion/diffusionproperties2p.hh
index a2e1285653b616036b2c1f61cd55e8d4e14c264e..0649a5d7441d2f9c7add442e0746dcf768e4e382 100644
--- a/dumux/decoupled/2p/diffusion/diffusionproperties2p.hh
+++ b/dumux/decoupled/2p/diffusion/diffusionproperties2p.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
index c64b871ac00cde5baeb8fe1651d3e246518c8578..33ff2a1c7174e50fd98e4e663aac9bb1d7132320 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2007-2009 by Bernd Flemisch                               *
  *   Copyright (C) 2007-2009 by Jochen Fritz                                 *
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
index f89b7fa334b74e15a240f90fb0816d76d7c3b9f0..3469817880d3ff49b4ed477b78a6826f4f62f330 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2007-2009 by Bernd Flemisch                               *
  *   Copyright (C) 2007-2009 by Jochen Fritz                                 *
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressureproperties2p.hh b/dumux/decoupled/2p/diffusion/fv/fvpressureproperties2p.hh
index 0bc0160ee98880501b69df2d473a2582208b99dc..07c8a5f81b9af6924563f39323dcb5489c113041 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvpressureproperties2p.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvpressureproperties2p.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressureproperties2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvpressureproperties2padaptive.hh
index 090d664794676a916d22b906c638c969a7c1d420..e1cec52b4f33ffae8601eb24d6f681bd3051914f 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvpressureproperties2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvpressureproperties2padaptive.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh b/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
index 4254862249799fd92df56f56b8697fde346ec179..b384d30bd1c803e27bb7656965be0d78009acd6d 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
index e04dd6d47f65280ba085b7bbc97088a2de29f253..200c6e7f538559a6564cea74dfdf16474b7ebc08 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/diffusion/mimetic/croperator.hh b/dumux/decoupled/2p/diffusion/mimetic/croperator.hh
index 95afbff7238bec92fc2f2a0b047d72d1a777b88e..df97b7909038fe3ed3fff977a6a4f18bcf9c7f20 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/croperator.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/croperator.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2007-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
index c2ce9d13a21d35533b71d092d07117a6244567e9..96e1c39c58a8b81fa959a3fab86bf4e984020d8c 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
 *   Copyright (C) 2008-2009 by Bernd Flemisch                               *
-*   Institute of Hydraulic Engineering                                      *
+*   Institute for Modelling Hydraulic and Environmental Systems             *
 *   University of Stuttgart, Germany                                        *
 *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
 *                                                                           *
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticoperator.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticoperator.hh
index f63b0e97f2d2093075d2fe8414f9c442053bd74c..8790787c1cd378011272d73bdea178df04e813ca 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticoperator.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticoperator.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2007-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
index ea6755a82c235873f8da06cc61a51c368c4102f0..8bbbe601991a7df809e7032cd5aa6917d1098e71 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2007-2009 by Bernd Flemisch                               *
  *   Copyright (C) 2007-2009 by Jochen Fritz                                 *
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressureproperties2p.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressureproperties2p.hh
index c50993661dd1ab30b657cd52ed19ec0e76bd37c2..4a92176db122a144b4d77a4036fce20e2b2cb79d 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressureproperties2p.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressureproperties2p.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/fluxData2p.hh b/dumux/decoupled/2p/fluxData2p.hh
index 92fec2590382050210487dbbbcab163b0d4443f7..8386639707afb53d6a7efbaf255a67f28fa96770 100644
--- a/dumux/decoupled/2p/fluxData2p.hh
+++ b/dumux/decoupled/2p/fluxData2p.hh
@@ -1,6 +1,8 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh b/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh
index dca0e44e6d4d199b307b6b3e6c9fca99c8369729..d4ca023a4a8d0cf3fd0603431525facfad25b71a 100644
--- a/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh
+++ b/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh
@@ -1,6 +1,8 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
- *   Copyright (C) 2011 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Copyright (C) 2011 by Markus Wolff                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/impes/impesproblem2p.hh b/dumux/decoupled/2p/impes/impesproblem2p.hh
index 8f8f3a919323f2b84652f1250320be43dc9ca0ec..73aa17dcbaea5e0fba26c0bb4904ce6f03884402 100644
--- a/dumux/decoupled/2p/impes/impesproblem2p.hh
+++ b/dumux/decoupled/2p/impes/impesproblem2p.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Markus Wolff                                      *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/impes/impesproperties2p.hh b/dumux/decoupled/2p/impes/impesproperties2p.hh
index 0dc6b9feb6b946b370db29bd31e658bf43a4fff2..dcbcd14eff17157714297bd60f1273ac7592665c 100644
--- a/dumux/decoupled/2p/impes/impesproperties2p.hh
+++ b/dumux/decoupled/2p/impes/impesproperties2p.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/impes/impesproperties2padaptive.hh b/dumux/decoupled/2p/impes/impesproperties2padaptive.hh
index bfe533a4a38b3787cfc35587a23cbf5985e93f7b..7762a41baeae554826331ef0e219bb82f4b003b2 100644
--- a/dumux/decoupled/2p/impes/impesproperties2padaptive.hh
+++ b/dumux/decoupled/2p/impes/impesproperties2padaptive.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh b/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh
index 2ecfe10f03686e2b8b514fd78cf5271dc91a22d2..3bedb180e8359f5ca41c489b4758ad160d6bccf9 100644
--- a/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh
+++ b/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2007-2009 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2010 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/transport/fv/convectivepart.hh b/dumux/decoupled/2p/transport/fv/convectivepart.hh
index 294aa4a0087215bfb19bcec1fce605172b10be83..077a9fa0aa4fa5f3f45fb8a871bc6f0b36681310 100644
--- a/dumux/decoupled/2p/transport/fv/convectivepart.hh
+++ b/dumux/decoupled/2p/transport/fv/convectivepart.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/transport/fv/diffusivepart.hh b/dumux/decoupled/2p/transport/fv/diffusivepart.hh
index aa08d45eeb4e3391b10397824683839b687fe1cc..3eaa1e61d007a321c78a4cb961674c2bbad7e3f3 100644
--- a/dumux/decoupled/2p/transport/fv/diffusivepart.hh
+++ b/dumux/decoupled/2p/transport/fv/diffusivepart.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2007-2009 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/transport/fv/evalcflflux.hh b/dumux/decoupled/2p/transport/fv/evalcflflux.hh
index 4ffaa0df997a4264d1dd68c5baa0fe9f4260f299..0edfeb68ec9f59db4421fd9dbe22b64c08674374 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflflux.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflflux.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh b/dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh
index c53a9d8b1827a4d7fad18b6e4e28e96daf84c857..7a85beba8fc302c556c7828986a6328357d07777 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/transport/fv/evalcflflux_default.hh b/dumux/decoupled/2p/transport/fv/evalcflflux_default.hh
index 06aa1db5c56caf4e46f5f74b2542a4d9e129c20e..e809c23d101b65d9d511534ea4ea2ef75b2e2373 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflflux_default.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflflux_default.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
index 6b3305bf81674b1e2c1bf1beaa43e8fd5149d7cb..24d474bf1c8a7342dbd4eab72f669fb2b25c7cc2 100644
--- a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
+++ b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/transport/fv/fvtransportproperties2p.hh b/dumux/decoupled/2p/transport/fv/fvtransportproperties2p.hh
index 97809ea59c7c886598fcde166617c65a6653c476..a88157fde103b02c0fefde4f11eb91e282c01051 100644
--- a/dumux/decoupled/2p/transport/fv/fvtransportproperties2p.hh
+++ b/dumux/decoupled/2p/transport/fv/fvtransportproperties2p.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/transport/fv/gravitypart.hh b/dumux/decoupled/2p/transport/fv/gravitypart.hh
index 6689fbfb8c0c130bc5b998447c7541a34b42b427..1101e09874ce658a6eb68a2ac6aed83b9b675fd3 100644
--- a/dumux/decoupled/2p/transport/fv/gravitypart.hh
+++ b/dumux/decoupled/2p/transport/fv/gravitypart.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008-2010 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/transport/transportproblem2p.hh b/dumux/decoupled/2p/transport/transportproblem2p.hh
index f74a4153d342b69123aa1a833220696957615218..5206e6c1be755e1b9382064fa2d2fa40fa92deb3 100644
--- a/dumux/decoupled/2p/transport/transportproblem2p.hh
+++ b/dumux/decoupled/2p/transport/transportproblem2p.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Markus Wolff                                      *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/transport/transportproperties2p.hh b/dumux/decoupled/2p/transport/transportproperties2p.hh
index be94aa6a485e54702c2420da881f1e69c1025e80..82d40abd38f298962d08dc6cd720b7b792e12274 100644
--- a/dumux/decoupled/2p/transport/transportproperties2p.hh
+++ b/dumux/decoupled/2p/transport/transportproperties2p.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/variableclass2p_gridadapt_old.hh b/dumux/decoupled/2p/variableclass2p_gridadapt_old.hh
index 7c6dca8b79d097938d1dd9e20b5192d0e60480ca..ee17cb303b0743027475d8b18a356708b6bb7278 100644
--- a/dumux/decoupled/2p/variableclass2p_gridadapt_old.hh
+++ b/dumux/decoupled/2p/variableclass2p_gridadapt_old.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p/variableclass2p_old.hh b/dumux/decoupled/2p/variableclass2p_old.hh
index f4efa47999a373583b6ef3ee384545a4fe742e03..b8f07bdb26bc7ff8aaa5b629742a3531fa7b46a8 100644
--- a/dumux/decoupled/2p/variableclass2p_old.hh
+++ b/dumux/decoupled/2p/variableclass2p_old.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p2c/2p2cproblem.hh b/dumux/decoupled/2p2c/2p2cproblem.hh
index 61c97310d3360bcee7d6e81e0c0a189d2ff679c0..dc374e2a929fe84ddbe8c579ed94b96e1670221f 100644
--- a/dumux/decoupled/2p2c/2p2cproblem.hh
+++ b/dumux/decoupled/2p2c/2p2cproblem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Benjamin Faigle, Markus Wolff                     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p2c/2p2cproperties.hh b/dumux/decoupled/2p2c/2p2cproperties.hh
index 8e68eb21742f87932adf99b9c4783776871af1dc..467f6ae528aa3ea6104344a1b59952068f38a763 100644
--- a/dumux/decoupled/2p2c/2p2cproperties.hh
+++ b/dumux/decoupled/2p2c/2p2cproperties.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 20010 by Benjamin Faigle                                  *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p2c/cellData2p2c.hh b/dumux/decoupled/2p2c/cellData2p2c.hh
index 87c4b8502bd5495c24f9baa2d2b784dff0d3eedc..7ad7851560d20196becb3258b49b1d9c50afea36 100644
--- a/dumux/decoupled/2p2c/cellData2p2c.hh
+++ b/dumux/decoupled/2p2c/cellData2p2c.hh
@@ -1,6 +1,8 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Benjamin Faigle                                   *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p2c/cellData2p2cmultiphysics.hh b/dumux/decoupled/2p2c/cellData2p2cmultiphysics.hh
index 20c666b2d63339782800826aa488731466fa297c..79573b77011bdc80421395e3f1f6f0059c84f7d8 100644
--- a/dumux/decoupled/2p2c/cellData2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/cellData2p2cmultiphysics.hh
@@ -1,6 +1,8 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Benjamin Faigle                                   *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p2c/dec2p2cfluidstate.hh b/dumux/decoupled/2p2c/dec2p2cfluidstate.hh
index 2a6827091746c83c4746be1d5bf41c82c66bdff8..9d2e230a810a9d7a45f719c1e57da8ff93d6bd7c 100644
--- a/dumux/decoupled/2p2c/dec2p2cfluidstate.hh
+++ b/dumux/decoupled/2p2c/dec2p2cfluidstate.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Benjamin Faigle                                   *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p2c/fluxData2p2c.hh b/dumux/decoupled/2p2c/fluxData2p2c.hh
index b28d8debcca1617d7966b59eb684d9f51ad8e310..75b8da65ce561cf38da6aff5b115295da1292272 100644
--- a/dumux/decoupled/2p2c/fluxData2p2c.hh
+++ b/dumux/decoupled/2p2c/fluxData2p2c.hh
@@ -1,6 +1,8 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p2c/fvpressure2p2c.hh b/dumux/decoupled/2p2c/fvpressure2p2c.hh
index 381466ca412a0f567b8a86f24a700c740eb5ad94..c6e3d65270231a53430505de187476db1e4fc994 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2c.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2c.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2010 by Benjamin Faigle                                   *
  *   Copyright (C) 2007-2009 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
index d8d7144beec20ebcc32e287499222d441440f2c6..a4d62df8f2fd1816b283b7769091e57e624c7114 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2007-2009 by Bernd Flemisch                               *
  *   Copyright (C) 2007-2009 by Jochen Fritz                                 *
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p2c/fvpressurecompositional.hh b/dumux/decoupled/2p2c/fvpressurecompositional.hh
index 8afa485484c5dd5c3c1f3fec2a3dbb2f1d6e6fac..d698822af9c82ed11025c5f25824b93f0bc62324 100644
--- a/dumux/decoupled/2p2c/fvpressurecompositional.hh
+++ b/dumux/decoupled/2p2c/fvpressurecompositional.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2010 by Benjamin Faigle                                   *
  *   Copyright (C) 2007-2009 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p2c/fvtransport2p2c.hh b/dumux/decoupled/2p2c/fvtransport2p2c.hh
index 29e8c528a858c19396a80ad7ab0b0b11bc7dc679..48ae711ad30d219e98408ac50b460d12ad96c088 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2c.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2c.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Markus Wolff, Benjamin Faigle                     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
index 8242422ac7f5dfb1a61a9065a1b3334457c0a6cb..598244d5e31e8b48e208912ad6adf2e9040a1478 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Markus Wolff, Benjamin Faigle                     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh b/dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh
index 3fd9ab6b08cf2a4919f028b0b8046ea4300710a1..5eb8be53163f9e9dae2cc0ee0cc26ff83c53a61a 100644
--- a/dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh
+++ b/dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Benjamin Faigle                                   *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/decoupledproperties.hh b/dumux/decoupled/common/decoupledproperties.hh
index 3f8d764e7375c2d560d3c507addf23ce68c72e71..3751931999d69d6b87bfe2ff7b43f1c9246c0e3b 100644
--- a/dumux/decoupled/common/decoupledproperties.hh
+++ b/dumux/decoupled/common/decoupledproperties.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/decoupledproperties_old.hh b/dumux/decoupled/common/decoupledproperties_old.hh
index b979e7d480297ac04ceb7e923abe4d033d57cde4..7c90f18d630633830a01ac25dfbee3409b510374 100644
--- a/dumux/decoupled/common/decoupledproperties_old.hh
+++ b/dumux/decoupled/common/decoupledproperties_old.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/fv/fvpressure.hh b/dumux/decoupled/common/fv/fvpressure.hh
index 18c61d59d40512c1f6c9e7c50e4be484498fec9b..8177327093504f422f3439665d20a97dee201ad9 100644
--- a/dumux/decoupled/common/fv/fvpressure.hh
+++ b/dumux/decoupled/common/fv/fvpressure.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2010 by Benjamin Faigle                                   *
  *   Copyright (C) 2007-2009 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/fv/fvtransport.hh b/dumux/decoupled/common/fv/fvtransport.hh
index 651619ff360f683600f01dbc89e0b8d8a5191791..1e2fcf6fb21dfc05ca74544eb5a7316d755b43c0 100644
--- a/dumux/decoupled/common/fv/fvtransport.hh
+++ b/dumux/decoupled/common/fv/fvtransport.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/fv/fvvelocity.hh b/dumux/decoupled/common/fv/fvvelocity.hh
index 6974779e266f3a7e00db26da57755e1bf5c8ad83..b4e210fa9f0bbcc7f3fcf1596c1b99583b8c077e 100644
--- a/dumux/decoupled/common/fv/fvvelocity.hh
+++ b/dumux/decoupled/common/fv/fvvelocity.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/fv/velocitydefault.hh b/dumux/decoupled/common/fv/velocitydefault.hh
index 05cec98b2fb307d5ab5dae14379860063a343048..592cac8f0021f20c557aca8cd1d71bd9440e42f8 100644
--- a/dumux/decoupled/common/fv/velocitydefault.hh
+++ b/dumux/decoupled/common/fv/velocitydefault.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/gridadapt.hh b/dumux/decoupled/common/gridadapt.hh
index 9771832542b8d4f1abd58034e0ae3ea6733f2758..267c179f2c0f48f54ee40cd7322abaf0163dc0d6 100644
--- a/dumux/decoupled/common/gridadapt.hh
+++ b/dumux/decoupled/common/gridadapt.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Benjamin Faigle                                     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/gridadapt_old.hh b/dumux/decoupled/common/gridadapt_old.hh
index 60f0c57fdd019c6914c0ea699d1eaa4a0e202738..54539f362a5b9e7444a7798543a37614a28a43a1 100644
--- a/dumux/decoupled/common/gridadapt_old.hh
+++ b/dumux/decoupled/common/gridadapt_old.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Benjamin Faigle                                     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/gridadaptproperties.hh b/dumux/decoupled/common/gridadaptproperties.hh
index d1175ff0caca58d0da72f3b633eba8e7352314b5..9127f7bdf892e43e54e9ae95aa5be0324d2a777d 100644
--- a/dumux/decoupled/common/gridadaptproperties.hh
+++ b/dumux/decoupled/common/gridadaptproperties.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by  Markus Wolff                                     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/impet.hh b/dumux/decoupled/common/impet.hh
index 85ce75d87b46abca6cf8b3723ebc3817dd1ecc17..94b2eed613ffcf8bfdd7801dc5356aed2fc71f82 100644
--- a/dumux/decoupled/common/impet.hh
+++ b/dumux/decoupled/common/impet.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2007-2009 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/impetproblem.hh b/dumux/decoupled/common/impetproblem.hh
index b08986c6f63920d18cff90831387933063e48c5f..450e907fb54a39843e973315ef4f0b7aa5101ffc 100644
--- a/dumux/decoupled/common/impetproblem.hh
+++ b/dumux/decoupled/common/impetproblem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Markus Wolff, Andreas Lauser                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/impetproperties.hh b/dumux/decoupled/common/impetproperties.hh
index 363ff2d0f38510822e94be269e648e93a49562c7..56814754ee616b3b0297803e2323ca01692b91a1 100644
--- a/dumux/decoupled/common/impetproperties.hh
+++ b/dumux/decoupled/common/impetproperties.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/mimetic/mimeticproperties.hh b/dumux/decoupled/common/mimetic/mimeticproperties.hh
index 1dfd5a9ef69250a86f1095b0eea26ec1c6f77631..73a16f53002ab685fc6bd9678571a207a024c2e9 100644
--- a/dumux/decoupled/common/mimetic/mimeticproperties.hh
+++ b/dumux/decoupled/common/mimetic/mimeticproperties.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/onemodelproblem.hh b/dumux/decoupled/common/onemodelproblem.hh
index b2c28c7f76583d514afafe83d79c6252b08e7524..07a7f751d9ede1ea3536f9440fff74c3d7f4d030 100644
--- a/dumux/decoupled/common/onemodelproblem.hh
+++ b/dumux/decoupled/common/onemodelproblem.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Markus Wolff                                      *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/onemodelproblem_old.hh b/dumux/decoupled/common/onemodelproblem_old.hh
index 449bf6f93556deb8d7db9e515b3fba19c56976d5..868e980265aeb0c5fec9dc9038692bde5fe6f988 100644
--- a/dumux/decoupled/common/onemodelproblem_old.hh
+++ b/dumux/decoupled/common/onemodelproblem_old.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Markus Wolff                                      *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/pressureproperties.hh b/dumux/decoupled/common/pressureproperties.hh
index 185984c46c67d7d7164ecc828cab3576d5eb2ccb..0c75ec82cb6d3fb90f604d1990ba25cf0d86a0d0 100644
--- a/dumux/decoupled/common/pressureproperties.hh
+++ b/dumux/decoupled/common/pressureproperties.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/transportproperties.hh b/dumux/decoupled/common/transportproperties.hh
index 7b06e868aae65f28a07cac73e248cebb02c719f7..7243b933bc03b589b97e245e37e48888741a4e62 100644
--- a/dumux/decoupled/common/transportproperties.hh
+++ b/dumux/decoupled/common/transportproperties.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/variableclass.hh b/dumux/decoupled/common/variableclass.hh
index 445230d55cc50d57a67ae44d87d04d3358f8796e..bbe5d9e5fc2d4f29d41e67b4044a7bc859ae7e60 100644
--- a/dumux/decoupled/common/variableclass.hh
+++ b/dumux/decoupled/common/variableclass.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/variableclass_adaptive.hh b/dumux/decoupled/common/variableclass_adaptive.hh
index 1a39eecae76f2c78f57ee60a0ca66f3b9464a616..5bc7a044eef7b9cee0e05a5e33cc521a2cdd5e52 100644
--- a/dumux/decoupled/common/variableclass_adaptive.hh
+++ b/dumux/decoupled/common/variableclass_adaptive.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/decoupled/common/variableclass_old.hh b/dumux/decoupled/common/variableclass_old.hh
index 90d3f46381df1ba0e2cdaa2689874228846747fb..7d4b150df275680b4bc3a606e1f424f180a6b6ed 100644
--- a/dumux/decoupled/common/variableclass_old.hh
+++ b/dumux/decoupled/common/variableclass_old.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes/stokesfluxvariables.hh b/dumux/freeflow/stokes/stokesfluxvariables.hh
index 0802a3f8e29b4ff8f4301a742501ad7af6345945..1f629c4b1b4c3aebfbc8fb3713962c97562fc5bc 100644
--- a/dumux/freeflow/stokes/stokesfluxvariables.hh
+++ b/dumux/freeflow/stokes/stokesfluxvariables.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Katherina Baber, Klaus Mosthaf                    *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes/stokesindices.hh b/dumux/freeflow/stokes/stokesindices.hh
index 4fc3117d5bc30dff2312ddaad438e54f289a7079..683ef3a4eba05381ffd9e07b85349c3d87ce4ad4 100644
--- a/dumux/freeflow/stokes/stokesindices.hh
+++ b/dumux/freeflow/stokes/stokesindices.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2011 by Katherina Baber, Klaus Mosthaf                    *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes/stokeslocaljacobian.hh b/dumux/freeflow/stokes/stokeslocaljacobian.hh
index f97ecce8e00bf0812a6f87edd24a367b3c44a45d..74c063edbb4d2e8c0112b648f5a073c904e61043 100644
--- a/dumux/freeflow/stokes/stokeslocaljacobian.hh
+++ b/dumux/freeflow/stokes/stokeslocaljacobian.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2007-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes/stokeslocalresidual.hh b/dumux/freeflow/stokes/stokeslocalresidual.hh
index 434dd2b0019487ed3b550bf06a150825a0dcb697..67fa65952cc86f02ca9d9b6b7174047f6c65885e 100644
--- a/dumux/freeflow/stokes/stokeslocalresidual.hh
+++ b/dumux/freeflow/stokes/stokeslocalresidual.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2009-2011 by Katherina Baber, Klaus Mosthaf               *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes/stokesmodel.hh b/dumux/freeflow/stokes/stokesmodel.hh
index 7bc02692e595a14a3de70a2b79d5d33ed1d88f51..07202fa55dc061beb23707a401e5cf5cb139f507 100644
--- a/dumux/freeflow/stokes/stokesmodel.hh
+++ b/dumux/freeflow/stokes/stokesmodel.hh
@@ -8,7 +8,7 @@
  *                                                                           *
  *   Copyright (C) 2010 by Katherina Baber, Klaus Mosthaf                    *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes/stokesnewtoncontroller.hh b/dumux/freeflow/stokes/stokesnewtoncontroller.hh
index eea9a8d6ead5507d3506d0431e8f083fc550f1a9..5e70a02a18c6c5f5911afdc9c747aa1740577699 100644
--- a/dumux/freeflow/stokes/stokesnewtoncontroller.hh
+++ b/dumux/freeflow/stokes/stokesnewtoncontroller.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Katherina Baber, Klaus Mosthaf                    *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes/stokesproblem.hh b/dumux/freeflow/stokes/stokesproblem.hh
index 1d78146392edc8f02d58e49b362e67e659187c77..f2f154df44fa564833035f6c26659a00c468e1a5 100644
--- a/dumux/freeflow/stokes/stokesproblem.hh
+++ b/dumux/freeflow/stokes/stokesproblem.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Katherina Baber, Klaus Mosthaf                    *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes/stokesproperties.hh b/dumux/freeflow/stokes/stokesproperties.hh
index 6c9d58434913bfac7348dc011f8d5acb581e05ad..bb33bec803b519c2390b0525af01e858adce538c 100644
--- a/dumux/freeflow/stokes/stokesproperties.hh
+++ b/dumux/freeflow/stokes/stokesproperties.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Katherina Baber, Klaus Mosthaf                    *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes/stokespropertydefaults.hh b/dumux/freeflow/stokes/stokespropertydefaults.hh
index 8c5a26482e159c587ac6c002bb947a00d3deeb95..021fc18c47adc08aa600ca2d3b19afaf14515a90 100644
--- a/dumux/freeflow/stokes/stokespropertydefaults.hh
+++ b/dumux/freeflow/stokes/stokespropertydefaults.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Katherina Baber, Klaus Mosthaf                    *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes/stokesvolumevariables.hh b/dumux/freeflow/stokes/stokesvolumevariables.hh
index ed029aaedcf761a69796993e996b2c8653cbc650..b4ffab9888065e788a1ce3b170ee6a5a093e5ac9 100644
--- a/dumux/freeflow/stokes/stokesvolumevariables.hh
+++ b/dumux/freeflow/stokes/stokesvolumevariables.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Katherina Baber, Klaus Mosthaf                    *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh b/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh
index 64f6197293a0c6480ad845a501de79b1864619be..4a24f4cde152fbec83a81c38661c257f115cc025 100644
--- a/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh
+++ b/dumux/freeflow/stokes2c/stokes2cfluxvariables.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Katherina Baber, Klaus Mosthaf                    *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes2c/stokes2cindices.hh b/dumux/freeflow/stokes2c/stokes2cindices.hh
index 687562325ce52c392acf8b58726f5f6777ba6961..858000506f78ffc4ee4b1c62cf27a20e5bbfea71 100644
--- a/dumux/freeflow/stokes2c/stokes2cindices.hh
+++ b/dumux/freeflow/stokes2c/stokes2cindices.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2011 by Katherina Baber, Klaus Mosthaf                    *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes2c/stokes2clocalresidual.hh b/dumux/freeflow/stokes2c/stokes2clocalresidual.hh
index 38f42ca2c29ca6143758fa6f3a9d4326aaa52f89..309529aed248facd5c35cbb62bc2d9802a7e8578 100644
--- a/dumux/freeflow/stokes2c/stokes2clocalresidual.hh
+++ b/dumux/freeflow/stokes2c/stokes2clocalresidual.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Katherina Baber, Klaus Mosthaf                    *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes2c/stokes2cmodel.hh b/dumux/freeflow/stokes2c/stokes2cmodel.hh
index 837b8a9b9c70f127ad44e6282a1c1d4089352b27..6b4b2556708bffa89f16b3dba168c1f52fbe0b0a 100644
--- a/dumux/freeflow/stokes2c/stokes2cmodel.hh
+++ b/dumux/freeflow/stokes2c/stokes2cmodel.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Katherina Baber, Klaus Mosthaf                    *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes2c/stokes2cproperties.hh b/dumux/freeflow/stokes2c/stokes2cproperties.hh
index bafea1f0196519d7e67d0958fea5fb4d304c03df..ccd0be190361e3f645d9e8b86ad8e61c39e9fde1 100644
--- a/dumux/freeflow/stokes2c/stokes2cproperties.hh
+++ b/dumux/freeflow/stokes2c/stokes2cproperties.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Klaus Mosthaf, Andreas Lauser, Bernd Flemisch     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes2c/stokes2cpropertydefaults.hh b/dumux/freeflow/stokes2c/stokes2cpropertydefaults.hh
index 95ccb92c1ef5d5954538a7defdaf19acae107cae..4281fd6f49233d82dc60fb13784e16892606dd35 100644
--- a/dumux/freeflow/stokes2c/stokes2cpropertydefaults.hh
+++ b/dumux/freeflow/stokes2c/stokes2cpropertydefaults.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Klaus Mosthaf, Andreas Lauser, Bernd Flemisch     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh b/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh
index bf20450e3d5d8e26e072409e87c054d2ca5b633a..550025dfdcc7b99d4d19fefbeb10972165728499 100644
--- a/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh
+++ b/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Katherina Baber, Klaus Mosthaf                    *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *                                                                           *
  *   This program is free software: you can redistribute it and/or modify    *
diff --git a/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh b/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh
index 6b43eee058799fd73b7d34a5a6b4d7f21734c164..bc959a36211420a81d7fd38f741372e12feec196 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Klaus Mosthaf                                     *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes2cni/stokes2cniindices.hh b/dumux/freeflow/stokes2cni/stokes2cniindices.hh
index cebddcbfb7ece612594aeb0127a72fc9cee2b894..644134e5500699e67c59a92b241562b146031030 100644
--- a/dumux/freeflow/stokes2cni/stokes2cniindices.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cniindices.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2011 by Klaus Mosthaf                                     *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes2cni/stokes2cnilocalresidual.hh b/dumux/freeflow/stokes2cni/stokes2cnilocalresidual.hh
index 01a89badf9b8fa1f4108aceda04075ec7499a1b8..7d29ae933ec1f5d39af39a641119a44349fe4b1f 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnilocalresidual.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnilocalresidual.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Klaus Mosthaf                                     *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes2cni/stokes2cnimodel.hh b/dumux/freeflow/stokes2cni/stokes2cnimodel.hh
index b0050f424df3eff4b739142ffc012b4d86200572..9ec12497b28e94448ebf5e682f21465b91b02262 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnimodel.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnimodel.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Klaus Mosthaf                                     *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes2cni/stokes2cniproperties.hh b/dumux/freeflow/stokes2cni/stokes2cniproperties.hh
index e43697a5529e48d39b489fc059d8597d32aff49d..dd248952383c969a6d178919108ff383c10665c6 100644
--- a/dumux/freeflow/stokes2cni/stokes2cniproperties.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cniproperties.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Klaus Mosthaf, Andreas Lauser, Bernd Flemisch     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes2cni/stokes2cnipropertydefaults.hh b/dumux/freeflow/stokes2cni/stokes2cnipropertydefaults.hh
index 119c64735686a2afb7529efc5427c839f382394a..c826177980baeeb43e90214956a21ee85f2c8fc2 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnipropertydefaults.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnipropertydefaults.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Klaus Mosthaf, Andreas Lauser, Bernd Flemisch     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh b/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh
index a334bb12913964393454a4926ec77c4e1fd8185e..a4ad3dfc56cac9d26f518130a279d34f9eddbfbd 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2010 by Klaus Mosthaf                                     *
  *   Copyright (C) 2008-2009 by Bernd Flemisch, Andreas Lauser               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *                                                                           *
  *   This program is free software: you can redistribute it and/or modify    *
diff --git a/dumux/io/restart.hh b/dumux/io/restart.hh
index 4efe4c8a944898300c206cb27abf6526cc494994..05e0446a80c42f620797e27bc104d0445c76fc89 100644
--- a/dumux/io/restart.hh
+++ b/dumux/io/restart.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/io/vtkmultiwriter.hh b/dumux/io/vtkmultiwriter.hh
index d55ef982f501b87f5a39328e57a7cb0b22724df1..13ce955488e27ba1a2d853135dceada3f0ef4d61 100644
--- a/dumux/io/vtkmultiwriter.hh
+++ b/dumux/io/vtkmultiwriter.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008-2011 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/io/vtknestedfunction.hh b/dumux/io/vtknestedfunction.hh
index 877d117e3bbd5e9c424d99faa3efc0224c6eeb41..a2b470a1c1e93b502b240602368ea7381a06b2ca 100644
--- a/dumux/io/vtknestedfunction.hh
+++ b/dumux/io/vtknestedfunction.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/linear/borderindex.hh b/dumux/linear/borderindex.hh
index a26f10fdfb8eac59782de93a003a33615b32c0d5..906ef9ac825eca7a75585f6093170b041d6fe616 100644
--- a/dumux/linear/borderindex.hh
+++ b/dumux/linear/borderindex.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/linear/boxlinearsolver.hh b/dumux/linear/boxlinearsolver.hh
index 579925ee959d0eb01fda115bdb696298da4d9f70..e1785066eccbfa166ac126989a737d00b14da003 100644
--- a/dumux/linear/boxlinearsolver.hh
+++ b/dumux/linear/boxlinearsolver.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/linear/domesticoverlapfrombcrsmatrix.hh b/dumux/linear/domesticoverlapfrombcrsmatrix.hh
index c82ddbb20f586cc6f3be0ac6b1555647cbdfaa5d..c0b866c4a8aa186065983d5955cfc50d72b99d99 100644
--- a/dumux/linear/domesticoverlapfrombcrsmatrix.hh
+++ b/dumux/linear/domesticoverlapfrombcrsmatrix.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/linear/elementborderlistfromgrid.hh b/dumux/linear/elementborderlistfromgrid.hh
index 827976adf95effe352d2d7c80983ca80abbbceda..ec13d36868c43b5b2b195eeae1b6e245cff4a0df 100644
--- a/dumux/linear/elementborderlistfromgrid.hh
+++ b/dumux/linear/elementborderlistfromgrid.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/linear/foreignoverlapfrombcrsmatrix.hh b/dumux/linear/foreignoverlapfrombcrsmatrix.hh
index 738b076c7795c8066895a772575dbf3cf4b9160a..ea2a63f940623954b80c2f783bc04b5d9126228d 100644
--- a/dumux/linear/foreignoverlapfrombcrsmatrix.hh
+++ b/dumux/linear/foreignoverlapfrombcrsmatrix.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/linear/globalindices.hh b/dumux/linear/globalindices.hh
index fbdd38853f80a9ee8eda7f4ceba730e5be91e525..4f51e9bf60433be6e24db97bd3f5bcda5c1d7c36 100644
--- a/dumux/linear/globalindices.hh
+++ b/dumux/linear/globalindices.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/linear/impetbicgstabilu0solver.hh b/dumux/linear/impetbicgstabilu0solver.hh
index a83b1ade6f9320983a1bbc6124ac394dcefe1bfb..425cfc7138d5948cd4dd3dbec9d49c8b7ad59152 100644
--- a/dumux/linear/impetbicgstabilu0solver.hh
+++ b/dumux/linear/impetbicgstabilu0solver.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/linear/linearsolverproperties.hh b/dumux/linear/linearsolverproperties.hh
index 9a90cb0b9dc69ef16fabb35d963c8eb9622d377f..89615ea093c320a6f04b15de0e446ae3c947934c 100644
--- a/dumux/linear/linearsolverproperties.hh
+++ b/dumux/linear/linearsolverproperties.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/linear/overlappingbcrsmatrix.hh b/dumux/linear/overlappingbcrsmatrix.hh
index 9604e832b89d50a507a26b131cd6d95efda74425..627f28e1995bcc21c6b33502ca8387da1f65f8a0 100644
--- a/dumux/linear/overlappingbcrsmatrix.hh
+++ b/dumux/linear/overlappingbcrsmatrix.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/linear/overlappingblockvector.hh b/dumux/linear/overlappingblockvector.hh
index 4b1a3f939223541ff28bdf29e40b62bfb482ffaf..672bd27917d5d890f91309d3776566d66bd157f3 100644
--- a/dumux/linear/overlappingblockvector.hh
+++ b/dumux/linear/overlappingblockvector.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/linear/overlappingoperator.hh b/dumux/linear/overlappingoperator.hh
index 0354aec4f6af7afaab23464b396fdc74d8b083b7..ac97f8544d2906e3ff1a6b009c75a38b8db99ed6 100644
--- a/dumux/linear/overlappingoperator.hh
+++ b/dumux/linear/overlappingoperator.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/linear/overlappingpreconditioner.hh b/dumux/linear/overlappingpreconditioner.hh
index 69c81471e4bddad50853fcb62ff9337bb613f30c..5f19cd436bd841590270243b7672dae9d963b533 100644
--- a/dumux/linear/overlappingpreconditioner.hh
+++ b/dumux/linear/overlappingpreconditioner.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/linear/overlappingscalarproduct.hh b/dumux/linear/overlappingscalarproduct.hh
index 9d24fe04c51e4138bea17d2710963d9cafba2d83..c7902b61ddebf70d30a0b1a177dde03991d91684 100644
--- a/dumux/linear/overlappingscalarproduct.hh
+++ b/dumux/linear/overlappingscalarproduct.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/linear/seqsolverbackend.hh b/dumux/linear/seqsolverbackend.hh
index 636cda2fe251581976d98d96bf7e82ec1c902812..b1b747112ab77b04591a247b15e7dd11bc30850c 100644
--- a/dumux/linear/seqsolverbackend.hh
+++ b/dumux/linear/seqsolverbackend.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2011 by Bernd Flemisch                                    *
  *   Copyright (C) 2011 by Markus Wolff                                      *
  *   Copyright (C) 2011 by Klaus Mosthaf                                     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/linear/vertexborderlistfromgrid.hh b/dumux/linear/vertexborderlistfromgrid.hh
index f5463d556ab6d48b15897fd6277e03861c9112c0..f882c1f173c964f1e33f5baae59c5e01096e1357 100644
--- a/dumux/linear/vertexborderlistfromgrid.hh
+++ b/dumux/linear/vertexborderlistfromgrid.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/binarycoefficients/air_mesitylene.hh b/dumux/material/binarycoefficients/air_mesitylene.hh
index 24cd14a0678f50c03ca7c81865a37eb6a4c04bf8..48b6542fc9f16def71c2734554c7e7ea36959195 100644
--- a/dumux/material/binarycoefficients/air_mesitylene.hh
+++ b/dumux/material/binarycoefficients/air_mesitylene.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2011 by Holger Class                                      *
  *   Copyright (C) 2010 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/binarycoefficients/air_xylene.hh b/dumux/material/binarycoefficients/air_xylene.hh
index e27ed3e66397df53922905d98d26b1b74ea5aac4..fabf7eb7b7049b952f10df053cd20a5773eda075 100644
--- a/dumux/material/binarycoefficients/air_xylene.hh
+++ b/dumux/material/binarycoefficients/air_xylene.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2011 by Holger Class                                      *
  *   Copyright (C) 2010 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/binarycoefficients/fullermethod.hh b/dumux/material/binarycoefficients/fullermethod.hh
index 929bd80182a6c7701b0d2fc5ca206c7a76edf970..45f0ae3c8f5625ef7fb61589c1b398d70f940f7f 100644
--- a/dumux/material/binarycoefficients/fullermethod.hh
+++ b/dumux/material/binarycoefficients/fullermethod.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/binarycoefficients/h2o_air.hh b/dumux/material/binarycoefficients/h2o_air.hh
index b7b77ba02a80f9726c8c59d0c60a40b94ebb5d22..408409c4bc770cc3cbb7abb179f6fecd88137b3d 100644
--- a/dumux/material/binarycoefficients/h2o_air.hh
+++ b/dumux/material/binarycoefficients/h2o_air.hh
@@ -1,7 +1,9 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Holger Class                                      *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/binarycoefficients/h2o_mesitylene.hh b/dumux/material/binarycoefficients/h2o_mesitylene.hh
index 1a2938793c14125184f2f07e7a93050c999e70c9..c9f0f1c3e451ebb65dcb04948644ab75d7dedf3d 100644
--- a/dumux/material/binarycoefficients/h2o_mesitylene.hh
+++ b/dumux/material/binarycoefficients/h2o_mesitylene.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2011 by Holger Class                                      *
  *   Copyright (C) 2010 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/binarycoefficients/h2o_n2.hh b/dumux/material/binarycoefficients/h2o_n2.hh
index fb28c5ebec502cf73ec2f83cf226eee3bde9379f..39532615fd8f2d3a10c90b8d2f414190dc67413b 100644
--- a/dumux/material/binarycoefficients/h2o_n2.hh
+++ b/dumux/material/binarycoefficients/h2o_n2.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/binarycoefficients/h2o_xylene.hh b/dumux/material/binarycoefficients/h2o_xylene.hh
index a6e94b2eaa38caa7168583bec7a791d310ecbd82..4a7f2b8d2182c53f5c295b5c109209071214c282 100644
--- a/dumux/material/binarycoefficients/h2o_xylene.hh
+++ b/dumux/material/binarycoefficients/h2o_xylene.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2011 by Holger Class                                      *
  *   Copyright (C) 2010 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/binarycoefficients/henryiapws.hh b/dumux/material/binarycoefficients/henryiapws.hh
index b7ccdb47065846e5cc270362132ef08334a80e29..828647df75782223748b617f0d06977b28549ee4 100644
--- a/dumux/material/binarycoefficients/henryiapws.hh
+++ b/dumux/material/binarycoefficients/henryiapws.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/air.hh b/dumux/material/components/air.hh
index 5331caeb333243d373617582f5aea2e54b662d0d..c83ddc290ba0b86c046f006666825dad6cf30d04 100644
--- a/dumux/material/components/air.hh
+++ b/dumux/material/components/air.hh
@@ -1,7 +1,14 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
- *   Copyright (C) 2010 leopold stadler lstadler@wahyd.tu-berlin.de          *
- *   Copyright (C) 2011 by Benjamin Faigle, Holger Class                     *   
- *   Institute of Hydraulic Engineering                                      *
+ *   Copyright (C) 2010 Leopold Stadler                                      *
+ *   Chair of Water Resources Management and Modeling of Hydrosystems        *
+ *   Technical University of Berlin                                          *
+ *   email:lstadler@wahyd.tu-berlin.de                                       *
+ *                                                                           *
+ *   Copyright (C) 2011 by Benjamin Faigle                                   *   
+ *   Copyright (C) 2011 by Holger Class                                      *   
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/benzene.hh b/dumux/material/components/benzene.hh
index 7d0a4b198818541d830080568581d3f8e4fc5734..acc19844fe186d6523f2619a449d8680d4068d44 100644
--- a/dumux/material/components/benzene.hh
+++ b/dumux/material/components/benzene.hh
@@ -1,7 +1,8 @@
-// $Id: simplednapl.hh 4952 2011-01-04 15:49:28Z lauser $
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
@@ -21,8 +22,7 @@
 /*!
  * \file
  * \ingroup Components
- * \brief A much simpler (and thus potentially less buggy) version of
- *        pure water.
+ * \brief A simple benzene component (LNAPL).
  */
 #ifndef DUMUX_BENZENE_HH
 #define DUMUX_BENZENE_HH
@@ -35,7 +35,8 @@ namespace Dumux
 {
 /*!
  * \ingroup Components
- * \brief A much simple component for an exemplary dense NAPL (benzene).
+ *
+ * \brief A simple benzene component (LNAPL).
  *
  * \tparam Scalar The type used for scalar values
  */
diff --git a/dumux/material/components/brine.hh b/dumux/material/components/brine.hh
index a24caf2ff60b0d511b683876f1912e15d9a35831..692971ac38e71af4e7ddb288a34e88ac7ecabf5a 100644
--- a/dumux/material/components/brine.hh
+++ b/dumux/material/components/brine.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2009-2010 by Melanie Darcis                               *
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/ch4.hh b/dumux/material/components/ch4.hh
index 3854ea09e10cbef73fbffb6e743c4a2b8f5ed46b..c78b73133c43edabe123c54f604f84340bb88bda 100644
--- a/dumux/material/components/ch4.hh
+++ b/dumux/material/components/ch4.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Andreas Lauser
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/component.hh b/dumux/material/components/component.hh
index 998601fb9800592d2b6e57d1cd11bc9df08711fb..76c3b9679eaa72fa8ee4e31b063b8ce651091211 100644
--- a/dumux/material/components/component.hh
+++ b/dumux/material/components/component.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/h2.hh b/dumux/material/components/h2.hh
index e4d4d9a6133c4cd5e11071128629bf5adb60623e..f8bab82ce986d7fbb97c38d27a03b09000c4bc4f 100644
--- a/dumux/material/components/h2.hh
+++ b/dumux/material/components/h2.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/h2o.hh b/dumux/material/components/h2o.hh
index 9bf6a60bdc037dc81c7085b1608bf441e933cd7c..87c5774a1e26c6e82ca29d5af6a0ec8aaa316cab 100644
--- a/dumux/material/components/h2o.hh
+++ b/dumux/material/components/h2o.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/iapws/common.hh b/dumux/material/components/iapws/common.hh
index 91f4341e00c9966b481d55cec2a7aafdcc33c3fc..200dbc8850a8804d803486b8f74d0703f1a10798 100644
--- a/dumux/material/components/iapws/common.hh
+++ b/dumux/material/components/iapws/common.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/iapws/region1.hh b/dumux/material/components/iapws/region1.hh
index fd4239b47a648c062ea2a9a0bc2bd49213f7d0e6..98023762a6bfae0cfb79568f5cc6aff127f760ed 100644
--- a/dumux/material/components/iapws/region1.hh
+++ b/dumux/material/components/iapws/region1.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/iapws/region2.hh b/dumux/material/components/iapws/region2.hh
index 23fb60ddb9d8a4f4a2c41bcf8df74c5084ef4312..50264994d8f178d7366cdf38ccdf9f27a483ea87 100644
--- a/dumux/material/components/iapws/region2.hh
+++ b/dumux/material/components/iapws/region2.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/iapws/region4.hh b/dumux/material/components/iapws/region4.hh
index 4cafc08de7bbfe37c923c1b5720c87775527b4ff..9464e41f6a1612d01635b69965c2f983347d58ac 100644
--- a/dumux/material/components/iapws/region4.hh
+++ b/dumux/material/components/iapws/region4.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/mesitylene.hh b/dumux/material/components/mesitylene.hh
index 0e0ab5532281f6f5dcb1055d7f211375879e6923..f9e75f2878a657e89f1e7608e20d027a777b561e 100644
--- a/dumux/material/components/mesitylene.hh
+++ b/dumux/material/components/mesitylene.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2011 by Holger Class                                      *
  *   Copyright (C) 2009 by Andreas Lauser
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/n2.hh b/dumux/material/components/n2.hh
index 61b7ae6f82f739fcc0bcfc2bf2577c0de8dedef4..cc4e558b4dc889438906fd41347464f23abf6ead 100644
--- a/dumux/material/components/n2.hh
+++ b/dumux/material/components/n2.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/nullcomponent.hh b/dumux/material/components/nullcomponent.hh
index 7e0ac58d8b5bcdf7e80aa5bb52bef5cffefb2649..7342e6ba5250b07cdad07bc729717985537d7a55 100644
--- a/dumux/material/components/nullcomponent.hh
+++ b/dumux/material/components/nullcomponent.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/o2.hh b/dumux/material/components/o2.hh
index eac0c48bf4614c12b0b3112c9270d317f5f33c57..ffd749c8fc2919fc2d5821656d7bb47d28cb1bba 100644
--- a/dumux/material/components/o2.hh
+++ b/dumux/material/components/o2.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/oil.hh b/dumux/material/components/oil.hh
index f0704a67abddaf23295f393190939c97a3d7bdf0..80f58ea0ac5a72daf2e9981f8e59b73e34659779 100644
--- a/dumux/material/components/oil.hh
+++ b/dumux/material/components/oil.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/simpleco2.hh b/dumux/material/components/simpleco2.hh
index 38159cdf73099a298371466486430647d681c861..ef4748caf75ab3ed8a1f77aa03b78c82f8710fc9 100644
--- a/dumux/material/components/simpleco2.hh
+++ b/dumux/material/components/simpleco2.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2009-2010 by Melanie Darcis                               *
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/simplednapl.hh b/dumux/material/components/simplednapl.hh
index fd48fde6eeb5f62bd6561130d25ab8172717d4ac..c790c7eef8eec476c831bf5f7074ac521e6ba475 100644
--- a/dumux/material/components/simplednapl.hh
+++ b/dumux/material/components/simplednapl.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/simpleh2o.hh b/dumux/material/components/simpleh2o.hh
index 04a4d1acf3abbbf6a8ff33f808bd49030a8d5ceb..e0a15404301e4401a4c8bc606e0f015173d218db 100644
--- a/dumux/material/components/simpleh2o.hh
+++ b/dumux/material/components/simpleh2o.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/tabulatedcomponent.hh b/dumux/material/components/tabulatedcomponent.hh
index 42e81c7c8a3b6522b3bec8cc3810dd739e209202..b08c6fca0d96aa612f1fa43fdc8afd580ebd59ca 100644
--- a/dumux/material/components/tabulatedcomponent.hh
+++ b/dumux/material/components/tabulatedcomponent.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/unit.hh b/dumux/material/components/unit.hh
index 5cb262b5b8d9ef3a039ca7efb03ddba2fcb7b596..b3eeba4c6c82ac0505e9a672e64eff989ffb5715 100644
--- a/dumux/material/components/unit.hh
+++ b/dumux/material/components/unit.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/components/xylene.hh b/dumux/material/components/xylene.hh
index 749fae4beadb800e6a88b05af6951ec84120576a..8ee33d8cc30bab38722663a9415f440b21d53d0f 100644
--- a/dumux/material/components/xylene.hh
+++ b/dumux/material/components/xylene.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2011 by Holger Class                                      *
  *   Copyright (C) 2009 by Andreas Lauser
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/constants.hh b/dumux/material/constants.hh
index 1550ee4de11cdfaaca09accd9580d11fad9259bb..abbcf488f1e693e7b1bc65ba45b965749066296e 100644
--- a/dumux/material/constants.hh
+++ b/dumux/material/constants.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/constraintsolvers/compositionfromfugacities.hh b/dumux/material/constraintsolvers/compositionfromfugacities.hh
index 38b84c0358b067deef9fe32d32b41b60209f908f..65a4a69dcf18e02f081f141bd61257a03d02a5aa 100644
--- a/dumux/material/constraintsolvers/compositionfromfugacities.hh
+++ b/dumux/material/constraintsolvers/compositionfromfugacities.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010-2011 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/constraintsolvers/computefromreferencephase.hh b/dumux/material/constraintsolvers/computefromreferencephase.hh
index 4178b0b412c9cb4e625e71d323fba36a29d63894..f1d8472f7ade95fff237a48d3019773552a371dd 100644
--- a/dumux/material/constraintsolvers/computefromreferencephase.hh
+++ b/dumux/material/constraintsolvers/computefromreferencephase.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/constraintsolvers/immiscibleflash.hh b/dumux/material/constraintsolvers/immiscibleflash.hh
index a2f4dbcf1989ff4eb74c547fa6bb1f02dcc22c85..6f4f83a148c14b9fc54e1babede6f5c8dd046ed7 100644
--- a/dumux/material/constraintsolvers/immiscibleflash.hh
+++ b/dumux/material/constraintsolvers/immiscibleflash.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/constraintsolvers/misciblemultiphasecomposition.hh b/dumux/material/constraintsolvers/misciblemultiphasecomposition.hh
index 10a4fdc70d8c63dd4a026e471e3200d1ccbaea5e..55b81aaeb4da1534511be0b31a8792fc30f2ba51 100644
--- a/dumux/material/constraintsolvers/misciblemultiphasecomposition.hh
+++ b/dumux/material/constraintsolvers/misciblemultiphasecomposition.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/constraintsolvers/ncpflash.hh b/dumux/material/constraintsolvers/ncpflash.hh
index ecaf2d1c85e4c9f673a638cdf923b5abc7adbd4f..820f4922df2da9f69d6cdd552575dacfe845f2ca 100644
--- a/dumux/material/constraintsolvers/ncpflash.hh
+++ b/dumux/material/constraintsolvers/ncpflash.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/eos/pengrobinson.hh b/dumux/material/eos/pengrobinson.hh
index f644eee12071619c8d7ede36a165fb42ae9b5a8d..1c83bed1ea335c0af3c0ed87ee011095a47237a4 100644
--- a/dumux/material/eos/pengrobinson.hh
+++ b/dumux/material/eos/pengrobinson.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010-2011 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/eos/pengrobinsonmixture.hh b/dumux/material/eos/pengrobinsonmixture.hh
index a4de0ae20a9a541f918453455d2c66681d2c7e55..5d20f18002e9b40db9a8524977c4212414a0d995 100644
--- a/dumux/material/eos/pengrobinsonmixture.hh
+++ b/dumux/material/eos/pengrobinsonmixture.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/eos/pengrobinsonparams.hh b/dumux/material/eos/pengrobinsonparams.hh
index 0023f7109c224a8128a3d3afbcd4f19632e21d8f..40ac000d698bb56f791dc6759127556cfb18b25e 100644
--- a/dumux/material/eos/pengrobinsonparams.hh
+++ b/dumux/material/eos/pengrobinsonparams.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/eos/pengrobinsonparamsmixture.hh b/dumux/material/eos/pengrobinsonparamsmixture.hh
index ee79de830dff4838e7fe33ae4b8fb2dc3b313881..8780d19f69e7f00e2bda93a0b6a0409124781210 100644
--- a/dumux/material/eos/pengrobinsonparamsmixture.hh
+++ b/dumux/material/eos/pengrobinsonparamsmixture.hh
@@ -1,6 +1,8 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010-2012 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh b/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
index 0feeef241461380a27c1a86b40e33c1a76fa069e..355e4e7d18c295b230d321bc8a4cd6538dcedc06 100644
--- a/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/2p/brookscoreyparams.hh b/dumux/material/fluidmatrixinteractions/2p/brookscoreyparams.hh
index 1f5e276c35bf222ec3a3dbe800cb21c725490a14..e6d9c7b9223d9f401c2a584509cb106b680d5b05 100644
--- a/dumux/material/fluidmatrixinteractions/2p/brookscoreyparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/brookscoreyparams.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Andreas Lauser, Bernd Flemisch                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh b/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
index ddd60570f25bd33cebe13b877f35a3abeb426150..fcd327d9db3c005976e29d4f57264d127d0c1fbc 100644
--- a/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh b/dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh
index 85342c8aea92102a8446b71a88871b0dfbcadead..9fae8ec9115628a9e30c6b6dd596f30ac1add076 100644
--- a/dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh b/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh
index 17e78ddd2781cb4e7910cf679c4a41a12b3940b9..5d4958cd1cc1bf86160e6c7062e55e6ec5eb9ecc 100644
--- a/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/2p/linearmaterialparams.hh b/dumux/material/fluidmatrixinteractions/2p/linearmaterialparams.hh
index 9eb3426c55b61cd7c7ca36841a4d41a408a4567d..82b5a8b2922d65eb2a4150be796d32c6586737d8 100644
--- a/dumux/material/fluidmatrixinteractions/2p/linearmaterialparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/linearmaterialparams.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Andreas Lauser, Bernd Flemisch                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
index 58fe6d4cb2c447aa9ee3e854d1e8d76b613e4609..e4e4a2b8a1189aabff0061d6356d0185d8c898d7 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Andreas Lauser, Bernd Flemisch                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscoreyparams.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscoreyparams.hh
index 369e6cd47d0ae8a5a6f06812fa6a0fe8fa88e854..0053bbce68a7d2b15e9d2f41c6a3f2c41281d8ef 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscoreyparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscoreyparams.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Andreas Lauser, Bernd Flemisch                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh
index 0a54e2d4a1f9b2ac646b85f7a34116074b32b49e..2f093d33958e892ce723ceeced6a371c8650e1e3 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterialparams.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterialparams.hh
index 754f9a0275eb4a0fbe32bf0c3805ee922b1724ef..3859879775756f396f1e0f0ae52309fb33378d53 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterialparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterialparams.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Andreas Lauser, Bernd Flemisch                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
index 68ad0a23b5531d37fe56fd7fed9342db4f00c281..cc25ca4b2e7ce97d96a4520752e4b5d0f9c1769c 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Andreas Lauser, Bernd Flemisch                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh
index 2acd2d069090b210ce45f3df6bf82a40fe322f75..9a878e3171b4ed9cbf79f9abad5a8ce719cba9e1 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Andreas Lauser, Bernd Flemisch                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh b/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
index 38e1c0d0c1ab61d5673bfe65417abd91d34f810c..92baf2aa1c5fcbd4f874b63143dad7ae37fcc996 100644
--- a/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Andreas Lauser, Bernd Flemisch                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/2p/vangenuchtenparams.hh b/dumux/material/fluidmatrixinteractions/2p/vangenuchtenparams.hh
index 674e81485835044c519d95822122ac7fd026665a..2dfd81675572be62e86a69633f6611eaa1fb5a43 100644
--- a/dumux/material/fluidmatrixinteractions/2p/vangenuchtenparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/vangenuchtenparams.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Andreas Lauser, Bernd Flemisch                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/3p/linearmaterial3p.hh b/dumux/material/fluidmatrixinteractions/3p/linearmaterial3p.hh
index 51b8513bf9f6bc92b38ade2169bc51a0190905bf..87ef633beac46cf9d4a09eeb6a79fcca002ecda4 100644
--- a/dumux/material/fluidmatrixinteractions/3p/linearmaterial3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/linearmaterial3p.hh
@@ -1,6 +1,8 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Jochen Fritz, Benjamin Faigle                     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/3p/linearmaterialparams3p.hh b/dumux/material/fluidmatrixinteractions/3p/linearmaterialparams3p.hh
index 96a6efc1af7b7de01683e0832193f4ced06958a7..dd79ed2cc438d0b0f7fd214898654fde2e6ae0f4 100644
--- a/dumux/material/fluidmatrixinteractions/3p/linearmaterialparams3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/linearmaterialparams3p.hh
@@ -1,6 +1,8 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Jochen Fritz, Benjamin Faigle                     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh
index b4e3f94a303e98304189c618dfcea6b4d279d143..4ba43530bff2d74285af69b2b198838fedcd2b10 100644
--- a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2011 by Holger Class                                      *
  *   Copyright (C) 2010 by Jochen Fritz, Benjamin Faigle                     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3pparams.hh b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3pparams.hh
index af25bad9453d7371aaaa8cc11a4805e30b5b3929..e8e129c4376e1b3995718dc8404e4c5d1b8ba48a 100644
--- a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3pparams.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3pparams.hh
@@ -1,7 +1,9 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Holger Class                                      *
  *   Copyright (C) 2010 by Jochen Fritz, Benjamin Faigle                     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/3p/vangenuchten3p.hh b/dumux/material/fluidmatrixinteractions/3p/vangenuchten3p.hh
index 3ac3ed1b12b87262d374bd4271234c31975a1dce..8560bb746c580522bd1d006d4aba017c3c9d9bad 100644
--- a/dumux/material/fluidmatrixinteractions/3p/vangenuchten3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/vangenuchten3p.hh
@@ -1,6 +1,8 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Jochen Fritz, Benjamin Faigle                     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/3p/vangenuchtenparams3p.hh b/dumux/material/fluidmatrixinteractions/3p/vangenuchtenparams3p.hh
index 412d00be5f4b3cc08345c2ae12e2242e665dd59f..cc17bc3c4f1b71b5f930de2d332e8e4657d1a8c6 100644
--- a/dumux/material/fluidmatrixinteractions/3p/vangenuchtenparams3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/vangenuchtenparams3p.hh
@@ -1,6 +1,8 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Jochen Fritz, Benjamin Faigle                     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/Mp/2padapter.hh b/dumux/material/fluidmatrixinteractions/Mp/2padapter.hh
index 132807ce898ce15cf9d009482455bd1458b3d274..eef5c62fa655a13bb64f684a5b622579af5c896c 100644
--- a/dumux/material/fluidmatrixinteractions/Mp/2padapter.hh
+++ b/dumux/material/fluidmatrixinteractions/Mp/2padapter.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/Mp/Mplinearmaterial.hh b/dumux/material/fluidmatrixinteractions/Mp/Mplinearmaterial.hh
index cef7e9d8f1e967272b8332e680e1ace8a07b543e..b8f13cade113546c87b9468593d7fc90a55d4a07 100644
--- a/dumux/material/fluidmatrixinteractions/Mp/Mplinearmaterial.hh
+++ b/dumux/material/fluidmatrixinteractions/Mp/Mplinearmaterial.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidmatrixinteractions/Mp/Mplinearmaterialparams.hh b/dumux/material/fluidmatrixinteractions/Mp/Mplinearmaterialparams.hh
index 6bfcc74ac1dddb7964d178bc881e861f9db31a92..667349be3ec9b2ca0211189560958966d4e7bd4b 100644
--- a/dumux/material/fluidmatrixinteractions/Mp/Mplinearmaterialparams.hh
+++ b/dumux/material/fluidmatrixinteractions/Mp/Mplinearmaterialparams.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidstates/compositionalfluidstate.hh b/dumux/material/fluidstates/compositionalfluidstate.hh
index 900de9ec2521cd56c5a45b831a13b1c7a8d1caf2..ec800944d3a0714a0ad520c6699b487297bb12a1 100644
--- a/dumux/material/fluidstates/compositionalfluidstate.hh
+++ b/dumux/material/fluidstates/compositionalfluidstate.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010-2011 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidstates/immisciblefluidstate.hh b/dumux/material/fluidstates/immisciblefluidstate.hh
index 25cecb55e3cb45f195903da7b5ff7a9f3d9a2370..17486404def6866e65b612a4e7fcf798aeb9ef3e 100644
--- a/dumux/material/fluidstates/immisciblefluidstate.hh
+++ b/dumux/material/fluidstates/immisciblefluidstate.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidstates/isoimmisciblefluidstate.hh b/dumux/material/fluidstates/isoimmisciblefluidstate.hh
index 095913e32f4bf0ba85cabced6535b9a4a3a8e4af..7aaf70eaa01cca8a706abbe0b8c30af7323e1d4f 100644
--- a/dumux/material/fluidstates/isoimmisciblefluidstate.hh
+++ b/dumux/material/fluidstates/isoimmisciblefluidstate.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidstates/nonequilibriumfluidstate.hh b/dumux/material/fluidstates/nonequilibriumfluidstate.hh
index b5373f6b395a156cb096adda2858f6610ab1a7d8..d3832063ed621b8123e72342bdac23d80af0cb80 100644
--- a/dumux/material/fluidstates/nonequilibriumfluidstate.hh
+++ b/dumux/material/fluidstates/nonequilibriumfluidstate.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010-2011 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidstates/pressureoverlayfluidstate.hh b/dumux/material/fluidstates/pressureoverlayfluidstate.hh
index eb2b50cec1f3f9ba9d44ab944fe23ba8ece3de86..c156eb77c6232a65cc3172933f60e02d81a30f07 100644
--- a/dumux/material/fluidstates/pressureoverlayfluidstate.hh
+++ b/dumux/material/fluidstates/pressureoverlayfluidstate.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010-2011 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidstates/saturationoverlayfluidstate.hh b/dumux/material/fluidstates/saturationoverlayfluidstate.hh
index 9081a18f7648059c89d43aea3e9d2b3a23e09a81..5db328b6a5dc5266a6b21091611bbbad2dc35300 100644
--- a/dumux/material/fluidstates/saturationoverlayfluidstate.hh
+++ b/dumux/material/fluidstates/saturationoverlayfluidstate.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010-2011 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidstates/temperatureoverlayfluidstate.hh b/dumux/material/fluidstates/temperatureoverlayfluidstate.hh
index b1794dddda088b0abd24a829f105c9b9d4b402c8..bc409df4329aeb8ff4eaf651f77ffaa2ffb2a4e3 100644
--- a/dumux/material/fluidstates/temperatureoverlayfluidstate.hh
+++ b/dumux/material/fluidstates/temperatureoverlayfluidstate.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010-2011 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidsystems/1pfluidsystem.hh b/dumux/material/fluidsystems/1pfluidsystem.hh
index 938e469ce5b0bda3ac3e166e64ff02e2ce2c14f5..cfef21a288a8f870ced079431cec25fc92312a4e 100644
--- a/dumux/material/fluidsystems/1pfluidsystem.hh
+++ b/dumux/material/fluidsystems/1pfluidsystem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh b/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh
index 872dd9fb8f0facafa1d3b5cfe8aa91c7964d40e4..437ae592f8bebc7f0d138fe4fadb997160729ab9 100644
--- a/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh
+++ b/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2009-2011 by Andreas Lauser                               *
  *   Copyright (C) 2009-2011 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidsystems/basefluidsystem.hh b/dumux/material/fluidsystems/basefluidsystem.hh
index 84523532e28a3ecf0e86cbdcbbc8305efcaf9812..ca4bbdd6a868f9dd77c994fb4a3122942b12d4fe 100644
--- a/dumux/material/fluidsystems/basefluidsystem.hh
+++ b/dumux/material/fluidsystems/basefluidsystem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Bernd Flemisch, Andreas Lauser                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidsystems/defaultcomponents.hh b/dumux/material/fluidsystems/defaultcomponents.hh
index 049163953f4bd0f1b2571ac25d487fd363fccfb0..53c70bdb09d6e5a7e0db6bde681b6e3c824e2fe4 100644
--- a/dumux/material/fluidsystems/defaultcomponents.hh
+++ b/dumux/material/fluidsystems/defaultcomponents.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2010 by Andreas Lauser                                    *
  *   Copyright (C) 2010 by Benjamin Faigle                                   *
  *   Copyright (C) 2010 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidsystems/gasphase.hh b/dumux/material/fluidsystems/gasphase.hh
index 9217b08293c4432951cf08642838b29ae7fe98af..a2ef43b342078b425e80e48bf305fa51eaf2abf4 100644
--- a/dumux/material/fluidsystems/gasphase.hh
+++ b/dumux/material/fluidsystems/gasphase.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidsystems/h2o_air_xylene_system.hh b/dumux/material/fluidsystems/h2o_air_xylene_system.hh
index 426f4ea6162a6de72c41a9372b77ac28e54b7725..a7a8d0e952d14be2e38b4449b2ff5a8b536ee970 100644
--- a/dumux/material/fluidsystems/h2o_air_xylene_system.hh
+++ b/dumux/material/fluidsystems/h2o_air_xylene_system.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2011 by Holger Class                                      *
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidsystems/h2oairfluidsystem.hh b/dumux/material/fluidsystems/h2oairfluidsystem.hh
index 7380ff2d22fc2edef5e884a64ee2730353e3453d..f961d445aecfbb405fcd65c689f110735cb59b1e 100644
--- a/dumux/material/fluidsystems/h2oairfluidsystem.hh
+++ b/dumux/material/fluidsystems/h2oairfluidsystem.hh
@@ -1,7 +1,9 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Benjamin Faigle                                   *
  *   Copyright (C) 2011 by Klaus Mosthaf                                     *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh b/dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh
index 32b398a4f628b9ebfcddbc45364833104109ae26..fc64219207e637eff5386bd2ee8e3d808dd40ea5 100644
--- a/dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh
+++ b/dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2011-2012 by Holger Class                                 *
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidsystems/h2oairxylenefluidsystem.hh b/dumux/material/fluidsystems/h2oairxylenefluidsystem.hh
index e577c2b5608d1a0c6c5ab64814199f434d6a431f..472d38fb50f63c1c59d776b18da362d3def38bd0 100644
--- a/dumux/material/fluidsystems/h2oairxylenefluidsystem.hh
+++ b/dumux/material/fluidsystems/h2oairxylenefluidsystem.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2011 by Holger Class                                      *
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidsystems/h2on2fluidsystem.hh b/dumux/material/fluidsystems/h2on2fluidsystem.hh
index c8a8d5b707563950664b41c9015080081c7b5a80..9ac7f6928949772a52e418bec18a5208f62cfc5d 100644
--- a/dumux/material/fluidsystems/h2on2fluidsystem.hh
+++ b/dumux/material/fluidsystems/h2on2fluidsystem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009-2011 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidsystems/liquidphase.hh b/dumux/material/fluidsystems/liquidphase.hh
index 3adb10eb0533dc247f6b93bd5cb0cce304a5b62b..f1c728399a38acd6cf437e6176df0350cfde0d42 100644
--- a/dumux/material/fluidsystems/liquidphase.hh
+++ b/dumux/material/fluidsystems/liquidphase.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidsystems/nullparametercache.hh b/dumux/material/fluidsystems/nullparametercache.hh
index 76a63f97041f30fc785d0940443315a6ff97ba3c..372ae83dda58d79c8de1d01cb7c785075095919e 100644
--- a/dumux/material/fluidsystems/nullparametercache.hh
+++ b/dumux/material/fluidsystems/nullparametercache.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidsystems/parametercachebase.hh b/dumux/material/fluidsystems/parametercachebase.hh
index e6f8f537a3af8e60fe47cb680e5ed5a9b3f5b84b..7a7277d0907d86ee597b7f207a7cb08ba47f04f8 100644
--- a/dumux/material/fluidsystems/parametercachebase.hh
+++ b/dumux/material/fluidsystems/parametercachebase.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidsystems/spe5fluidsystem.hh b/dumux/material/fluidsystems/spe5fluidsystem.hh
index b299cffd55d624e506d9392f995af20df35b1e69..ef7c5fbd671a3e881ccfe464a3549df62a580c8b 100644
--- a/dumux/material/fluidsystems/spe5fluidsystem.hh
+++ b/dumux/material/fluidsystems/spe5fluidsystem.hh
@@ -1,6 +1,8 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
- *   Copyright (C) 2009-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Copyright (C) 2009-2012 by Andreas Lauser                               *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/fluidsystems/spe5parametercache.hh b/dumux/material/fluidsystems/spe5parametercache.hh
index 8590e869af2a73bcff36882506c27f4ad2fed2ea..53ab2b92a3083441f98c3d2dbd689dfe771e35cc 100644
--- a/dumux/material/fluidsystems/spe5parametercache.hh
+++ b/dumux/material/fluidsystems/spe5parametercache.hh
@@ -1,6 +1,8 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/idealgas.hh b/dumux/material/idealgas.hh
index 56f42de2a3ef790e4855d584cd789179b1b4f90e..252c0ab7771370ad7b0a3cb75423bc2066cb7b0f 100644
--- a/dumux/material/idealgas.hh
+++ b/dumux/material/idealgas.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009 by Andreas Lauser
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/spatialparameters/boxspatialparameters.hh b/dumux/material/spatialparameters/boxspatialparameters.hh
index 5af7b28fb89cfc8463bd27ea9f688c98b439ea79..8f023d0f98063290458e4638b01bc6591e1e3957 100644
--- a/dumux/material/spatialparameters/boxspatialparameters.hh
+++ b/dumux/material/spatialparameters/boxspatialparameters.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/spatialparameters/boxspatialparameters1p.hh b/dumux/material/spatialparameters/boxspatialparameters1p.hh
index 301e2e6ea3a62a246178c4a6494b9bd1f8031c71..38e9a90ad372749fada0c563e432d2afc897f00b 100644
--- a/dumux/material/spatialparameters/boxspatialparameters1p.hh
+++ b/dumux/material/spatialparameters/boxspatialparameters1p.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/spatialparameters/fvspatialparameters.hh b/dumux/material/spatialparameters/fvspatialparameters.hh
index fc04611517c5d3aa2dde2d180c420d31e4b74d93..807f2a7a4bd2ab36ccd421ddaafa9e119f706a33 100644
--- a/dumux/material/spatialparameters/fvspatialparameters.hh
+++ b/dumux/material/spatialparameters/fvspatialparameters.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/material/spatialparameters/fvspatialparameters1p.hh b/dumux/material/spatialparameters/fvspatialparameters1p.hh
index defaf0b8962c0ef90d0d7079ea71f9c7d8224254..4b9bd00640ff7edd919f796a1c927890712e51aa 100644
--- a/dumux/material/spatialparameters/fvspatialparameters1p.hh
+++ b/dumux/material/spatialparameters/fvspatialparameters1p.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Markus Wolff                                      *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/nonlinear/newtoncontroller.hh b/dumux/nonlinear/newtoncontroller.hh
index e825cc3202e9f5d58fe0171f2e1dfc18dcd6e86c..b7dfa2eb3411cacc046f94ecc6033a332634636e 100644
--- a/dumux/nonlinear/newtoncontroller.hh
+++ b/dumux/nonlinear/newtoncontroller.hh
@@ -3,7 +3,7 @@
 /****************************************************************************
  *   Copyright (C) 2008-2011 by Andreas Lauser                               *
  *   Copyright (C) 2008-2010 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/nonlinear/newtonconvergencewriter.hh b/dumux/nonlinear/newtonconvergencewriter.hh
index dadbbfa37db7a72f3311fc528af2b036cd6661de..c4aaec6abfd514e542625c502865d833621da214 100644
--- a/dumux/nonlinear/newtonconvergencewriter.hh
+++ b/dumux/nonlinear/newtonconvergencewriter.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010-11 by Andreas Lauser                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/nonlinear/newtonmethod.hh b/dumux/nonlinear/newtonmethod.hh
index 778e168d40aaa7b243ffffa29e57a85fecc93878..b994318ef7d689473861cd932365127df86677c5 100644
--- a/dumux/nonlinear/newtonmethod.hh
+++ b/dumux/nonlinear/newtonmethod.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008 by Andreas Lauser, Bernd Flemisch                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/parallel/elementhandles.hh b/dumux/parallel/elementhandles.hh
index b29fd1d9d274c9a063fa6c63bdd08de96c1d65b5..2c6cb33f16c2b1ee409b70f637b72cd0554d6d0e 100644
--- a/dumux/parallel/elementhandles.hh
+++ b/dumux/parallel/elementhandles.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/parallel/mpibuffer.hh b/dumux/parallel/mpibuffer.hh
index 2e9d9841943d12c8a852a73c2c2ee139404b6256..7edcbc2f182360c3174614e85f99c7348c13a8bc 100644
--- a/dumux/parallel/mpibuffer.hh
+++ b/dumux/parallel/mpibuffer.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/dumux/parallel/vertexhandles.hh b/dumux/parallel/vertexhandles.hh
index 1881135f9b550042bfe0727d91ed5c4adf94820f..950e7993f0787ea64b0d605040d9d4134538f0de 100644
--- a/dumux/parallel/vertexhandles.hh
+++ b/dumux/parallel/vertexhandles.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/1p/1ptestproblem.hh b/test/boxmodels/1p/1ptestproblem.hh
index 51bb003bf056570c3e3053d1c5773ec2ff6bdb2c..cec00d040876dfe7dd79982611ebc2dd237908a5 100644
--- a/test/boxmodels/1p/1ptestproblem.hh
+++ b/test/boxmodels/1p/1ptestproblem.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2009 by Onur Dogan                                        *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/1p/1ptestspatialparameters.hh b/test/boxmodels/1p/1ptestspatialparameters.hh
index 819498755b1ae4e7835878c4b21bc76ce386275c..bad49620307112e2a4d7f1adbff9842c68e78f14 100644
--- a/test/boxmodels/1p/1ptestspatialparameters.hh
+++ b/test/boxmodels/1p/1ptestspatialparameters.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/1p2c/interstitialfluidtrailfluidsystem.hh b/test/boxmodels/1p2c/interstitialfluidtrailfluidsystem.hh
index d8340061b4582b8312dbef9c145aefc624c485fe..f7a68bab307289f2f7462a678091950a3c574354 100644
--- a/test/boxmodels/1p2c/interstitialfluidtrailfluidsystem.hh
+++ b/test/boxmodels/1p2c/interstitialfluidtrailfluidsystem.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
  *   Copyright (C) 2010 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/1p2c/tissue_tumor_problem.hh b/test/boxmodels/1p2c/tissue_tumor_problem.hh
index 54a2a1af1d643a1cc01f122bd8910646bdc67b14..ed137771ea2de0d09909b003f3f28c9e794351d0 100644
--- a/test/boxmodels/1p2c/tissue_tumor_problem.hh
+++ b/test/boxmodels/1p2c/tissue_tumor_problem.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2009 by Karin Erbertseder                                 *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
  *   Copyright (C) 2008 by Bernd Flemisch                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh b/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh
index 3f3f7a9860045b822a456f12a67c78d8c10a8a6f..f6862eb7361758ebbeeff66974c8ed011f8fbb6e 100644
--- a/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh
+++ b/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/2p/lensproblem.hh b/test/boxmodels/2p/lensproblem.hh
index 46eb94dfbd78712d384ba156a0f4454658ea8e19..9f80b4009bc61cdd036d09dad03c9ef193583cf0 100644
--- a/test/boxmodels/2p/lensproblem.hh
+++ b/test/boxmodels/2p/lensproblem.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2007-2008 by Klaus Mosthaf                                *
  *   Copyright (C) 2007-2008 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/2p/lensspatialparameters.hh b/test/boxmodels/2p/lensspatialparameters.hh
index cb06071d61d35705bc2f6911a5ff41eef9c158c3..058e78fb45d9ea559ebfd76c81b9888e8deab5f0 100644
--- a/test/boxmodels/2p/lensspatialparameters.hh
+++ b/test/boxmodels/2p/lensspatialparameters.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2007-2008 by Klaus Mosthaf                                *
  *   Copyright (C) 2007-2008 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/2p2c/injectionproblem.hh b/test/boxmodels/2p2c/injectionproblem.hh
index a094100eb95d924637d79dda37dffb9eca1c53d0..1a5aa3c2ed2b81033276607e2a70ac3df131a47a 100644
--- a/test/boxmodels/2p2c/injectionproblem.hh
+++ b/test/boxmodels/2p2c/injectionproblem.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/2p2c/injectionspatialparameters.hh b/test/boxmodels/2p2c/injectionspatialparameters.hh
index 3d5ffe4ee94bb06b03504b2bba5d4ca9eb2b49c4..481b38613093a1c6dfd418f52d5feb13f749eabb 100644
--- a/test/boxmodels/2p2c/injectionspatialparameters.hh
+++ b/test/boxmodels/2p2c/injectionspatialparameters.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/2p2cni/waterairproblem.hh b/test/boxmodels/2p2cni/waterairproblem.hh
index caed597e133ce5e7ba0d776825e11c651f2f1240..40c3aa7d3abd6d4b326bd9ab366ccaf1fc352efb 100644
--- a/test/boxmodels/2p2cni/waterairproblem.hh
+++ b/test/boxmodels/2p2cni/waterairproblem.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2009 by Klaus Mosthaf                                     *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/2p2cni/waterairspatialparameters.hh b/test/boxmodels/2p2cni/waterairspatialparameters.hh
index 180004739cdfeb8bb531fc80a763fd1e67c21722..b8a5a1cef58fbbde93e8059354a801136e0787d4 100644
--- a/test/boxmodels/2p2cni/waterairspatialparameters.hh
+++ b/test/boxmodels/2p2cni/waterairspatialparameters.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/2pni/injectionproblem2pni.hh b/test/boxmodels/2pni/injectionproblem2pni.hh
index 4d3e0b78e5e51a74c657727f7ad1cac5cfec9ff7..9975b2ef4a64a6b0a2ff9c7388bfc5d1311af26c 100644
--- a/test/boxmodels/2pni/injectionproblem2pni.hh
+++ b/test/boxmodels/2pni/injectionproblem2pni.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2009 by Melanie Darcis                                    *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/3p3c/infiltrationproblem.hh b/test/boxmodels/3p3c/infiltrationproblem.hh
index dc55d3bf5792847dacf5e5669ea933230104e5a4..9a735d90c25f4af0db3c22c08288a7f2e061f3ae 100644
--- a/test/boxmodels/3p3c/infiltrationproblem.hh
+++ b/test/boxmodels/3p3c/infiltrationproblem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Holger Class                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/3p3c/infiltrationspatialparameters.hh b/test/boxmodels/3p3c/infiltrationspatialparameters.hh
index c3eb9d33904b27d21074494e7372783b740c64aa..8641969e0b2c500fb3ed53d91b0dcc30da045970 100644
--- a/test/boxmodels/3p3c/infiltrationspatialparameters.hh
+++ b/test/boxmodels/3p3c/infiltrationspatialparameters.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2011      by Holger Class                                 *
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/3p3cni/columnxylolproblem.hh b/test/boxmodels/3p3cni/columnxylolproblem.hh
index 7797109242fd0b78ce6c8be5d19fc6b31f40f9cd..629af57fe8674f36a67432dc7eb56e8ac2522a4f 100644
--- a/test/boxmodels/3p3cni/columnxylolproblem.hh
+++ b/test/boxmodels/3p3cni/columnxylolproblem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Holger Class                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/3p3cni/columnxylolspatialparameters.hh b/test/boxmodels/3p3cni/columnxylolspatialparameters.hh
index 1d8f8576542e8ef740eab66dea7163dd0355b308..7c3b801a70dcbb42c7a1b264dc1251a23d5cd002 100644
--- a/test/boxmodels/3p3cni/columnxylolspatialparameters.hh
+++ b/test/boxmodels/3p3cni/columnxylolspatialparameters.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2011-     by Holger Class                                 *
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/3p3cni/kuevetteproblem.hh b/test/boxmodels/3p3cni/kuevetteproblem.hh
index 4798000d63f97b3f3228dc0b1acb5ba814db150f..c3088adc1d97ab4ae521d8f8f024d397212efeb7 100644
--- a/test/boxmodels/3p3cni/kuevetteproblem.hh
+++ b/test/boxmodels/3p3cni/kuevetteproblem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Holger Class                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/3p3cni/kuevettespatialparameters.hh b/test/boxmodels/3p3cni/kuevettespatialparameters.hh
index 850f9587680aae010e956fcb9dd08747a3d16af8..7e1cd45f97044274c6212a73d976cdd772a5400e 100644
--- a/test/boxmodels/3p3cni/kuevettespatialparameters.hh
+++ b/test/boxmodels/3p3cni/kuevettespatialparameters.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2011-     by Holger Class                                 *
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/MpNc/obstacleproblem.hh b/test/boxmodels/MpNc/obstacleproblem.hh
index 6df7736f39c18138b036625e07ad0a185129be57..acceb1b424bb276464be564493aed6f29a9f65cd 100644
--- a/test/boxmodels/MpNc/obstacleproblem.hh
+++ b/test/boxmodels/MpNc/obstacleproblem.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
  *   Copyright (C) 2008-2009 by Bernd Flemisch                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/MpNc/obstaclespatialparameters.hh b/test/boxmodels/MpNc/obstaclespatialparameters.hh
index 77112027b33ecf24cef06d386481471facc252ee..ab1da619e80edb7c3080aad4650987223fb62917 100644
--- a/test/boxmodels/MpNc/obstaclespatialparameters.hh
+++ b/test/boxmodels/MpNc/obstaclespatialparameters.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
  *   Copyright (C) 2008-2009 by Klaus Mosthaf                                *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/richards/richardslensproblem.hh b/test/boxmodels/richards/richardslensproblem.hh
index b6c8d2d9f7c982866dbffb40d37f2d9b7fe653b8..bb404033550eac9caaeccbf2a84f12c72ef892b4 100644
--- a/test/boxmodels/richards/richardslensproblem.hh
+++ b/test/boxmodels/richards/richardslensproblem.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2009 by Onur Dogan                                        *
  *   Copyright (C) 2009-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/boxmodels/richards/richardslensspatialparameters.hh b/test/boxmodels/richards/richardslensspatialparameters.hh
index 44abf545de0d06b18cdae86b4c71126c9b94041e..e495cabce457a163b2e4a4100b404937cc07dc88 100644
--- a/test/boxmodels/richards/richardslensspatialparameters.hh
+++ b/test/boxmodels/richards/richardslensspatialparameters.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2007-2008 by Klaus Mosthaf                                *
  *   Copyright (C) 2007-2008 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2010 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/common/generalproblem/generallensproblem.hh b/test/common/generalproblem/generallensproblem.hh
index 3ef119df85b5e50048d740376acfafaebec19d8a..591754f801980622f6f631505d214235f9d70353 100644
--- a/test/common/generalproblem/generallensproblem.hh
+++ b/test/common/generalproblem/generallensproblem.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2007-2008 by Klaus Mosthaf                                *
  *   Copyright (C) 2007-2008 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/common/generalproblem/generallensspatialparameters.hh b/test/common/generalproblem/generallensspatialparameters.hh
index 4fc87a65fc16f3352ade1f94a60c20d99773e0a5..123e90c6d5a6b4e9c2f532e504e79d88b1c11b25 100644
--- a/test/common/generalproblem/generallensspatialparameters.hh
+++ b/test/common/generalproblem/generallensspatialparameters.hh
@@ -5,7 +5,7 @@
  *   Copyright (C) 2007-2008 by Klaus Mosthaf                                *
  *   Copyright (C) 2007-2008 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/decoupled/1p/benchmarkresult.hh b/test/decoupled/1p/benchmarkresult.hh
index 39f4a019dcf1ea19f02cab8e9e2c82a910a19e3b..681dd7cc18dc7ca4e27d2dde1331b34634b66db6 100644
--- a/test/decoupled/1p/benchmarkresult.hh
+++ b/test/decoupled/1p/benchmarkresult.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /****************************************************************************
 *   Copyright (C) 2007-2010 by Bernd Flemisch                               *
-*   Institute of Hydraulic Engineering                                      *
+*   Institute for Modelling Hydraulic and Environmental Systems             *
 *   University of Stuttgart, Germany                                        *
 *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
 *                                                                           *
diff --git a/test/decoupled/1p/test_1p_problem.hh b/test/decoupled/1p/test_1p_problem.hh
index 34d15097ac2cb66011866fa3f3c1e3f8bbb82885..dea35c426bd96e79128d1e61ccdcc0edac71c450 100644
--- a/test/decoupled/1p/test_1p_problem.hh
+++ b/test/decoupled/1p/test_1p_problem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
 *   Copyright (C) 2007-2008 by Markus Wolff                                  *
-*   Institute of Hydraulic Engineering                                       *
+*   Institute for Modelling Hydraulic and Environmental Systems              *
 *   University of Stuttgart, Germany                                         *
 *   email: <givenname>.<name>@iws.uni-stuttgart.de                           *
 *                                                                            *
diff --git a/test/decoupled/1p/test_1p_spatialparams.hh b/test/decoupled/1p/test_1p_spatialparams.hh
index 9024d0165041a6f0cfe1d3ccea9ef3ad7e438597..dfdc6075fc64bd1320312f615f404fc12f74ef76 100644
--- a/test/decoupled/1p/test_1p_spatialparams.hh
+++ b/test/decoupled/1p/test_1p_spatialparams.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/decoupled/1p/test_diffusion_problem.hh b/test/decoupled/1p/test_diffusion_problem.hh
index 13d6605273ef837b734682d42016595c5649e794..16b8ce95f467541954670f8d5c0ba3c1c45ba418 100644
--- a/test/decoupled/1p/test_diffusion_problem.hh
+++ b/test/decoupled/1p/test_diffusion_problem.hh
@@ -4,7 +4,7 @@
 *   Copyright (C) 2007-2008 by Klaus Mosthaf                                *
 *   Copyright (C) 2007-2008 by Bernd Flemisch                               *
 *   Copyright (C) 2008-2009 by Andreas Lauser                               *
-*   Institute of Hydraulic Engineering                                      *
+*   Institute for Modelling Hydraulic and Environmental Systems             *
 *   University of Stuttgart, Germany                                        *
 *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
 *                                                                           *
diff --git a/test/decoupled/1p/test_diffusion_spatialparams.hh b/test/decoupled/1p/test_diffusion_spatialparams.hh
index b5494eca9fd381acb4bfe0dceecbaeb08a90bc1d..2c71aed93eaa0235891e192f601a1836423e16a1 100644
--- a/test/decoupled/1p/test_diffusion_spatialparams.hh
+++ b/test/decoupled/1p/test_diffusion_spatialparams.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/decoupled/2p/test_impes_problem.hh b/test/decoupled/2p/test_impes_problem.hh
index d4464ecad37617c5ede4393cb724e0b15052acda..0d50962a0ed6e2a3985b16eb919e3bb955d2552d 100644
--- a/test/decoupled/2p/test_impes_problem.hh
+++ b/test/decoupled/2p/test_impes_problem.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2007-2008 by Klaus Mosthaf                                *
  *   Copyright (C) 2007-2008 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/decoupled/2p/test_impes_spatialparams.hh b/test/decoupled/2p/test_impes_spatialparams.hh
index 966d0be8cb944ce254aa4b5f4b204caea68e8913..aaff506a1ecd0c614783845df15e35aaa4227dbd 100644
--- a/test/decoupled/2p/test_impes_spatialparams.hh
+++ b/test/decoupled/2p/test_impes_spatialparams.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/decoupled/2p/test_transport_problem.hh b/test/decoupled/2p/test_transport_problem.hh
index 61e5d057a72ac4a783ec1367e651039bb2a26c5a..91333364422afeb5b9485417e672fee196ccab4e 100644
--- a/test/decoupled/2p/test_transport_problem.hh
+++ b/test/decoupled/2p/test_transport_problem.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2007-2008 by Klaus Mosthaf                                *
  *   Copyright (C) 2007-2008 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/decoupled/2p/test_transport_spatialparams.hh b/test/decoupled/2p/test_transport_spatialparams.hh
index 80067563ae1545a120ec86987bba73ed09870e33..5494438ed383ee09c4b7aab06da793b9dd08e0d3 100644
--- a/test/decoupled/2p/test_transport_spatialparams.hh
+++ b/test/decoupled/2p/test_transport_spatialparams.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh b/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
index bf64e0dca2b32e5c1f3bef60e97e2ef5f2f4e55d..918287004470fe1399834cb76d9e3cb149561318 100644
--- a/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
+++ b/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/decoupled/2p2c/test_dec2p2cproblem.hh b/test/decoupled/2p2c/test_dec2p2cproblem.hh
index 875d77ca453694e2452ff80a5b9ec46a5a9e21e2..0a14c51136df7032a5775fb2cf1633c6b2474305 100644
--- a/test/decoupled/2p2c/test_dec2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_dec2p2cproblem.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2007-2008 by Klaus Mosthaf                                *
  *   Copyright (C) 2007-2008 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh b/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
index b5d8382bd85357328f01e3c24ddefe023974c3ea..d45fd110c5a2f8c9b7535f937eec37234360ae4b 100644
--- a/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2007-2008 by Klaus Mosthaf                                *
  *   Copyright (C) 2007-2008 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/decoupled/2padaptive/test_impes_adaptive_problem.hh b/test/decoupled/2padaptive/test_impes_adaptive_problem.hh
index 9f8eed59b92e1b712c91309e87f539e25a1de6cc..7a0f3f5ff4ec6633dbc97efcbf34219d2f86a36f 100644
--- a/test/decoupled/2padaptive/test_impes_adaptive_problem.hh
+++ b/test/decoupled/2padaptive/test_impes_adaptive_problem.hh
@@ -4,7 +4,7 @@
  *   Copyright (C) 2007-2008 by Klaus Mosthaf                                *
  *   Copyright (C) 2007-2008 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/decoupled/2padaptive/test_impes_adaptive_spatialparams.hh b/test/decoupled/2padaptive/test_impes_adaptive_spatialparams.hh
index 9a5eafdc25043447c583839bb2997525a755064e..9c26fedf913ce9c35957f9f344cda434380e3347 100644
--- a/test/decoupled/2padaptive/test_impes_adaptive_spatialparams.hh
+++ b/test/decoupled/2padaptive/test_impes_adaptive_spatialparams.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/freeflow/stokes/stokestestproblem.hh b/test/freeflow/stokes/stokestestproblem.hh
index fed304039b833b36833afaf158531f6bf23acbc8..0c438a38f09d38efca055e74db4feef2205588b1 100644
--- a/test/freeflow/stokes/stokestestproblem.hh
+++ b/test/freeflow/stokes/stokestestproblem.hh
@@ -1,9 +1,11 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009-2010 by Klaus Mosthaf                                *
  *   Copyright (C) 2010 by Katherina Baber                                   *
  *   Copyright (C) 2007-2008 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/freeflow/stokes2c/stokes2ctestproblem.hh b/test/freeflow/stokes2c/stokes2ctestproblem.hh
index 5b4c9291dbbbc8b67e10ba9d7457cfcbfaaeb7ad..2ee5d92372f02a23cd1fdbdcd5fb0accb6951924 100644
--- a/test/freeflow/stokes2c/stokes2ctestproblem.hh
+++ b/test/freeflow/stokes2c/stokes2ctestproblem.hh
@@ -1,8 +1,10 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009-2010 by Klaus Mosthaf                                *
  *   Copyright (C) 2007-2008 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
index a875faced5d94326dd2ae290b9f6a93f89acd23e..dad516c6b8021c34d226dc2c80c409ccc1a950fb 100644
--- a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
+++ b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
@@ -1,8 +1,10 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2009-2011 by Klaus Mosthaf                                *
  *   Copyright (C) 2007-2008 by Bernd Flemisch                               *
  *   Copyright (C) 2008-2009 by Andreas Lauser                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/test/material/fluidsystems/checkfluidsystem.hh b/test/material/fluidsystems/checkfluidsystem.hh
index abb8576463d8c9df79bf40b3eb2999db67b369b1..4f4fe211852cfbba1d9af036e5a1d128763dd815 100644
--- a/test/material/fluidsystems/checkfluidsystem.hh
+++ b/test/material/fluidsystems/checkfluidsystem.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2011 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/tutorial/tutorialproblem_coupled.hh b/tutorial/tutorialproblem_coupled.hh
index 6ff0f21e646acac5c4e1c5815a10040758da96fe..a8cc26e25546de700ffd4c5e65483811196db5ae 100644
--- a/tutorial/tutorialproblem_coupled.hh
+++ b/tutorial/tutorialproblem_coupled.hh
@@ -3,7 +3,7 @@
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Melanie Darcis, Klaus Mosthaf                *
  *   Copyright (C) 2009 by Andreas Lauser                                    *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/tutorial/tutorialproblem_decoupled.hh b/tutorial/tutorialproblem_decoupled.hh
index bba793fbae570da4a87e2c09e510909a9f312d7e..c13388bb6e772ec02e52c81d9968ef6749182e7b 100644
--- a/tutorial/tutorialproblem_decoupled.hh
+++ b/tutorial/tutorialproblem_decoupled.hh
@@ -4,7 +4,7 @@
 *   Copyright (C) 2007-2008 by Klaus Mosthaf                                *
 *   Copyright (C) 2007-2008 by Bernd Flemisch                               *
 *   Copyright (C) 2008-2009 by Andreas Lauser                               *
-*   Institute of Hydraulic Engineering                                      *
+*   Institute for Modelling Hydraulic and Environmental Systems             *
 *   University of Stuttgart, Germany                                        *
 *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
 *                                                                           *
diff --git a/tutorial/tutorialspatialparameters_coupled.hh b/tutorial/tutorialspatialparameters_coupled.hh
index d8b150ee9db29442331610d4b198d89850675b2f..29904c40642ba18a72c1df4ea347ed59920f9e36 100644
--- a/tutorial/tutorialspatialparameters_coupled.hh
+++ b/tutorial/tutorialspatialparameters_coupled.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Melanie Darcis                               *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *
diff --git a/tutorial/tutorialspatialparameters_decoupled.hh b/tutorial/tutorialspatialparameters_decoupled.hh
index 28530dfb3dc206a74573078458b1186df348673f..20a42f579f0bc9e909ab04729c82702f30bc4aae 100644
--- a/tutorial/tutorialspatialparameters_decoupled.hh
+++ b/tutorial/tutorialspatialparameters_decoupled.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2008-2009 by Markus Wolff                                 *
- *   Institute of Hydraulic Engineering                                      *
+ *   Institute for Modelling Hydraulic and Environmental Systems             *
  *   University of Stuttgart, Germany                                        *
  *   email: <givenname>.<name>@iws.uni-stuttgart.de                          *
  *                                                                           *