diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 987a83c32fc801401805745aaf039e28c64f7419..7561567279037eb7e47c95fb68e961af7b9a45d9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,9 +7,9 @@ set(SW_SOURCE_FILES
   hdf5/restart-io.cc
   hdf5/surface-writer.cc
   hdf5/time-writer.cc
-  sand-wedge-data/mygeometry.cc
-  sand-wedge-data/mygrid.cc
-  sand-wedge.cc
+  one-body-problem-data/mygeometry.cc
+  one-body-problem-data/mygrid.cc
+  one-body-problem.cc
   spatial-solving/fixedpointiterator.cc
   spatial-solving/solverfactory.cc
   time-stepping/adaptivetimestepper.cc
@@ -21,19 +21,19 @@ set(SW_SOURCE_FILES
 )
 set(UGW_SOURCE_FILES
   assemblers.cc # FIXME
-  sand-wedge-data/mygrid.cc
+  one-body-problem-data/mygrid.cc
   uniform-grid-writer.cc
   vtk.cc
 )
 
-file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/sand-wedge-data")
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/one-body-problem-data")
 dune_symlink_to_source_files(FILES
-  "sand-wedge-data/parset.cfg"
-  "sand-wedge-data/parset-2D.cfg"
-  "sand-wedge-data/parset-3D.cfg")
+  "one-body-problem-data/parset.cfg"
+  "one-body-problem-data/parset-2D.cfg"
+  "one-body-problem-data/parset-3D.cfg")
 
 foreach(_dim 2 3)
-  set(_sw_target sand-wedge-${_dim}D)
+  set(_sw_target one-body-problem-${_dim}D)
   set(_ugw_target uniform-grid-writer-${_dim}D)
 
   add_executable(${_sw_target} ${SW_SOURCE_FILES})
diff --git a/src/hdf5/patchinfo-writer.hh b/src/hdf5/patchinfo-writer.hh
index f18866d2e83574ba055eecb4f2781e0c0daeb84d..23e988aa3c143b2191433559f5489a0322b512f5 100644
--- a/src/hdf5/patchinfo-writer.hh
+++ b/src/hdf5/patchinfo-writer.hh
@@ -9,7 +9,7 @@
 #include <dune/fufem/hdf5/hdf5-sequence-io.hh>
 #include <dune/fufem/hdf5/hdf5-singleton-writer.hh>
 
