diff --git a/src/Makefile.am b/src/Makefile.am
index 219da2d5a09f05590d19270e419ca9f1e231ecdc..15e03d9382b7c38ece658b5e3a5612d85957e8c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,7 +50,7 @@ include_HEADERS = space.h runner.h queue.h task.h lock.h cell.h part.h const.h \
     chemistry.h chemistry_io.h chemistry_struct.h cosmology.h restart.h space_getsid.h utilities.h \
     mesh_gravity.h cbrt.h exp10.h velociraptor_interface.h swift_velociraptor_part.h outputlist.h \
     logger_io.h tracers_io.h tracers.h tracers_struct.h sftracers_io.h sftracers.h \
-    sftracers_struct.h starformation.h velociraptor_struct.h velociraptor_io.h
+    sftracers_struct.h star_formation.h velociraptor_struct.h velociraptor_io.h
 
 # source files for EAGLE cooling
 EAGLE_COOLING_SOURCES =
@@ -64,7 +64,7 @@ AM_SOURCES = space.c runner.c queue.c task.c cell.c engine.c engine_maketasks.c
     proxy.c parallel_io.c units.c common_io.c single_io.c multipole.c version.c map.c \
     kernel_hydro.c tools.c part.c partition.c clocks.c parser.c \
     physical_constants.c potential.c hydro_properties.c \
-    threadpool.c cooling.c starformation.c \
+    threadpool.c cooling.c star_formation.c \
     statistics.c runner_doiact_vec.c profiler.c dump.c logger.c \
     part_type.c xmf.c gravity_properties.c gravity.c \
     collectgroup.c hydro_space.c equation_of_state.c \
@@ -141,7 +141,7 @@ nobase_noinst_HEADERS = align.h approx_math.h atomic.h barrier.h cycle.h error.h
 	         potential/none/potential.h potential/point_mass/potential.h \
                  potential/isothermal/potential.h potential/disc_patch/potential.h \
                  potential/sine_wave/potential.h \
-		 starformation/none/starformation.h starformation/schaye08/starformation.h \
+		 star_formation/none/star_formation.h star_formation/schaye08/star_formation.h \
 		 cooling/none/cooling.h cooling/none/cooling_struct.h \
                  cooling/none/cooling_io.h \
 		 cooling/Compton/cooling.h cooling/Compton/cooling_struct.h \
diff --git a/src/engine.c b/src/engine.c
index 55c62c2db4ebf53b11abe02d6431c62a86123990..ae77a323ac8c30a47f95d94959695c61bb8055f0 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -84,7 +84,7 @@
 #include "serial_io.h"
 #include "single_io.h"
 #include "sort_part.h"
-#include "starformation.h"
+#include "star_formation.h"
 #include "stars_io.h"
 #include "statistics.h"
 #include "timers.h"
diff --git a/src/runner.c b/src/runner.c
index c3bf9321c5b1ba6be4f5a2baa4dc0674c6090727..92672e767d8f14320745686403c4b5a67cb4a6da 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -61,7 +61,7 @@
 #include "sort_part.h"
 #include "space.h"
 #include "space_getsid.h"
-#include "starformation.h"
+#include "star_formation.h"
 #include "stars.h"
 #include "task.h"
 #include "timers.h"
diff --git a/src/starformation.c b/src/star_formation.c
similarity index 99%
rename from src/starformation.c
rename to src/star_formation.c
index 1eabed2d296c1e0ef086f54aca042bb4db8edc16..698a64cc636dd79f00feac3f6cc88bf519fe09c1 100644
--- a/src/starformation.c
+++ b/src/star_formation.c
@@ -23,7 +23,7 @@
 /* This object's header. */
 #include "part.h"
 #include "restart.h"
-#include "starformation.h"
+#include "star_formation.h"
 #include "units.h"
 
 /**
diff --git a/src/starformation.h b/src/star_formation.h
similarity index 95%
rename from src/starformation.h
rename to src/star_formation.h
index 5158c9d48df85f44690b9fd56debd6548a4bbb2e..f54ceb93b98ed7a92e6caa45dfc263655ad5566b 100644
--- a/src/starformation.h
+++ b/src/star_formation.h
@@ -29,9 +29,9 @@
 
 /* Import the right star formation law definition */
 #if defined(STAR_FORMATION_NONE)
-#include "./starformation/none/starformation.h"
+#include "./star_formation/none/star_formation.h"
 #elif defined(STAR_FORMATION_SCHAYE)
-#include "./starformation/schaye08/starformation.h"
+#include "./star_formation/schaye08/star_formation.h"
 #else
 #error "Invalid choice of star formation law"
 #endif
diff --git a/src/starformation/none/starformation.h b/src/star_formation/none/star_formation.h
similarity index 100%
rename from src/starformation/none/starformation.h
rename to src/star_formation/none/star_formation.h
diff --git a/src/starformation/schaye08/starformation.h b/src/star_formation/schaye08/star_formation.h
similarity index 100%
rename from src/starformation/schaye08/starformation.h
rename to src/star_formation/schaye08/star_formation.h
diff --git a/src/swift.h b/src/swift.h
index 14c031f80b7f4c3cdaadbc8e4b9e7639a24a61f1..ee27dacb41e573eb79e18825e26cc52bbb79f823 100644
--- a/src/swift.h
+++ b/src/swift.h
@@ -67,7 +67,7 @@
 #include "serial_io.h"
 #include "single_io.h"
 #include "space.h"
-#include "starformation.h"
+#include "star_formation.h"
 #include "stars.h"
 #include "stars_io.h"
 #include "task.h"