diff --git a/src/engine.c b/src/engine.c
index e036e674a8435fc5810f5cbae02862ceaaa15571..36ba85513d282b2dbccc4aa3f4f0ce441e8455ab 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -5831,7 +5831,7 @@ void engine_init(struct engine *e, struct space *s, struct swift_params *params,
     e->ti_current = 0;
   }
 
-  engine_init_outputlists(e, params);
+  engine_init_output_lists(e, params);
 }
 
 /**
@@ -5907,7 +5907,7 @@ void engine_config(int restart, struct engine *e, struct swift_params *params,
           e->stf_output_freq_format);
 
     /* overwrite input if outputlist */
-    if (e->outputlist_stf) e->stf_output_freq_format = TIME;
+    if (e->output_list_stf) e->stf_output_freq_format = TIME;
   }
 
   /* Get the number of queues */
@@ -6442,8 +6442,8 @@ void engine_print_policy(struct engine *e) {
  */
 void engine_compute_next_snapshot_time(struct engine *e) {
   /* Do outputlist file case */
-  if (e->outputlist_snapshots) {
-    outputlist_read_next_time(e->outputlist_snapshots, e, "snapshots",
+  if (e->output_list_snapshots) {
+    output_list_read_next_time(e->output_list_snapshots, e, "snapshots",
                               &e->ti_next_snapshot);
     return;
   }
@@ -6505,9 +6505,9 @@ void engine_compute_next_snapshot_time(struct engine *e) {
  * @param e The #engine.
  */
 void engine_compute_next_statistics_time(struct engine *e) {
-  /* Do outputlist file case */
-  if (e->outputlist_stats) {
-    outputlist_read_next_time(e->outputlist_stats, e, "stats",
+  /* Do output_list file case */
+  if (e->output_list_stats) {
+    output_list_read_next_time(e->output_list_stats, e, "stats",
                               &e->ti_next_stats);
     return;
   }
@@ -6571,9 +6571,9 @@ void engine_compute_next_statistics_time(struct engine *e) {
  * @param e The #engine.
  */
 void engine_compute_next_stf_time(struct engine *e) {
-  /* Do outputlist file case */
-  if (e->outputlist_stf) {
-    outputlist_read_next_time(e->outputlist_stf, e, "stf", &e->ti_nextSTF);
+  /* Do output_list file case */
+  if (e->output_list_stf) {
+    output_list_read_next_time(e->output_list_stf, e, "stf", &e->ti_nextSTF);
     return;
   }
 
@@ -6626,19 +6626,19 @@ void engine_compute_next_stf_time(struct engine *e) {
 }
 
 /**
- * @brief Initialize all the outputlist required by the engine
+ * @brief Initialize all the output_list required by the engine
  *
  * @param e The #engine.
  * @param params The #swift_params.
  */
-void engine_init_outputlists(struct engine *e, struct swift_params *params) {
+void engine_init_output_lists(struct engine *e, struct swift_params *params) {
   /* Deal with snapshots */
   double snaps_time_first;
-  e->outputlist_snapshots = NULL;
-  outputlist_init(&e->outputlist_snapshots, e, "Snapshots",
+  e->output_list_snapshots = NULL;
+  output_list_init(&e->output_list_snapshots, e, "Snapshots",
                   &e->delta_time_snapshot, &snaps_time_first);
 
-  if (e->outputlist_snapshots) {
+  if (e->output_list_snapshots) {
     if (e->policy & engine_policy_cosmology)
       e->a_first_snapshot = snaps_time_first;
     else
@@ -6647,11 +6647,11 @@ void engine_init_outputlists(struct engine *e, struct swift_params *params) {
 
   /* Deal with stats */
   double stats_time_first;
-  e->outputlist_stats = NULL;
-  outputlist_init(&e->outputlist_stats, e, "Statistics",
+  e->output_list_stats = NULL;
+  output_list_init(&e->output_list_stats, e, "Statistics",
                   &e->delta_time_statistics, &stats_time_first);
 
-  if (e->outputlist_stats) {
+  if (e->output_list_stats) {
     if (e->policy & engine_policy_cosmology)
       e->a_first_statistics = stats_time_first;
     else
@@ -6660,15 +6660,15 @@ void engine_init_outputlists(struct engine *e, struct swift_params *params) {
 
   /* Deal with stf */
   double stf_time_first;
-  e->outputlist_stf = NULL;
-  outputlist_init(&e->outputlist_stf, e, "StructureFinding", &e->deltaTimeSTF,
+  e->output_list_stf = NULL;
+  output_list_init(&e->output_list_stf, e, "StructureFinding", &e->deltaTimeSTF,
                   &stf_time_first);
 
-  if (e->outputlist_stf) {
+  if (e->output_list_stf) {
     if (e->policy & engine_policy_cosmology)
       e->a_first_stf = stf_time_first;
     else
-      e->timeFirstSTFOutput = stats_time_first;
+      e->timeFirstSTFOutput = stf_time_first;
   }
 }
 
@@ -6805,17 +6805,17 @@ void engine_clean(struct engine *e) {
   }
   free(e->runners);
   free(e->snapshot_units);
-  if (e->outputlist_snapshots) {
-    outputlist_clean(e->outputlist_snapshots);
-    free(e->outputlist_snapshots);
+  if (e->output_list_snapshots) {
+    output_list_clean(e->output_list_snapshots);
+    free(e->output_list_snapshots);
   }
-  if (e->outputlist_stats) {
-    outputlist_clean(e->outputlist_stats);
-    free(e->outputlist_stats);
+  if (e->output_list_stats) {
+    output_list_clean(e->output_list_stats);
+    free(e->output_list_stats);
   }
-  if (e->outputlist_stf) {
-    outputlist_clean(e->outputlist_stf);
-    free(e->outputlist_stf);
+  if (e->output_list_stf) {
+    output_list_clean(e->output_list_stf);
+    free(e->output_list_stf);
   }
   free(e->links);
   free(e->cell_loc);
@@ -6859,10 +6859,10 @@ void engine_struct_dump(struct engine *e, FILE *stream) {
   chemistry_struct_dump(e->chemistry, stream);
   sourceterms_struct_dump(e->sourceterms, stream);
   parser_struct_dump(e->parameter_file, stream);
-  if (e->outputlist_snapshots)
-    outputlist_struct_dump(e->outputlist_snapshots, stream);
-  if (e->outputlist_stats) outputlist_struct_dump(e->outputlist_stats, stream);
-  if (e->outputlist_stf) outputlist_struct_dump(e->outputlist_stf, stream);
+  if (e->output_list_snapshots)
+    output_list_struct_dump(e->output_list_snapshots, stream);
+  if (e->output_list_stats) output_list_struct_dump(e->output_list_stats, stream);
+  if (e->output_list_stf) output_list_struct_dump(e->output_list_stf, stream);
 }
 
 /**
@@ -6958,25 +6958,25 @@ void engine_struct_restore(struct engine *e, FILE *stream) {
   parser_struct_restore(parameter_file, stream);
   e->parameter_file = parameter_file;
 
-  if (e->outputlist_snapshots) {
-    struct outputlist *outputlist_snapshots =
-        (struct outputlist *)malloc(sizeof(struct outputlist));
-    outputlist_struct_restore(outputlist_snapshots, stream);
-    e->outputlist_snapshots = outputlist_snapshots;
+  if (e->output_list_snapshots) {
+    struct output_list *output_list_snapshots =
+        (struct output_list *)malloc(sizeof(struct output_list));
+    output_list_struct_restore(output_list_snapshots, stream);
+    e->output_list_snapshots = output_list_snapshots;
   }
 
-  if (e->outputlist_stats) {
-    struct outputlist *outputlist_stats =
-        (struct outputlist *)malloc(sizeof(struct outputlist));
-    outputlist_struct_restore(outputlist_stats, stream);
-    e->outputlist_stats = outputlist_stats;
+  if (e->output_list_stats) {
+    struct output_list *output_list_stats =
+        (struct output_list *)malloc(sizeof(struct output_list));
+    output_list_struct_restore(output_list_stats, stream);
+    e->output_list_stats = output_list_stats;
   }
 
-  if (e->outputlist_stf) {
-    struct outputlist *outputlist_stf =
-        (struct outputlist *)malloc(sizeof(struct outputlist));
-    outputlist_struct_restore(outputlist_stf, stream);
-    e->outputlist_stf = outputlist_stf;
+  if (e->output_list_stf) {
+    struct output_list *output_list_stf =
+        (struct output_list *)malloc(sizeof(struct output_list));
+    output_list_struct_restore(output_list_stf, stream);
+    e->output_list_stf = output_list_stf;
   }
 
   /* Want to force a rebuild before using this engine. Wait to repartition.*/
diff --git a/src/engine.h b/src/engine.h
index edc2c0f9f107bfe7cf5832d2ed4db48661032b45..aeb57c65ac36ff5ddbf4b74185adeb94f3d460da 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -215,8 +215,8 @@ struct engine {
   double time_first_snapshot;
   double delta_time_snapshot;
 
-  /* Outputlist for the snapshots */
-  struct outputlist *outputlist_snapshots;
+  /* Output_List for the snapshots */
+  struct output_list *output_list_snapshots;
 
   /* Integer time of the next snapshot */
   integertime_t ti_next_snapshot;
@@ -234,8 +234,8 @@ struct engine {
   double deltaTimeSTF;
   int deltaStepSTF;
 
-  /* Outputlist for the structure finding */
-  struct outputlist *outputlist_stf;
+  /* Output_List for the structure finding */
+  struct output_list *output_list_stf;
 
   /* Integer time of the next stf output */
   integertime_t ti_nextSTF;
@@ -247,8 +247,8 @@ struct engine {
   double time_first_statistics;
   double delta_time_statistics;
 
-  /* Outputlist for the stats */
-  struct outputlist *outputlist_stats;
+  /* Output_List for the stats */
+  struct output_list *output_list_stats;
 
   /* Integer time of the next statistics dump */
   integertime_t ti_next_stats;
@@ -374,9 +374,7 @@ void engine_addlink(struct engine *e, struct link **l, struct task *t);
 void engine_barrier(struct engine *e);
 void engine_compute_next_snapshot_time(struct engine *e);
 void engine_compute_next_stf_time(struct engine *e);
-void engine_read_next_snapshot_time(struct engine *e);
 void engine_compute_next_statistics_time(struct engine *e);
-void engine_read_next_statistics_time(struct engine *e);
 void engine_recompute_displacement_constraint(struct engine *e);
 void engine_unskip(struct engine *e);
 void engine_drift_all(struct engine *e);
@@ -384,7 +382,7 @@ void engine_drift_top_multipoles(struct engine *e);
 void engine_reconstruct_multipoles(struct engine *e);
 void engine_print_stats(struct engine *e);
 void engine_dump_snapshot(struct engine *e);
-void engine_init_outputlists(struct engine *e, struct swift_params *params);
+void engine_init_output_lists(struct engine *e, struct swift_params *params);
 void engine_init(struct engine *e, struct space *s, struct swift_params *params,
                  long long Ngas, long long Ngparts, long long Nstars,
                  int policy, int verbose, struct repartition *reparttype,
diff --git a/src/outputlist.c b/src/outputlist.c
index 89f4f53c183b2b83bed1f1e02c362b8e20b07ff7..b7eef083f30cce62bb03c7a7b1d220c9940b8e20 100644
--- a/src/outputlist.c
+++ b/src/outputlist.c
@@ -35,11 +35,11 @@
 /**
  * @brief Read a file containing a list of time
  *
- * @param outputlist The #outputlist to fill.
+ * @param outputlist The #output_list to fill.
  * @param filename The file to read.
  * @param cosmo The #cosmology model.
  */
-void outputlist_read_file(struct outputlist *outputlist, const char *filename,
+void output_list_read_file(struct output_list *outputlist, const char *filename,
                           struct cosmology *cosmo) {
 
   /* Open file */
@@ -63,7 +63,7 @@ void outputlist_read_file(struct outputlist *outputlist, const char *filename,
   outputlist->times = (double *)malloc(sizeof(double) * nber_line);
   if (!outputlist->times)
     error(
-        "Unable to malloc outputlist. "
+        "Unable to malloc output_list. "
         "Try reducing the number of lines in %s",
         filename);
 
@@ -77,16 +77,16 @@ void outputlist_read_file(struct outputlist *outputlist, const char *filename,
   /* Find type of data in file */
   int type = -1;
   if (!strcmp(line, "# Redshift"))
-    type = OUTPUTLIST_REDSHIFT;
+    type = OUTPUT_LIST_REDSHIFT;
   else if (!strcmp(line, "# Time"))
-    type = OUTPUTLIST_AGE;
+    type = OUTPUT_LIST_AGE;
   else if (!strcmp(line, "# Scale Factor"))
-    type = OUTPUTLIST_SCALE_FACTOR;
+    type = OUTPUT_LIST_SCALE_FACTOR;
   else
     error("Unable to interpret the header (%s) in file '%s'", line, filename);
 
   if (!cosmo &&
-      (type == OUTPUTLIST_SCALE_FACTOR || type == OUTPUTLIST_REDSHIFT))
+      (type == OUTPUT_LIST_SCALE_FACTOR || type == OUTPUT_LIST_REDSHIFT))
     error(
         "Unable to compute a redshift or a scale factor without cosmology. "
         "Please change the header in '%s'",
@@ -105,9 +105,9 @@ void outputlist_read_file(struct outputlist *outputlist, const char *filename,
     }
 
     /* Transform input into correct time (e.g. ages or scale factor) */
-    if (type == OUTPUTLIST_REDSHIFT) *time = 1. / (1. + *time);
+    if (type == OUTPUT_LIST_REDSHIFT) *time = 1. / (1. + *time);
 
-    if (cosmo && type == OUTPUTLIST_AGE)
+    if (cosmo && type == OUTPUT_LIST_AGE)
       *time = cosmology_get_scale_factor(cosmo, *time);
 
     /* Update size */
@@ -123,12 +123,12 @@ void outputlist_read_file(struct outputlist *outputlist, const char *filename,
 /**
  * @brief Read the next time for an output
  *
- * @param t The #outputlist
+ * @param t The #output_list
  * @param e The #engine.
  * @param name The name of the output (e.g. 'stats', 'snapshots', 'stf')
  * @param ti_next updated to the next output time
  */
-void outputlist_read_next_time(struct outputlist *t, const struct engine *e,
+void output_list_read_next_time(struct output_list *t, const struct engine *e,
                                const char *name, integertime_t *ti_next) {
   int is_cosmo = e->policy & engine_policy_cosmology;
 
@@ -190,7 +190,7 @@ void outputlist_read_next_time(struct outputlist *t, const struct engine *e,
  * @param time_first updated to the time of first output (scale factor or cosmic
  * time)
  */
-void outputlist_init(struct outputlist **list, const struct engine *e,
+void output_list_init(struct output_list **list, const struct engine *e,
                      char *name, double *delta_time, double *time_first) {
   struct swift_params *params = e->parameter_file;
 
@@ -207,7 +207,7 @@ void outputlist_init(struct outputlist **list, const struct engine *e,
   if (!outputlist_on) return;
 
   /* Read outputlist for snapshots */
-  *list = (struct outputlist *)malloc(sizeof(struct outputlist));
+  *list = (struct output_list *)malloc(sizeof(struct output_list));
 
   /* Read filename */
   char filename[PARSER_MAX_LINE_SIZE];
@@ -215,7 +215,7 @@ void outputlist_init(struct outputlist **list, const struct engine *e,
   parser_get_param_string(params, param_name, filename);
 
   message("Reading %s output file.", name);
-  outputlist_read_file(*list, filename, cosmo);
+  output_list_read_file(*list, filename, cosmo);
 
   if ((*list)->size < 2)
     error("You need to provide more snapshots in '%s'", filename);
@@ -231,9 +231,9 @@ void outputlist_init(struct outputlist **list, const struct engine *e,
 }
 
 /**
- * @brief Print an #outputlist
+ * @brief Print an #output_list
  */
-void outputlist_print(const struct outputlist *outputlist) {
+void output_list_print(const struct output_list *outputlist) {
 
   printf("/*\t Time Array\t */\n");
   printf("Number of Line: %lu\n", outputlist->size);
@@ -246,29 +246,29 @@ void outputlist_print(const struct outputlist *outputlist) {
 }
 
 /**
- * @brief Clean an #outputlist
+ * @brief Clean an #output_list
  */
-void outputlist_clean(struct outputlist *outputlist) {
+void output_list_clean(struct output_list *outputlist) {
   free(outputlist->times);
 }
 
 /**
- * @brief Dump an #outputlist in a restart file
+ * @brief Dump an #output_list in a restart file
  */
-void outputlist_struct_dump(struct outputlist *list, FILE *stream) {
-  restart_write_blocks(list, sizeof(struct outputlist), 1, stream, "outputlist",
-                       "outputlist struct");
+void output_list_struct_dump(struct output_list *list, FILE *stream) {
+  restart_write_blocks(list, sizeof(struct output_list), 1, stream, "output_list",
+                       "output_list struct");
 
   restart_write_blocks(list->times, list->size, sizeof(double), stream,
-                       "outputlist", "times");
+                       "output_list", "times");
 }
 
 /**
- * @brief Restore an #outputlist from a restart file
+ * @brief Restore an #output_list from a restart file
  */
-void outputlist_struct_restore(struct outputlist *list, FILE *stream) {
-  restart_read_blocks(list, sizeof(struct outputlist), 1, stream, NULL,
-                      "outputlist struct");
+void output_list_struct_restore(struct output_list *list, FILE *stream) {
+  restart_read_blocks(list, sizeof(struct output_list), 1, stream, NULL,
+                      "output_list struct");
 
   list->times = (double *)malloc(sizeof(double) * list->size);
   restart_read_blocks(list->times, list->size, sizeof(double), stream, NULL,
diff --git a/src/outputlist.h b/src/outputlist.h
index dac27e829a34b02c6ab6323ff391a9f9bfa02029..050bc23f157aef6860297dee08d91f0f651eaf35 100644
--- a/src/outputlist.h
+++ b/src/outputlist.h
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
-#ifndef SWIFT_OUTPUTLIST_H
-#define SWIFT_OUTPUTLIST_H
+#ifndef SWIFT_OUTPUT_LIST_H
+#define SWIFT_OUTPUT_LIST_H
 
 /* Config parameters. */
 #include "../config.h"
@@ -28,18 +28,18 @@
 struct engine;
 
 /**
- * @brief the different outputlist type
+ * @brief the different output_list type
  */
 enum output_list_type {
-  OUTPUTLIST_AGE,
-  OUTPUTLIST_REDSHIFT,
-  OUTPUTLIST_SCALE_FACTOR,
+  OUTPUT_LIST_AGE,
+  OUTPUT_LIST_REDSHIFT,
+  OUTPUT_LIST_SCALE_FACTOR,
 };
 
 /**
  * @brief the array containing the output times
  */
-struct outputlist {
+struct output_list {
 
   /* Time array */
   double *times;
@@ -51,15 +51,15 @@ struct outputlist {
   size_t cur_ind;
 };
 
-void outputlist_read_file(struct outputlist *outputlist, const char *filename,
+void output_list_read_file(struct output_list *outputlist, const char *filename,
                           struct cosmology *cosmo);
-void outputlist_read_next_time(struct outputlist *t, const struct engine *e,
+void output_list_read_next_time(struct output_list *t, const struct engine *e,
                                const char *name, integertime_t *ti_next);
-void outputlist_init(struct outputlist **list, const struct engine *e,
+void output_list_init(struct output_list **list, const struct engine *e,
                      char *name, double *delta_time, double *time_first);
-void outputlist_print(const struct outputlist *outputlist);
-void outputlist_clean(struct outputlist *outputlist);
-void outputlist_struct_dump(struct outputlist *list, FILE *stream);
-void outputlist_struct_restore(struct outputlist *list, FILE *stream);
+void output_list_print(const struct output_list *outputlist);
+void output_list_clean(struct output_list *outputlist);
+void output_list_struct_dump(struct output_list *list, FILE *stream);
+void output_list_struct_restore(struct output_list *list, FILE *stream);
 
-#endif /* SWIFT_OUTPUTLIST_H */
+#endif /* SWIFT_OUTPUT_LIST_H */