diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index e4a3abc9ff13617920deb03c8a220dd664386c40..e9b6c75abe40decc5fa403ab94c3ec9346ea0840 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -298,9 +298,7 @@ int main(int argc, char *argv[]) {
     VectorType u4 = u1;
 
     SingletonVectorType s4_old(grid->size(grid->maxLevel(), dim));
-    s4_old = parset.get<double>("state.initial"); // FIXME: magic value (-500 is
-                                                  // still workable; -1000 is
-                                                  // not)
+    s4_old = parset.get<double>("boundary.friction.state.initial");
 
     VectorType u1_diff(grid->size(grid->maxLevel(), dim));
     u1_diff = 0.0; // Has to be zero!
@@ -408,7 +406,8 @@ int main(int argc, char *argv[]) {
       u1 += u1_diff;
 
       if (parset.get<bool>("solver.tnnmg.use")) {
-        for (int state_fpi = 0; state_fpi < parset.get<int>("state.iterations");
+        for (int state_fpi = 0;
+             state_fpi < parset.get<int>("solver.tnnmg.fixed_point_iterations");
              ++state_fpi) {
           auto myGlobalNonlinearity =
               assemble_nonlinearity<VectorType, OperatorType>(
@@ -425,7 +424,7 @@ int main(int argc, char *argv[]) {
               solver_tolerance, &energyNorm, verbosity);
           overallSolver.solve();
 
-          if (!parset.get<bool>("state.enable"))
+          if (!parset.get<bool>("boundary.friction.state.evolve"))
             continue;
 
           for (size_t i = 0; i < frictionalNodes.size(); ++i) {
diff --git a/src/one-body-sample.parset b/src/one-body-sample.parset
index b91d6eda2e0485bdf5f891769d4173cdb2b4cf83..4756b44c241a63ab44978160ae7f24d7217f1f6c 100644
--- a/src/one-body-sample.parset
+++ b/src/one-body-sample.parset
@@ -9,11 +9,6 @@ printDifference = false
 
 writeVTK = false
 
-[state]
-enable = true
-iterations = 5
-initial = 10
-
 [grid]
 refinements = 3
 
@@ -43,6 +38,7 @@ maxiterations = 1000000
 [solver.tnnmg]
 use = true
 maxiterations = 1000000
+fixed_point_iterations = 5
 
 [solver.tnnmg.linear]
 maxiterations = 1000000
@@ -84,6 +80,10 @@ mu = 0.5
 eta = 1
 model = Ruina
 
+[boundary.friction.state]
+evolve = true
+initial = 10
+
 [boundary.friction.ruina]
 # "For rocks, typical values of A and B range from 0.005 to 0.015"
 # -- Ronaldo I. Borja and Craig D. Foster: