diff --git a/logger/Makefile.am b/logger/Makefile.am
index 4ac07e75d7f79bed82815865e8f65c1367e6a7bc..69b5b198a8c00ac0bcffb33ac3771c8ed0fa84d7 100644
--- a/logger/Makefile.am
+++ b/logger/Makefile.am
@@ -34,36 +34,36 @@ EXTRA_LIBS = $(PROFILER_LIBS) $(TCMALLOC_LIBS) $(JEMALLOC_LIBS) $(TBBMALLOC_LIBS
 # MPI_LIBS = $(MPI_THREAD_LIBS)
 # MPI_FLAGS = -DWITH_MPI
 
-# Build the libswiftsim library
-lib_LTLIBRARIES = libswiftlogger.la
+# Build the liblogger library
+lib_LTLIBRARIES = liblogger.la
 # Build a MPI-enabled version too?
 # if HAVEMPI
-# lib_LTLIBRARIES += libswiftlogger_mpi.la
+# lib_LTLIBRARIES += liblogger_mpi.la
 # endif
 
 # List required headers
-include_HEADERS = header.h io.h particle.h timeline.h logger_tools.h
+include_HEADERS = logger_header.h logger_io.h logger_particle.h logger_time.h logger_tools.h logger_reader.h
 
 # Common source files
-AM_SOURCES = header.c io.c particle.c timeline.c logger_tools.c
+AM_SOURCES = logger_header.c logger_io.c logger_particle.c logger_time.c logger_tools.c logger_reader.c
 if HAVEPYTHON
-AM_SOURCES += logger_loader.c
+AM_SOURCES += logger_python_wrapper.c
 endif
 
 # Include files for distribution, not installation.
 nobase_noinst_HEADERS = 
 
 # Sources and flags for regular library
-libswiftlogger_la_SOURCES = $(AM_SOURCES)
-libswiftlogger_la_CFLAGS = $(AM_CFLAGS)
-libswiftlogger_la_LDFLAGS = $(AM_LDFLAGS) $(EXTRA_LIBS) $(BIN_LDFLAGS)
+liblogger_la_SOURCES = $(AM_SOURCES)
+liblogger_la_CFLAGS = $(AM_CFLAGS)
+liblogger_la_LDFLAGS = $(AM_LDFLAGS) $(EXTRA_LIBS) $(BIN_LDFLAGS)
 
 # Sources and flags for MPI library
-# libswiftlogger_mpi_la_SOURCES = $(AM_SOURCES)
-# libswiftlogger_mpi_la_CFLAGS = $(AM_CFLAGS) $(MPI_FLAGS)
-# libswiftlogger_mpi_la_LDFLAGS = $(AM_LDFLAGS) $(MPI_LIBS) $(EXTRA_LIBS)
-# libswiftlogger_mpi_la_SHORTNAME = mpi
-# libswiftlogger_mpi_la_LIBADD =
+# liblogger_mpi_la_SOURCES = $(AM_SOURCES)
+# liblogger_mpi_la_CFLAGS = $(AM_CFLAGS) $(MPI_FLAGS)
+# liblogger_mpi_la_LDFLAGS = $(AM_LDFLAGS) $(MPI_LIBS) $(EXTRA_LIBS)
+# liblogger_mpi_la_SHORTNAME = mpi
+# liblogger_mpi_la_LIBADD =
 
 # Versioning. If any sources change then update the version_string.h file with
 # the current git revision and package version.
diff --git a/logger/header.c b/logger/logger_header.c
similarity index 98%
rename from logger/header.c
rename to logger/logger_header.c
index 33145085e7d1edbfdab0a7006c6f916dfd1349fe..47682d940b151a376819cad3deea9e2b38c3b27c 100644
--- a/logger/header.c
+++ b/logger/logger_header.c
@@ -1,6 +1,6 @@
-#include "header.h"
+#include "logger_header.h"
 
-#include "io.h"
+#include "logger_io.h"
 #include "logger_tools.h"
 
 #include <stdio.h>
diff --git a/logger/header.h b/logger/logger_header.h
similarity index 100%
rename from logger/header.h
rename to logger/logger_header.h
diff --git a/logger/io.c b/logger/logger_io.c
similarity index 98%
rename from logger/io.c
rename to logger/logger_io.c
index 0242681e01678857e2a221b829f73f1a557d1c9e..b6e12da855d5d6d3d323c4eabd744ddf71ce28c3 100644
--- a/logger/io.c
+++ b/logger/logger_io.c
@@ -3,8 +3,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "header.h"
-#include "io.h"
+#include "logger_header.h"
+#include "logger_io.h"
 #include "logger_tools.h"
 
 /**
diff --git a/logger/io.h b/logger/logger_io.h
similarity index 95%
rename from logger/io.h
rename to logger/logger_io.h
index 27e9286b52c75ccb6fdb9afe95228bce297b40f5..0b4cba242cb0803d07b7f4d55367a31639ea56cb 100644
--- a/logger/io.h
+++ b/logger/logger_io.h
@@ -1,7 +1,7 @@
 #ifndef __SWIFT_LOGGER_IO_H__
 #define __SWIFT_LOGGER_IO_H__
 
-#include "header.h"
+#include "logger_header.h"
 #include "logger_tools.h"
 
 #include <stdio.h>
diff --git a/logger/particle.c b/logger/logger_particle.c
similarity index 98%
rename from logger/particle.c
rename to logger/logger_particle.c
index ba073484a2012fe812c0ed5c1fdffeba9d22c4f4..9d5bb0c8607128b2e14e61ddf03a73b4342ac339 100644
--- a/logger/particle.c
+++ b/logger/logger_particle.c
@@ -1,8 +1,8 @@
-#include "particle.h"
-#include "header.h"
-#include "io.h"
+#include "logger_particle.h"
+#include "logger_header.h"
+#include "logger_io.h"
 #include "logger_tools.h"
-#include "timeline.h"
+#include "logger_time.h"
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/logger/particle.h b/logger/logger_particle.h
similarity index 95%
rename from logger/particle.h
rename to logger/logger_particle.h
index 900609ae576b4761b3ad7a529949126cfb33e589..5eb6648684948019a406eeb0cc4c397ffb887ba9 100644
--- a/logger/particle.h
+++ b/logger/logger_particle.h
@@ -1,9 +1,9 @@
 #ifndef __PARTICLE_H__
 #define __PARTICLE_H__
 
-#include "header.h"
+#include "logger_header.h"
 #include "logger_tools.h"
-#include "timeline.h"
+#include "logger_time.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/logger/logger_loader.c b/logger/logger_python_wrapper.c
similarity index 76%
rename from logger/logger_loader.c
rename to logger/logger_python_wrapper.c
index cb17bc77223c5dbe21a6fec711eed7dbc1d05844..475c38b641becd2b20d21ab2076a29ef79e53598 100644
--- a/logger/logger_loader.c
+++ b/logger/logger_python_wrapper.c
@@ -1,7 +1,8 @@
-#include "header.h"
-#include "io.h"
-#include "particle.h"
-#include "timeline.h"
+#include "logger_header.h"
+#include "logger_io.h"
+#include "logger_particle.h"
+#include "logger_time.h"
+#include "logger_reader.h"
 
 #include <Python.h>
 #include <errno.h>
@@ -9,82 +10,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-/**
- * @brief Reverse offset in dump file
- *
- * @param filename string filename of the dump file
- */
-int reverseOffset(char *filename) {
-  struct header h;
-
-  /* open file */
-  int fd;
-  void *map;
-  if (io_open_file(filename, &fd, &map) != 0) return 1;
-
-  /* read header */
-  if (header_read(&h, map) != 0) return 1;
-
-  header_print(&h);
-
-  /* check offset direction */
-  if (h.forward_offset) {
-    error_no_return(EIO, "Offset are already reversed");
-    return 1;
-  }
-
-  /* compute file size */
-  size_t sz;
-  int status = io_get_file_size(fd, &sz);
-  if (status != 0) return 1;
-
-  size_t offset;
-  int error_code;
-
-#ifdef SWIFT_DEBUG_CHECKS
-  /* check offset */
-  printf("Check offsets...\n");
-  offset = h.offset_first;
-  while (offset < sz) {
-    error_code = tools_check_offset(&h, map, &offset);
-    if (error_code != 0) return 1;
-  }
-  printf("Check done\n");
-#endif
-
-  /* reverse header offset */
-  header_change_offset_direction(&h, map);
-
-  offset = h.offset_first;
-
-  /* reverse chunks */
-  printf("Reversing offsets...\n");
-  while (offset < sz) {
-    error_code = tools_reverse_offset(&h, map, &offset);
-    if (error_code != 0) return 1;
-  }
-  printf("Reversing done\n");
-
-#ifdef SWIFT_DEBUG_CHECKS
-  /* check offset */
-  printf("Check offsets...\n");
-  offset = h.offset_first;
-  while (offset < sz) {
-    error_code = tools_check_offset(&h, map, &offset);
-
-    if (error_code != 0) return 1;
-  }
-  printf("Check done\n");
-#endif
-
-  /* free internal variables */
-  header_free(&h);
-
-  if (io_close_file(&fd, &map) != 0) return 1;
-
-  return 0;
-}
-
 /**
  * @brief load data from the offset without any interpolation
  *
@@ -143,7 +68,7 @@ static PyObject *loadFromIndex(__attribute__((unused)) PyObject *self,
   if (!h.forward_offset) {
     if (io_close_file(&fd, &map) != 0) return NULL;
 
-    if (reverseOffset(filename) != 0) return NULL;
+    if (reverse_offset(filename) != 0) return NULL;
 
     if (io_open_file(filename, &fd, &map) != 0) return NULL;
 
@@ -328,14 +253,14 @@ static PyObject *pyReverseOffset(__attribute__((unused)) PyObject *self,
 
   if (!PyArg_ParseTuple(args, "s", &filename)) return NULL;
 
-  if (reverseOffset(filename) != 0) return NULL;
+  if (reverse_offset(filename) != 0) return NULL;
 
   return Py_BuildValue("");
 }
 
 /* definition of the method table */
 
-static PyMethodDef libswiftloggerMethods[] = {
+static PyMethodDef libloggerMethods[] = {
     {"loadFromIndex", loadFromIndex, METH_VARARGS,
      "Load snapshot directly from the offset in an index file."},
     {"reverseOffset", pyReverseOffset, METH_VARARGS,
@@ -344,21 +269,21 @@ static PyMethodDef libswiftloggerMethods[] = {
     {NULL, NULL, 0, NULL} /* Sentinel */
 };
 
-static struct PyModuleDef libswiftloggermodule = {
+static struct PyModuleDef libloggermodule = {
     PyModuleDef_HEAD_INIT,
-    "libswiftlogger",
+    "liblogger",
     "Module reading a SWIFTsim logger snapshot",
     -1,
-    libswiftloggerMethods,
+    libloggerMethods,
     NULL, /* m_slots */
     NULL, /* m_traverse */
     NULL, /* m_clear */
     NULL  /* m_free */
 };
 
-PyMODINIT_FUNC PyInit_libswiftlogger(void) {
+PyMODINIT_FUNC PyInit_liblogger(void) {
   PyObject *m;
-  m = PyModule_Create(&libswiftloggermodule);
+  m = PyModule_Create(&libloggermodule);
   if (m == NULL) return NULL;
 
   import_array();
diff --git a/logger/timeline.c b/logger/logger_time.c
similarity index 99%
rename from logger/timeline.c
rename to logger/logger_time.c
index 7bb791d16cb6fd658a1c7c0d5440b28454b6ed4a..530a5f49c8fd4ca23203c9f585df4d50c8d05566 100644
--- a/logger/timeline.c
+++ b/logger/logger_time.c
@@ -1,5 +1,5 @@
-#include "timeline.h"
-#include "io.h"
+#include "logger_time.h"
+#include "logger_io.h"
 
 /**
  * @brief convert an integer time to a real time
diff --git a/logger/timeline.h b/logger/logger_time.h
similarity index 98%
rename from logger/timeline.h
rename to logger/logger_time.h
index 84cdc84be5c62b02b1ad214341ce622da136195c..757b932b87639777ca156c4f9596f8371ca6254d 100644
--- a/logger/timeline.h
+++ b/logger/logger_time.h
@@ -1,7 +1,7 @@
 #ifndef __TIMELINE_H__
 #define __TIMELINE_H__
 
-#include "header.h"
+#include "logger_header.h"
 #include "logger_tools.h"
 
 typedef char timebin_t;
diff --git a/logger/logger_tools.c b/logger/logger_tools.c
index 31b8d649cdcf2e06c4088dd7931f1c8a90f44d6e..056019f497e017f1ee8ed372dba9a632ad4c45a8 100644
--- a/logger/logger_tools.c
+++ b/logger/logger_tools.c
@@ -1,8 +1,8 @@
 #include "logger_tools.h"
-#include "header.h"
-#include "io.h"
+#include "logger_header.h"
+#include "logger_io.h"
 
-#include "particle.h"
+#include "logger_particle.h"
 
 #include <stdio.h>
 
diff --git a/logger/python/reader_example.py b/logger/python/reader_example.py
index 1026c836e71afa21160a621618db606fd359a617..d8b28cd791d37f602917da4752d1c27210b118ae 100644
--- a/logger/python/reader_example.py
+++ b/logger/python/reader_example.py
@@ -9,7 +9,7 @@ import numpy as np
 import matplotlib.pyplot as plt
 sys.path.append("../.libs/")
 
-import libswiftlogger as logger
+import liblogger as logger
 
 # Get filenames
 if len(sys.argv) != 3: