diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 17ccac2629a008fa127b695dde9288201f6f6a73..e9181607d77d35fa21fbd851d359e49e022f7693 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -403,14 +403,14 @@ int main(int argc, char *argv[]) {
       timeSteppingScheme->setup(ell, tau, time, problem_rhs, problem_iterate,
                                 problem_A);
 
-      LoopSolver<VectorType> overallSolver(
+      LoopSolver<VectorType> velocityProblemSolver(
           multigridStep, parset.get<size_t>("solver.tnnmg.maxiterations"),
           solver_tolerance, &velocityEnergyNorm, verbosity,
           false); // absolute error
 
       size_t iterationCounter;
-      auto solveDisplacementProblem = [&](VectorType &_problem_iterate,
-                                          SingletonVectorType const &_alpha) {
+      auto solveVelocityProblem = [&](VectorType &_problem_iterate,
+                                      SingletonVectorType const &_alpha) {
         auto myGlobalNonlinearity =
             assemble_nonlinearity<MatrixType, VectorType>(
                 parset.sub("boundary.friction"), *nodalIntegrals, _alpha,
@@ -418,12 +418,12 @@ int main(int argc, char *argv[]) {
 
         MyConvexProblemType const myConvexProblem(
             problem_A, *myGlobalNonlinearity, problem_rhs);
-        MyBlockProblemType myBlockProblem(parset, myConvexProblem);
-        multigridStep->setProblem(_problem_iterate, myBlockProblem);
+        MyBlockProblemType velocityProblem(parset, myConvexProblem);
+        multigridStep->setProblem(_problem_iterate, velocityProblem);
 
-        overallSolver.preprocess();
-        overallSolver.solve();
-        iterationCounter = overallSolver.getResult().iterations;
+        velocityProblemSolver.preprocess();
+        velocityProblemSolver.solve();
+        iterationCounter = velocityProblemSolver.getResult().iterations;
       };
 
       // Since the velocity explodes in the quasistatic case, use the
@@ -453,7 +453,7 @@ int main(int argc, char *argv[]) {
           lastCorrection = correction;
         }
 
-        solveDisplacementProblem(problem_iterate, alpha);
+        solveVelocityProblem(problem_iterate, alpha);
         timeSteppingScheme->postProcess(problem_iterate);
         timeSteppingScheme->extractDisplacement(u);
         timeSteppingScheme->extractVelocity(ud);