diff --git a/mt-kahypar/partition/refinement/gains/steiner_tree/steiner_tree_gain_cache.h b/mt-kahypar/partition/refinement/gains/steiner_tree/steiner_tree_gain_cache.h
index 1c25ef17e..4b0513794 100644
--- a/mt-kahypar/partition/refinement/gains/steiner_tree/steiner_tree_gain_cache.h
+++ b/mt-kahypar/partition/refinement/gains/steiner_tree/steiner_tree_gain_cache.h
@@ -51,7 +51,7 @@ namespace mt_kahypar {
  *
  * The mapping problem asks for a mapping Π: V -> V_p of the node set V of a weighted hypergraph H = (V,E,c,w)
  * onto a target graph P = (V_P, E_P) such that the following objective function is minimized:
- * process_mapping(H, P, Π) := sum_{e \in E} dist_P(Λ(e)) * w(e)
+ * steiner_tree(H, P, Π) := sum_{e \in E} dist_P(Λ(e)) * w(e)
  * Here, dist_P(Λ(e)) is shortest connections between all blocks Λ(e) contained in a hyperedge e using only edges
  * of the target graph. Computing dist_P(Λ(e)) reverts to the steiner tree problem which is an NP-hard problem.
  * However, we precompute all steiner trees up to a certain size and for larger connectivity sets Λ(e), we compute
diff --git a/mt-kahypar/partition/refinement/gains/steiner_tree_for_graphs/steiner_tree_gain_cache_for_graphs.h b/mt-kahypar/partition/refinement/gains/steiner_tree_for_graphs/steiner_tree_gain_cache_for_graphs.h
index 064c42d4c..308e9525b 100644
--- a/mt-kahypar/partition/refinement/gains/steiner_tree_for_graphs/steiner_tree_gain_cache_for_graphs.h
+++ b/mt-kahypar/partition/refinement/gains/steiner_tree_for_graphs/steiner_tree_gain_cache_for_graphs.h
@@ -52,7 +52,7 @@ namespace mt_kahypar {
  *
  * The mapping problem asks for a mapping Π: V -> V_p of the node set V of a weighted graph G = (V,E,c,w)
  * onto a target graph P = (V_P, E_P) such that the following objective function is minimized:
- * process_mapping(G, P, Π) := sum_{{u,v} \in E} dist_P(Π[u],Π[v]) * w(u,v)
+ * steiner_tree(G, P, Π) := sum_{{u,v} \in E} dist_P(Π[u],Π[v]) * w(u,v)
  * Here, dist_P(Π[u],Π[v]) is shortest path connecting block Π[u] and Π[v] in the target graph.
  *
  * The gain of moving a node u from its current block V_i to a target block V_j can be expressed as follows:
diff --git a/tests/partition/CMakeLists.txt b/tests/partition/CMakeLists.txt
index a7b139800..28006907b 100644
--- a/tests/partition/CMakeLists.txt
+++ b/tests/partition/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_subdirectory(preprocessing)
-add_subdirectory(process_mapping)
+add_subdirectory(mapping)
 add_subdirectory(coarsening)
 add_subdirectory(initial_partitioning)
 add_subdirectory(refinement)
diff --git a/tests/partition/process_mapping/CMakeLists.txt b/tests/partition/mapping/CMakeLists.txt
similarity index 100%
rename from tests/partition/process_mapping/CMakeLists.txt
rename to tests/partition/mapping/CMakeLists.txt
diff --git a/tests/partition/process_mapping/set_enumerator_test.cc b/tests/partition/mapping/set_enumerator_test.cc
similarity index 100%
rename from tests/partition/process_mapping/set_enumerator_test.cc
rename to tests/partition/mapping/set_enumerator_test.cc
diff --git a/tests/partition/process_mapping/target_graph_test.cc b/tests/partition/mapping/target_graph_test.cc
similarity index 100%
rename from tests/partition/process_mapping/target_graph_test.cc
rename to tests/partition/mapping/target_graph_test.cc
diff --git a/tools/one_to_one_mapping.cc b/tools/one_to_one_mapping.cc
index 484de88ec..54a5a2bfc 100644
--- a/tools/one_to_one_mapping.cc
+++ b/tools/one_to_one_mapping.cc
@@ -152,7 +152,7 @@ int main(int argc, char* argv[]) {
             << " epsilon=" << context.partition.epsilon
             << " seed=" << context.partition.seed
             << " imbalance=" << metrics::imbalance(partitioned_hg, context)
-            << " process_mapping=" << metrics::quality(partitioned_hg, Objective::steiner_tree)
+            << " steiner_tree=" << metrics::quality(partitioned_hg, Objective::steiner_tree)
             << " approximation_factor=" << metrics::approximationFactorForProcessMapping(partitioned_hg, context)
             << " cut=" << metrics::quality(partitioned_hg, Objective::cut)
             << " km1=" << metrics::quality(partitioned_hg, Objective::km1)
diff --git a/tools/verify_process_mapping_partition.cc b/tools/verify_process_mapping_partition.cc
index 0105fcd7d..911f3cd5f 100644
--- a/tools/verify_process_mapping_partition.cc
+++ b/tools/verify_process_mapping_partition.cc
@@ -133,7 +133,7 @@ int main(int argc, char* argv[]) {
             << " k=" << context.partition.k
             << " epsilon=" << context.partition.epsilon
             << " imbalance=" << metrics::imbalance(partitioned_hg, context)
-            << " process_mapping=" << metrics::quality(partitioned_hg, Objective::steiner_tree)
+            << " steiner_tree=" << metrics::quality(partitioned_hg, Objective::steiner_tree)
             << " approximation_factor=" << metrics::approximationFactorForProcessMapping(partitioned_hg, context)
             << " cut=" << metrics::quality(partitioned_hg, Objective::cut)
             << " km1=" << metrics::quality(partitioned_hg, Objective::km1)