diff --git a/src/cell.h b/src/cell.h
index fbdaa928bda51aa76c149df1249d982fbeef64c3..a69a1a74648d76aeb13126d37a3c1265397dc2bf 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -117,7 +117,7 @@ struct cell {
   struct link *density, *force, *grav;
   int nr_density, nr_force, nr_grav;
 
-  /* The ghost task to link density to interactions. */
+  /* The hierarchical tasks. */
   struct task *ghost, *init, *drift, *kick;
 
   /* Task receiving data. */
diff --git a/src/engine.c b/src/engine.c
index 05b0739c5555a9843f9a72d13b39a7e7831386fa..76243b1e481191c095d223a6db973aaa82c227a0 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -95,7 +95,8 @@ struct link *engine_addlink(struct engine *e, struct link *l, struct task *t) {
 }
 
 /**
- * @brief Generate the ghosts all the O(Npart) tasks for a hierarchy of cells.
+ * @brief Generate the hierarchical tasks for a hierarchy of cells - i.e. all
+ * the O(Npart) tasks.
  *
  * Tasks are only created here. The dependencies will be added later on.
  *
@@ -104,8 +105,8 @@ struct link *engine_addlink(struct engine *e, struct link *l, struct task *t) {
  * @param super The super #cell.
  */
 
-void engine_make_ghost_tasks(struct engine *e, struct cell *c,
-                             struct cell *super) {
+void engine_make_hierarchical_tasks(struct engine *e, struct cell *c,
+                                    struct cell *super) {
 
   struct scheduler *s = &e->sched;
   const int is_with_external_gravity =
@@ -157,7 +158,7 @@ void engine_make_ghost_tasks(struct engine *e, struct cell *c,
   if (c->split)
     for (int k = 0; k < 8; k++)
       if (c->progeny[k] != NULL)
-        engine_make_ghost_tasks(e, c->progeny[k], super);
+        engine_make_hierarchical_tasks(e, c->progeny[k], super);
 }
 
 /**
@@ -1452,10 +1453,9 @@ void engine_maketasks(struct engine *e) {
      depend on the sorts of its progeny. */
   engine_count_and_link_tasks(e);
 
-  /* Append a ghost task to each cell, and add kick tasks to the
-     super cells. */
+  /* Append hierarchical tasks to each cells */
   for (int k = 0; k < nr_cells; k++)
-    engine_make_ghost_tasks(e, &cells[k], NULL);
+    engine_make_hierarchical_tasks(e, &cells[k], NULL);
 
   /* Run through the tasks and make force tasks for each density task.
      Each force task depends on the cell ghosts and unlocks the kick task
diff --git a/src/runner.c b/src/runner.c
index 6254fcfd2bde5c021c7f15300cb6c1a8d3850806..3349fa35138c717d0994d6cbcce16657641a5a27 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -107,7 +107,7 @@ const char runner_flip[27] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
  * @param c cell
  * @param timer 1 if the time is to be recorded.
  */
-void runner_dograv_external(struct runner *r, struct cell *c, int timer) {
+void runner_do_grav_external(struct runner *r, struct cell *c, int timer) {
 
   struct gpart *g, *gparts = c->gparts;
   int i, k, gcount = c->gcount;
@@ -120,7 +120,7 @@ void runner_dograv_external(struct runner *r, struct cell *c, int timer) {
   /* Recurse? */
   if (c->split) {
     for (k = 0; k < 8; k++)
-      if (c->progeny[k] != NULL) runner_dograv_external(r, c->progeny[k], 0);
+      if (c->progeny[k] != NULL) runner_do_grav_external(r, c->progeny[k], 0);
     return;
   }
 
@@ -196,7 +196,7 @@ void runner_dograv_external(struct runner *r, struct cell *c, int timer) {
  * @param N The number of entries.
  */
 
-void runner_dosort_ascending(struct entry *sort, int N) {
+void runner_do_sort_ascending(struct entry *sort, int N) {
 
   struct {
     short int lo, hi;
@@ -278,7 +278,7 @@ void runner_dosort_ascending(struct entry *sort, int N) {
  *      for recursive calls.
  */
 
-void runner_dosort(struct runner *r, struct cell *c, int flags, int clock) {
+void runner_do_sort(struct runner *r, struct cell *c, int flags, int clock) {
 
   struct entry *finger;
   struct entry *fingers[8];
@@ -312,7 +312,7 @@ void runner_dosort(struct runner *r, struct cell *c, int flags, int clock) {
     for (k = 0; k < 8; k++) {
       if (c->progeny[k] == NULL) continue;
       missing = flags & ~c->progeny[k]->sorted;
-      if (missing) runner_dosort(r, c->progeny[k], missing, 0);
+      if (missing) runner_do_sort(r, c->progeny[k], missing, 0);
     }
 
     /* Loop over the 13 different sort arrays. */
@@ -402,7 +402,7 @@ void runner_dosort(struct runner *r, struct cell *c, int flags, int clock) {
       if (flags & (1 << j)) {
         sort[j * (count + 1) + count].d = FLT_MAX;
         sort[j * (count + 1) + count].i = 0;
-        runner_dosort_ascending(&sort[j * (count + 1)], count);
+        runner_do_sort_ascending(&sort[j * (count + 1)], count);
         c->sorted |= (1 << j);
       }
   }
@@ -423,7 +423,7 @@ void runner_dosort(struct runner *r, struct cell *c, int flags, int clock) {
   if (clock) TIMER_TOC(timer_dosort);
 }
 
-void runner_dogsort(struct runner *r, struct cell *c, int flags, int clock) {
+void runner_do_gsort(struct runner *r, struct cell *c, int flags, int clock) {
 
   struct entry *finger;
   struct entry *fingers[8];
@@ -457,7 +457,7 @@ void runner_dogsort(struct runner *r, struct cell *c, int flags, int clock) {
     for (k = 0; k < 8; k++) {
       if (c->progeny[k] == NULL) continue;
       missing = flags & ~c->progeny[k]->gsorted;
-      if (missing) runner_dogsort(r, c->progeny[k], missing, 0);
+      if (missing) runner_do_gsort(r, c->progeny[k], missing, 0);
     }
 
     /* Loop over the 13 different sort arrays. */
@@ -547,7 +547,7 @@ void runner_dogsort(struct runner *r, struct cell *c, int flags, int clock) {
       if (flags & (1 << j)) {
         gsort[j * (count + 1) + count].d = FLT_MAX;
         gsort[j * (count + 1) + count].i = 0;
-        runner_dosort_ascending(&gsort[j * (count + 1)], count);
+        runner_do_sort_ascending(&gsort[j * (count + 1)], count);
         c->gsorted |= (1 << j);
       }
   }
@@ -575,7 +575,7 @@ void runner_dogsort(struct runner *r, struct cell *c, int flags, int clock) {
  * @param c The cell.
  * @param timer 1 if the time is to be recorded.
  */
-void runner_doinit(struct runner *r, struct cell *c, int timer) {
+void runner_do_init(struct runner *r, struct cell *c, int timer) {
 
   struct part *const parts = c->parts;
   struct gpart *const gparts = c->gparts;
@@ -588,7 +588,7 @@ void runner_doinit(struct runner *r, struct cell *c, int timer) {
   /* Recurse? */
   if (c->split) {
     for (int k = 0; k < 8; k++)
-      if (c->progeny[k] != NULL) runner_doinit(r, c->progeny[k], 0);
+      if (c->progeny[k] != NULL) runner_do_init(r, c->progeny[k], 0);
     return;
   } else {
 
@@ -629,7 +629,7 @@ void runner_doinit(struct runner *r, struct cell *c, int timer) {
  * @param c The cell.
  */
 
-void runner_doghost(struct runner *r, struct cell *c) {
+void runner_do_ghost(struct runner *r, struct cell *c) {
 
   struct part *p, *parts = c->parts;
   struct xpart *xp, *xparts = c->xparts;
@@ -652,7 +652,7 @@ void runner_doghost(struct runner *r, struct cell *c) {
   /* Recurse? */
   if (c->split) {
     for (int k = 0; k < 8; k++)
-      if (c->progeny[k] != NULL) runner_doghost(r, c->progeny[k]);
+      if (c->progeny[k] != NULL) runner_do_ghost(r, c->progeny[k]);
     return;
   }
 
@@ -774,7 +774,7 @@ void runner_doghost(struct runner *r, struct cell *c) {
   if (count)
     message("Smoothing length failed to converge on %i particles.", count);
 
-  TIMER_TOC(timer_doghost);
+  TIMER_TOC(timer_do_ghost);
 }
 
 /**
@@ -784,7 +784,7 @@ void runner_doghost(struct runner *r, struct cell *c) {
  * @param c The cell.
  * @param timer Are we timing this ?
  */
-void runner_dodrift(struct runner *r, struct cell *c, int timer) {
+void runner_do_drift(struct runner *r, struct cell *c, int timer) {
 
   const double timeBase = r->e->timeBase;
   const double dt = (r->e->ti_current - r->e->ti_old) * timeBase;
@@ -891,7 +891,7 @@ void runner_dodrift(struct runner *r, struct cell *c, int timer) {
     for (int k = 0; k < 8; k++)
       if (c->progeny[k] != NULL) {
         struct cell *cp = c->progeny[k];
-        runner_dodrift(r, cp, 0);
+        runner_do_drift(r, cp, 0);
 
         dx_max = fmaxf(dx_max, cp->dx_max);
         h_max = fmaxf(h_max, cp->h_max);
@@ -912,7 +912,7 @@ void runner_dodrift(struct runner *r, struct cell *c, int timer) {
  * @param c The cell.
  * @param timer Are we timing this ?
  */
-void runner_dokick(struct runner *r, struct cell *c, int timer) {
+void runner_do_kick(struct runner *r, struct cell *c, int timer) {
 
   const float global_dt_min = r->e->dt_min;
   const float global_dt_max = r->e->dt_max;
@@ -1204,7 +1204,7 @@ void runner_dokick(struct runner *r, struct cell *c, int timer) {
         struct cell *const cp = c->progeny[k];
 
         /* Recurse */
-        runner_dokick(r, cp, 0);
+        runner_do_kick(r, cp, 0);
 
         /* And aggregate */
         updated += cp->updated;
@@ -1250,7 +1250,7 @@ void runner_dokick(struct runner *r, struct cell *c, int timer) {
  * @param c The cell.
  * @param timer Are we timing this ?
  */
-void runner_dorecv_cell(struct runner *r, struct cell *c, int timer) {
+void runner_do_recv_cell(struct runner *r, struct cell *c, int timer) {
 
   const struct part *const parts = c->parts;
   const struct gpart *const gparts = c->gparts;
@@ -1347,7 +1347,7 @@ void *runner_main(void *data) {
             error("Unknown task subtype.");
           break;
         case task_type_sort:
-          runner_dosort(r, ci, t->flags, 1);
+          runner_do_sort(r, ci, t->flags, 1);
           break;
         case task_type_sub:
           if (t->subtype == task_subtype_density)
@@ -1360,21 +1360,21 @@ void *runner_main(void *data) {
             error("Unknown task subtype.");
           break;
         case task_type_init:
-          runner_doinit(r, ci, 1);
+          runner_do_init(r, ci, 1);
           break;
         case task_type_ghost:
-          runner_doghost(r, ci);
+          runner_do_ghost(r, ci);
           break;
         case task_type_drift:
-          runner_dodrift(r, ci, 1);
+          runner_do_drift(r, ci, 1);
           break;
         case task_type_kick:
-          runner_dokick(r, ci, 1);
+          runner_do_kick(r, ci, 1);
           break;
         case task_type_send:
           break;
         case task_type_recv:
-          runner_dorecv_cell(r, ci, 1);
+          runner_do_recv_cell(r, ci, 1);
           break;
         case task_type_grav_pp:
           if (t->cj == NULL)
@@ -1392,7 +1392,7 @@ void *runner_main(void *data) {
           runner_dograv_down(r, t->ci);
           break;
         case task_type_grav_external:
-          runner_dograv_external(r, t->ci, 1);
+          runner_do_grav_external(r, t->ci, 1);
           break;
         case task_type_part_sort:
           space_do_parts_sort();
diff --git a/src/runner.h b/src/runner.h
index 7953b33361ca59e51e6e5ea07dde59db016239b0..f53822cdbf9608a473fc72e6a2d049cfd6d3c5a2 100644
--- a/src/runner.h
+++ b/src/runner.h
@@ -47,12 +47,12 @@ struct runner {
 };
 
 /* Function prototypes. */
-void runner_doghost(struct runner *r, struct cell *c);
-void runner_dosort(struct runner *r, struct cell *c, int flag, int clock);
-void runner_dogsort(struct runner *r, struct cell *c, int flag, int clock);
-void runner_dokick(struct runner *r, struct cell *c, int timer);
-void runner_dodrift(struct runner *r, struct cell *c, int timer);
-void runner_doinit(struct runner *r, struct cell *c, int timer);
+void runner_do_ghost(struct runner *r, struct cell *c);
+void runner_do_sort(struct runner *r, struct cell *c, int flag, int clock);
+void runner_do_gsort(struct runner *r, struct cell *c, int flag, int clock);
+void runner_do_kick(struct runner *r, struct cell *c, int timer);
+void runner_do_drift(struct runner *r, struct cell *c, int timer);
+void runner_do_init(struct runner *r, struct cell *c, int timer);
 void *runner_main(void *data);
 
 #endif /* SWIFT_RUNNER_H */
diff --git a/src/runner_doiact.h b/src/runner_doiact.h
index de339db6133fcc829bdc6ee0ce9e537b68982422..97e22138b6c09750c1737741f58e61744a891c98 100644
--- a/src/runner_doiact.h
+++ b/src/runner_doiact.h
@@ -1982,8 +1982,8 @@ void DOSUB1(struct runner *r, struct cell *ci, struct cell *cj, int sid,
     else if (ci->ti_end_min <= ti_current || cj->ti_end_min <= ti_current) {
 
       /* Do any of the cells need to be sorted first? */
-      if (!(ci->sorted & (1 << sid))) runner_dosort(r, ci, (1 << sid), 1);
-      if (!(cj->sorted & (1 << sid))) runner_dosort(r, cj, (1 << sid), 1);
+      if (!(ci->sorted & (1 << sid))) runner_do_sort(r, ci, (1 << sid), 1);
+      if (!(cj->sorted & (1 << sid))) runner_do_sort(r, cj, (1 << sid), 1);
 
       /* Compute the interactions. */
       DOPAIR1(r, ci, cj);
@@ -2251,8 +2251,8 @@ void DOSUB2(struct runner *r, struct cell *ci, struct cell *cj, int sid,
     else if (ci->ti_end_min <= ti_current || cj->ti_end_min <= ti_current) {
 
       /* Do any of the cells need to be sorted first? */
-      if (!(ci->sorted & (1 << sid))) runner_dosort(r, ci, (1 << sid), 1);
-      if (!(cj->sorted & (1 << sid))) runner_dosort(r, cj, (1 << sid), 1);
+      if (!(ci->sorted & (1 << sid))) runner_do_sort(r, ci, (1 << sid), 1);
+      if (!(cj->sorted & (1 << sid))) runner_do_sort(r, cj, (1 << sid), 1);
 
       /* Compute the interactions. */
       DOPAIR2(r, ci, cj);
@@ -2850,7 +2850,7 @@ void DOSUB_SUBSET(struct runner *r, struct cell *ci, struct part *parts,
       sid = sortlistID[sid];
 
       /* Do any of the cells need to be sorted first? */
-      if (!(cj->sorted & (1 << sid))) runner_dosort(r, cj, (1 << sid), 1);
+      if (!(cj->sorted & (1 << sid))) runner_do_sort(r, cj, (1 << sid), 1);
 
       /* Compute the interactions. */
       DOPAIR_SUBSET(r, ci, parts, ind, count, cj);
diff --git a/src/runner_doiact_grav.h b/src/runner_doiact_grav.h
index 02626295a49f314fef840bc044a476f5c9cf332d..75775c24d1d35eaef2cde66a08c4f13561ef0ae4 100644
--- a/src/runner_doiact_grav.h
+++ b/src/runner_doiact_grav.h
@@ -60,8 +60,8 @@ void runner_dopair_grav_new(struct runner *r, struct cell *ci,
   sid = space_getsid(e->s, &ci, &cj, shift);
 
   /* Make sure the cells are sorted. */
-  runner_dogsort(r, ci, (1 << sid), 0);
-  runner_dogsort(r, cj, (1 << sid), 0);
+  runner_do_gsort(r, ci, (1 << sid), 0);
+  runner_do_gsort(r, cj, (1 << sid), 0);
 
   /* Have the cells been sorted? */
   if (!(ci->gsorted & (1 << sid)) || !(cj->gsorted & (1 << sid)))
diff --git a/src/space.c b/src/space.c
index 267eca1989a43caa53827695df24aa8c8f81db12..d87107a80add1b04674b74a8af55004427ddeac3 100644
--- a/src/space.c
+++ b/src/space.c
@@ -452,8 +452,7 @@ void space_rebuild(struct space *s, double cell_max, int verbose) {
       const int t = ind[k];
       ind[k] = ind[nr_parts];
       ind[nr_parts] = t;
-    }
-    else {
+    } else {
       /* Increment when not exchanging otherwise we need to retest "k".*/
       k++;
     }
@@ -488,8 +487,7 @@ void space_rebuild(struct space *s, double cell_max, int verbose) {
       const int t = gind[k];
       gind[k] = gind[nr_gparts];
       gind[nr_gparts] = t;
-    }
-    else {
+    } else {
       /* Increment when not exchanging otherwise we need to retest "k".*/
       k++;
     }
@@ -508,7 +506,6 @@ void space_rebuild(struct space *s, double cell_max, int verbose) {
     }
   }*/
 
-
   /* Exchange the strays, note that this potentially re-allocates
      the parts arrays. */
   size_t nr_parts_exchanged = s->nr_parts - nr_parts;
diff --git a/src/timers.h b/src/timers.h
index 81e5a674eddc3662e8db567ff7fc12302320320f..92b685ebe9b11d49c4703e5837d35cffdca81c4d 100644
--- a/src/timers.h
+++ b/src/timers.h
@@ -45,7 +45,7 @@ enum {
   timer_dosub_force,
   timer_dosub_grav,
   timer_dopair_subset,
-  timer_doghost,
+  timer_do_ghost,
   timer_dorecv_cell,
   timer_gettask,
   timer_qget,
diff --git a/tests/test27cells.c b/tests/test27cells.c
index bcd964620c5c729094a74c79275cdb66180f8dd3..504c07b4db391a2bc6fa60b7ec354367008aeec1 100644
--- a/tests/test27cells.c
+++ b/tests/test27cells.c
@@ -126,7 +126,7 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
   cell->sorted = 0;
   cell->sort = NULL;
   cell->sortsize = 0;
-  runner_dosort(NULL, cell, 0x1FFF, 0);
+  runner_do_sort(NULL, cell, 0x1FFF, 0);
 
   return cell;
 }
diff --git a/tests/testPair.c b/tests/testPair.c
index 07e576332f81b0471f35f09dfcda21ad535adc8b..a70cb381fd9a6dec061a100eeba17bfd54b0e973 100644
--- a/tests/testPair.c
+++ b/tests/testPair.c
@@ -91,7 +91,7 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
   cell->sorted = 0;
   cell->sort = NULL;
   cell->sortsize = 0;
-  runner_dosort(NULL, cell, 0x1FFF, 0);
+  runner_do_sort(NULL, cell, 0x1FFF, 0);
 
   return cell;
 }
diff --git a/tests/testSPHStep.c b/tests/testSPHStep.c
index 223078ecb637e64d94e37cdf8c0f60a86bdd5ff7..3af0c6ad1afdeab749a378153fd1a8e016f29659 100644
--- a/tests/testSPHStep.c
+++ b/tests/testSPHStep.c
@@ -141,7 +141,7 @@ int main() {
 
   /* Compute density */
   runner_doself1_density(&r, ci);
-  runner_doghost(&r, ci);
+  runner_do_ghost(&r, ci);
 
   message("h=%f rho=%f N_ngb=%f", p->h, p->rho, p->density.wcount);
   message("c=%f", p->force.c);
diff --git a/tests/testTimeIntegration.c b/tests/testTimeIntegration.c
index f3802888bccc40a424d659cde2605d12c9268e47..03893daf3530df040e5a5630bc6dc1d930ddcd1b 100644
--- a/tests/testTimeIntegration.c
+++ b/tests/testTimeIntegration.c
@@ -115,10 +115,10 @@ int main() {
     c.parts[0].a_hydro[1] = -(G * M_sun * c.parts[0].x[1] / r * r * r);
 
     /* Kick... */
-    runner_dokick(&run, &c, 0);
+    runner_do_kick(&run, &c, 0);
 
     /* Drift... */
-    runner_dodrift(&run, &c, 0);
+    runner_do_drift(&run, &c, 0);
   }
 
   /* Clean-up */