-#include "../sand-wedge-data/mygeometry.hh"
+#include "../one-body-problem-data/mygeometry.hh"
 
 template <class LocalVector, class GridView> class GridEvaluator {
   using Element = typename GridView::Grid::template Codim<0>::Entity;
diff --git a/src/sand-wedge-data/bc.hh b/src/one-body-problem-data/bc.hh
similarity index 86%
rename from src/sand-wedge-data/bc.hh
rename to src/one-body-problem-data/bc.hh
index 0d14feabe7456271d9fcdc6fbb9ebdaa6f7bbd07..7c29cf087571f8aca3e98d987ad3e711e991122d 100644
--- a/src/sand-wedge-data/bc.hh
+++ b/src/one-body-problem-data/bc.hh
@@ -1,5 +1,5 @@
-#ifndef SRC_SAND_WEDGE_DATA_BC_HH
-#define SRC_SAND_WEDGE_DATA_BC_HH
+#ifndef SRC_ONE_BODY_PROBLEM_DATA_BC_HH
+#define SRC_ONE_BODY_PROBLEM_DATA_BC_HH
 
 class VelocityDirichletCondition
     : public Dune::VirtualFunction<double, double> {
diff --git a/src/sand-wedge-data/geometry.tex b/src/one-body-problem-data/geometry.tex
similarity index 100%
rename from src/sand-wedge-data/geometry.tex
rename to src/one-body-problem-data/geometry.tex
diff --git a/src/sand-wedge-data/midpoint.hh b/src/one-body-problem-data/midpoint.hh
similarity index 100%
rename from src/sand-wedge-data/midpoint.hh
rename to src/one-body-problem-data/midpoint.hh
diff --git a/src/sand-wedge-data/mybody.hh b/src/one-body-problem-data/mybody.hh
similarity index 95%
rename from src/sand-wedge-data/mybody.hh
rename to src/one-body-problem-data/mybody.hh
index 6e3e8debbc96323f192fbbeaf3e9bc2eca81aeab..6e98d2898468cf5ae06ab02c2a21be981b010558 100644
--- a/src/sand-wedge-data/mybody.hh
+++ b/src/one-body-problem-data/mybody.hh
@@ -1,5 +1,5 @@
-#ifndef SRC_SAND_WEDGE_DATA_MYBODY_HH
-#define SRC_SAND_WEDGE_DATA_MYBODY_HH
+#ifndef SRC_ONE_BODY_PROBLEM_DATA_MYBODY_HH
+#define SRC_ONE_BODY_PROBLEM_DATA_MYBODY_HH
 
 #include <dune/common/fvector.hh>
 
diff --git a/src/sand-wedge-data/mygeometry.cc b/src/one-body-problem-data/mygeometry.cc
similarity index 100%
rename from src/sand-wedge-data/mygeometry.cc
rename to src/one-body-problem-data/mygeometry.cc
diff --git a/src/sand-wedge-data/mygeometry.hh b/src/one-body-problem-data/mygeometry.hh
similarity index 100%
rename from src/sand-wedge-data/mygeometry.hh
rename to src/one-body-problem-data/mygeometry.hh
diff --git a/src/sand-wedge-data/myglobalfrictiondata.hh b/src/one-body-problem-data/myglobalfrictiondata.hh
similarity index 91%
rename from src/sand-wedge-data/myglobalfrictiondata.hh
rename to src/one-body-problem-data/myglobalfrictiondata.hh
index 5eb421b6b1e03c5a6fc60edd2bb92d0b379956ac..d92e7223b20d6e257b5dc3168169b93cdbfa8eb2 100644
--- a/src/sand-wedge-data/myglobalfrictiondata.hh
+++ b/src/one-body-problem-data/myglobalfrictiondata.hh
@@ -1,5 +1,5 @@
-#ifndef SRC_SAND_WEDGE_DATA_MYGLOBALFRICTIONDATA_HH
-#define SRC_SAND_WEDGE_DATA_MYGLOBALFRICTIONDATA_HH
+#ifndef SRC_ONE_BODY_PROBLEM_DATA_MYGLOBALFRICTIONDATA_HH
+#define SRC_ONE_BODY_PROBLEM_DATA_MYGLOBALFRICTIONDATA_HH
 
 #include <dune/common/function.hh>
 
diff --git a/src/sand-wedge-data/mygrid.cc b/src/one-body-problem-data/mygrid.cc
similarity index 100%
rename from src/sand-wedge-data/mygrid.cc
rename to src/one-body-problem-data/mygrid.cc
diff --git a/src/sand-wedge-data/mygrid.hh b/src/one-body-problem-data/mygrid.hh
similarity index 95%
rename from src/sand-wedge-data/mygrid.hh
rename to src/one-body-problem-data/mygrid.hh
index ab97603e74bc89818601f646b07ca53c62609620..3508048dc91d779e391f41743f2263528747ae22 100644
--- a/src/sand-wedge-data/mygrid.hh
+++ b/src/one-body-problem-data/mygrid.hh
@@ -1,5 +1,5 @@
-#ifndef SRC_SAND_WEDGE_DATA_MYGRID_HH
-#define SRC_SAND_WEDGE_DATA_MYGRID_HH
+#ifndef SRC_ONE_BODY_PROBLEM_DATA_MYGRID_HH
+#define SRC_ONE_BODY_PROBLEM_DATA_MYGRID_HH
 
 #include <dune/common/fmatrix.hh>
 #include <dune/grid/common/gridfactory.hh>
diff --git a/src/sand-wedge-data/mygrid_tmpl.cc b/src/one-body-problem-data/mygrid_tmpl.cc
similarity index 100%
rename from src/sand-wedge-data/mygrid_tmpl.cc
rename to src/one-body-problem-data/mygrid_tmpl.cc
diff --git a/src/sand-wedge-data/parset-2D.cfg b/src/one-body-problem-data/parset-2D.cfg
similarity index 100%
rename from src/sand-wedge-data/parset-2D.cfg
rename to src/one-body-problem-data/parset-2D.cfg
diff --git a/src/sand-wedge-data/parset-3D.cfg b/src/one-body-problem-data/parset-3D.cfg
similarity index 100%
rename from src/sand-wedge-data/parset-3D.cfg
rename to src/one-body-problem-data/parset-3D.cfg
diff --git a/src/sand-wedge-data/parset.cfg b/src/one-body-problem-data/parset.cfg
similarity index 100%
rename from src/sand-wedge-data/parset.cfg
rename to src/one-body-problem-data/parset.cfg
diff --git a/src/sand-wedge-data/patchfunction.hh b/src/one-body-problem-data/patchfunction.hh
similarity index 89%
rename from src/sand-wedge-data/patchfunction.hh
rename to src/one-body-problem-data/patchfunction.hh
index 3dfa8dd252110bfe38ddd2d681540e350b26c1b8..72cdc867cffd4eba8091a0a2da0fa366e196627d 100644
--- a/src/sand-wedge-data/patchfunction.hh
+++ b/src/one-body-problem-data/patchfunction.hh
@@ -1,5 +1,5 @@
-#ifndef SRC_SAND_WEDGE_DATA_PATCHFUNCTION_HH
-#define SRC_SAND_WEDGE_DATA_PATCHFUNCTION_HH
+#ifndef SRC_ONE_BODY_PROBLEM_DATA_PATCHFUNCTION_HH
+#define SRC_ONE_BODY_PROBLEM_DATA_PATCHFUNCTION_HH
 
 #include <dune/common/function.hh>
 #include <dune/common/fvector.hh>
diff --git a/src/sand-wedge-data/segmented-function.hh b/src/one-body-problem-data/segmented-function.hh
similarity index 89%
rename from src/sand-wedge-data/segmented-function.hh
rename to src/one-body-problem-data/segmented-function.hh
index 6660a59686ff71987e77be342396844e2347ef72..652ba03bf41ae67e17e764456f14869576fa20c3 100644
--- a/src/sand-wedge-data/segmented-function.hh
+++ b/src/one-body-problem-data/segmented-function.hh
@@ -1,5 +1,5 @@
-#ifndef SRC_SAND_WEDGE_DATA_SEGMENTED_FUNCTION_HH
-#define SRC_SAND_WEDGE_DATA_SEGMENTED_FUNCTION_HH
+#ifndef SRC_ONE_BODY_PROBLEM_DATA_SEGMENTED_FUNCTION_HH
+#define SRC_ONE_BODY_PROBLEM_DATA_SEGMENTED_FUNCTION_HH
 
 #include <dune/common/function.hh>
 #include <dune/common/fvector.hh>
diff --git a/src/sand-wedge-data/weakpatch.hh b/src/one-body-problem-data/weakpatch.hh
similarity index 91%
rename from src/sand-wedge-data/weakpatch.hh
rename to src/one-body-problem-data/weakpatch.hh
index 0ae7f614a27614e4747fe0c9fefc95fb444c366b..59a653063be7f9758f58b7f0a1a6c9f756870203 100644
--- a/src/sand-wedge-data/weakpatch.hh
+++ b/src/one-body-problem-data/weakpatch.hh
@@ -1,5 +1,5 @@
-#ifndef SRC_SAND_WEDGE_DATA_WEAKPATCH_HH
-#define SRC_SAND_WEDGE_DATA_WEAKPATCH_HH
+#ifndef SRC_ONE_BODY_PROBLEM_DATA_WEAKPATCH_HH
+#define SRC_ONE_BODY_PROBLEM_DATA_WEAKPATCH_HH
 
 template <class LocalVector>
 ConvexPolyhedron<LocalVector> getWeakPatch(Dune::ParameterTree const &parset) {
diff --git a/src/sand-wedge.cc b/src/one-body-problem.cc
similarity index 97%
rename from src/sand-wedge.cc
rename to src/one-body-problem.cc
index c527e6c9394d1b025ed4b2ef095c2650562d3159..8764645994571ab82a3a6598f22ff93ed9b2af22 100644
--- a/src/sand-wedge.cc
+++ b/src/one-body-problem.cc
@@ -49,12 +49,12 @@
 #include "hdf5/restart-io.hh"
 #include "matrices.hh"
 #include "program_state.hh"
-#include "sand-wedge-data/bc.hh"
-#include "sand-wedge-data/mybody.hh"
-#include "sand-wedge-data/mygeometry.hh"
-#include "sand-wedge-data/myglobalfrictiondata.hh"
-#include "sand-wedge-data/mygrid.hh"
-#include "sand-wedge-data/weakpatch.hh"
+#include "one-body-problem-data/bc.hh"
+#include "one-body-problem-data/mybody.hh"
+#include "one-body-problem-data/mygeometry.hh"
+#include "one-body-problem-data/myglobalfrictiondata.hh"
+#include "one-body-problem-data/mygrid.hh"
+#include "one-body-problem-data/weakpatch.hh"
 #include "spatial-solving/solverfactory.hh"
 #include "time-stepping/adaptivetimestepper.hh"
 #include "time-stepping/rate.hh"
@@ -85,7 +85,7 @@ int main(int argc, char *argv[]) {
   try {
     auto const dataDirectory =
         fs::system_complete(fs::path(argv[0])).parent_path() /
-        fs::path("sand-wedge-data");
+        fs::path("one-body-problem-data");
     auto const parset = getParameters(argc, argv, dataDirectory);
 
     MyGeometry::render();
diff --git a/src/uniform-grid-writer.cc b/src/uniform-grid-writer.cc
index 1fe4223929e00c2884e53095eff3c9cfeacf7587..804e54257bd5ab5f89758e946cc1310847938a2b 100644
--- a/src/uniform-grid-writer.cc
+++ b/src/uniform-grid-writer.cc
@@ -13,7 +13,7 @@
 #include "assemblers.hh"
 #include "diameter.hh"
 #include "gridselector.hh"
-#include "sand-wedge-data/mygrid.hh"
+#include "one-body-problem-data/mygrid.hh"
 #include "vtk.hh"
 
 size_t const dims = MY_DIM;