diff --git a/src/cell.c b/src/cell.c
index 4842a86236934c63720a5fa7935265ac4f0a16bf..4c6bc5b6fdb168c315f777600ea47ae19d021bb1 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -2786,7 +2786,7 @@ void cell_activate_subcell_black_holes_tasks(struct cell *ci, struct cell *cj,
       }
     }
 
-    /* Otherwise, activate the sorts and drifts. */
+    /* Otherwise, activate the drifts. */
     else {
       if (cell_is_active_black_holes(ci, e)) {
 
@@ -3716,7 +3716,7 @@ int cell_unskip_black_holes_tasks(struct cell *c, struct scheduler *s) {
       }
     }
 
-    /* Nothing more to do here, all drifts and sorts activated above */
+    /* Nothing more to do here, all drifts activated above */
   }
 
   /* Unskip all the other task types. */
diff --git a/src/cell.h b/src/cell.h
index 222c632202b8db61aecb8eba5d2462b0a4c98893..123b7fc5fda2f4b9d6b94c50eeaee991c849a23d 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -1013,7 +1013,7 @@ cell_can_recurse_in_self_stars_task(const struct cell *c) {
 }
 
 /**
- * @brief Can a sub-pair star task recurse to a lower level based
+ * @brief Can a sub-pair black hole task recurse to a lower level based
  * on the status of the particles in the cell.
  *
  * @param ci The #cell with black holes.
@@ -1035,7 +1035,7 @@ cell_can_recurse_in_pair_black_holes_task(const struct cell *ci,
 }
 
 /**
- * @brief Can a sub-self black_holes task recurse to a lower level based
+ * @brief Can a sub-self black hole task recurse to a lower level based
  * on the status of the particles in the cell.
  *
  * @param c The #cell.
diff --git a/src/engine_marktasks.c b/src/engine_marktasks.c
index ef6f1fbea2acfda9abc86ed15dd0abc4ca46e923..ba52dd48de43b1388735a440f2a6f842dfbc22c6 100644
--- a/src/engine_marktasks.c
+++ b/src/engine_marktasks.c
@@ -621,7 +621,7 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
 #endif
       }
 
-      /* Only interested in stars_density tasks as of here. */
+      /* Only interested in black hole density tasks as of here. */
       else if (t->subtype == task_subtype_bh_density) {
 
         /* Too much particle movement? */
diff --git a/src/runner_doiact_black_holes.h b/src/runner_doiact_black_holes.h
index 323ecb254d7d1af9750ee3d7a8d362267bb6e0d6..efd2d02b3aca3c530b4e1af13e38328368c99f7c 100644
--- a/src/runner_doiact_black_holes.h
+++ b/src/runner_doiact_black_holes.h
@@ -83,7 +83,7 @@
 #define IACT_BH _IACT_BH(FUNCTION)
 
 /**
- * @brief Calculate the number density of #part around the #spart
+ * @brief Calculate the number density of #part around the #bpart
  *
  * @param r runner task
  * @param c cell
@@ -160,7 +160,7 @@ void DOSELF1_BH(struct runner *r, struct cell *c, int timer) {
 }
 
 /**
- * @brief Calculate the number density of cj #part around the ci #spart
+ * @brief Calculate the number density of cj #part around the ci #bpart
  *
  * @param r runner task
  * @param ci The first #cell
@@ -275,7 +275,7 @@ void DOPAIR1_BH_NAIVE(struct runner *r, struct cell *restrict ci,
  *
  * @param r The #runner.
  * @param ci The first #cell.
- * @param bparts_i The #part to interact with @c cj.
+ * @param bparts_i The #bpart to interact with @c cj.
  * @param ind The list of indices of particles in @c ci to interact with.
  * @param bcount The number of particles in @c ind.
  * @param cj The second #cell.
@@ -357,7 +357,7 @@ void DOPAIR1_SUBSET_BH_NAIVE(struct runner *r, struct cell *restrict ci,
  *
  * @param r The #runner.
  * @param ci The first #cell.
- * @param bparts The #spart to interact.
+ * @param bparts The #bpart to interact.
  * @param ind The list of indices of particles in @c ci to interact with.
  * @param bcount The number of particles in @c ind.
  */
@@ -428,12 +428,12 @@ void DOSELF1_SUBSET_BH(struct runner *r, struct cell *restrict ci,
 }
 
 /**
- * @brief Determine which version of DOSELF1_SUBSET_STARS needs to be called
+ * @brief Determine which version of DOSELF1_SUBSET_BH needs to be called
  * depending on the optimisation level.
  *
  * @param r The #runner.
  * @param ci The first #cell.
- * @param bparts The #spart to interact.
+ * @param bparts The #bpart to interact.
  * @param ind The list of indices of particles in @c ci to interact with.
  * @param bcount The number of particles in @c ind.
  */
@@ -445,13 +445,13 @@ void DOSELF1_SUBSET_BRANCH_BH(struct runner *r, struct cell *restrict ci,
 }
 
 /**
- * @brief Determine which version of DOPAIR1_SUBSET_STARS needs to be called
- * depending on the orientation of the cells or whether DOPAIR1_SUBSET_STARS
+ * @brief Determine which version of DOPAIR1_SUBSET_BH needs to be called
+ * depending on the orientation of the cells or whether DOPAIR1_SUBSET_BH
  * needs to be called at all.
  *
  * @param r The #runner.
  * @param ci The first #cell.
- * @param bparts_i The #spart to interact with @c cj.
+ * @param bparts_i The #bpart to interact with @c cj.
  * @param ind The list of indices of particles in @c ci to interact with.
  * @param bcount The number of particles in @c ind.
  * @param cj The second #cell.
@@ -565,7 +565,7 @@ void DOSUB_SUBSET_BH(struct runner *r, struct cell *ci, struct bpart *bparts,
 }
 
 /**
- * @brief Determine which version of DOSELF1_STARS needs to be called depending
+ * @brief Determine which version of DOSELF1_BH needs to be called depending
  * on the optimisation level.
  *
  * @param r #runner
@@ -590,8 +590,8 @@ void DOSELF1_BRANCH_BH(struct runner *r, struct cell *c) {
 }
 
 /**
- * @brief Determine which version of DOPAIR1_STARS needs to be called depending
- * on the orientation of the cells or whether DOPAIR1_STARS needs to be called
+ * @brief Determine which version of DOPAIR1_BH needs to be called depending
+ * on the orientation of the cells or whether DOPAIR1_BH needs to be called
  * at all.
  *
  * @param r #runner