diff --git a/configure.ac b/configure.ac
index 19392a2ad644370028229f6ca6a43e1207547557..fc54cf79d520ba383a485e78b46885afc582992a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1760,7 +1760,7 @@ case "$with_star_formation" in
       AC_DEFINE([STAR_FORMATION_NONE], [1], [No star formation])
    ;;
    EAGLE)
-      AC_DEFINE([STAR_FORMATION_SCHAYE], [1], [Schaye and Dalla Vecchia (2008) star formation])
+      AC_DEFINE([STAR_FORMATION_EAGLE], [1], [EAGLE star formation model (Schaye and Dalla Vecchia (2008))])
    ;;
    *)
       AC_MSG_ERROR([Unknown star formation model])
diff --git a/src/star_formation.h b/src/star_formation.h
index f54ceb93b98ed7a92e6caa45dfc263655ad5566b..040233c87dfade411e215f9b0b1a4ef94018efbe 100644
--- a/src/star_formation.h
+++ b/src/star_formation.h
@@ -30,8 +30,8 @@
 /* Import the right star formation law definition */
 #if defined(STAR_FORMATION_NONE)
 #include "./star_formation/none/star_formation.h"
-#elif defined(STAR_FORMATION_SCHAYE)
-#include "./star_formation/schaye08/star_formation.h"
+#elif defined(STAR_FORMATION_EAGLE)
+#include "./star_formation/EAGLE/star_formation.h"
 #else
 #error "Invalid choice of star formation law"
 #endif
diff --git a/src/star_formation/schaye08/star_formation.h b/src/star_formation/EAGLE/star_formation.h
similarity index 99%
rename from src/star_formation/schaye08/star_formation.h
rename to src/star_formation/EAGLE/star_formation.h
index e07a2ff972a3160d10fcae5c029dab4408873c27..2a7cdaabce1d3f33b613463eb2b777de33ae4d43 100644
--- a/src/star_formation/schaye08/star_formation.h
+++ b/src/star_formation/EAGLE/star_formation.h
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *******************************************************************************/
-#ifndef SWIFT_SCHAYE_STARFORMATION_H
-#define SWIFT_SCHAYE_STARFORMATION_H
+#ifndef SWIFT_EAGLE_STAR_FORMATION_H
+#define SWIFT_EAGLE_STAR_FORMATION_H
 
 /* Some standard headers */
 #include <stdlib.h>
@@ -570,4 +570,4 @@ struct star_formation_history {
   };
 };
 
-#endif /* SWIFT_SCHAYE_STARFORMATION_H */
+#endif /* SWIFT_EAGLE_STAR_FORMATION_H */
diff --git a/src/star_formation/none/star_formation.h b/src/star_formation/none/star_formation.h
index e4f5949d9616b8d270823563830bd27ebd1199aa..ad6d6b2d18427e7ab0b2fbf6c6d89b99cd72f443 100644
--- a/src/star_formation/none/star_formation.h
+++ b/src/star_formation/none/star_formation.h
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *******************************************************************************/
-#ifndef SWIFT_NO_STARFORMATION_H
-#define SWIFT_NO_STARFORMATION_H
+#ifndef SWIFT_NONE_STAR_FORMATION_H
+#define SWIFT_NONE_STAR_FORMATION_H
 
 /* Local includes */
 #include "cosmology.h"
@@ -99,4 +99,4 @@ INLINE static void starformation_print_backend(
   message("Star formation law is 'No Star Formation'");
 }
 
-#endif /* SWIFT_NO_STARFORMATION_H */
+#endif /* SWIFT_NONE_STAR_FORMATION_H */