diff --git a/configure.ac b/configure.ac
index fe2916ead87d8f80f1f9e90963295d5d555454d2..aa717b0d9c2d978f638ed5698cbf488e862d577d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,7 @@ AM_PROG_CC_C_O
 # As an example for this, see the call to AC_ARG_WITH for cooling.
 AC_ARG_WITH([subgrid],
 	[AS_HELP_STRING([--with-subgrid=<subgrid>],
-		[Master switch for subgrid methods. Inexperienced user should start from here @<:@none, gear, EAGLE default: none@:>@]
+		[Master switch for subgrid methods. Inexperienced user should start from here @<:@none, GEAR, EAGLE default: none@:>@]
 	)],
 	[with_subgrid="$withval"],
 	[with_subgrid=none]
@@ -65,9 +65,9 @@ case "$with_subgrid" in
    ;;
    none)
    ;;
-   gear)
+   GEAR)
 	with_subgrid_cooling=grackle
-	with_subgrid_chemistry=gear
+	with_subgrid_chemistry=GEAR
 	with_subgrid_hydro=gadget2
    ;;
    EAGLE)
@@ -1096,7 +1096,7 @@ esac
 #  chemistry function
 AC_ARG_WITH([chemistry],
    [AS_HELP_STRING([--with-chemistry=<function>],
-      [chemistry function @<:@none, gear, EAGLE default: none@:>@]
+      [chemistry function @<:@none, GEAR, EAGLE default: none@:>@]
    )],
    [with_chemistry="$withval"],
    [with_chemistry="none"]
@@ -1114,7 +1114,7 @@ case "$with_chemistry" in
    none)
       AC_DEFINE([CHEMISTRY_NONE], [1], [No chemistry function])
    ;;
-   gear)
+   GEAR)
       AC_DEFINE([CHEMISTRY_GEAR], [1], [Chemistry taken from the GEAR model])
    ;;
    EAGLE)
diff --git a/src/Makefile.am b/src/Makefile.am
index d8b633fe1e97e67fc4ef0cc29bab8f6fd25fd907..5e8de64d21d896bf8575e8c809ae0ad034c2f446 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -131,10 +131,10 @@ nobase_noinst_HEADERS = align.h approx_math.h atomic.h barrier.h cycle.h error.h
 		 chemistry/none/chemistry_io.h \
 		 chemistry/none/chemistry_struct.h \
 		 chemistry/none/chemistry_iact.h \
-                 chemistry/gear/chemistry.h \
-		 chemistry/gear/chemistry_io.h \
-		 chemistry/gear/chemistry_struct.h \
-		 chemistry/gear/chemistry_iact.h \
+                 chemistry/GEAR/chemistry.h \
+		 chemistry/GEAR/chemistry_io.h \
+		 chemistry/GEAR/chemistry_struct.h \
+		 chemistry/GEAR/chemistry_iact.h \
                  chemistry/EAGLE/chemistry.h \
 		 chemistry/EAGLE/chemistry_io.h \
 		 chemistry/EAGLE/chemistry_struct.h\
diff --git a/src/chemistry.h b/src/chemistry.h
index 77b8d5b5fa5314d692fb8f46c8e6229b57119a6c..bacc15c483c168dbf86bd34dc2af92a3eefb9e02 100644
--- a/src/chemistry.h
+++ b/src/chemistry.h
@@ -33,8 +33,8 @@
 #include "./chemistry/none/chemistry.h"
 #include "./chemistry/none/chemistry_iact.h"
 #elif defined(CHEMISTRY_GEAR)
-#include "./chemistry/gear/chemistry.h"
-#include "./chemistry/gear/chemistry_iact.h"
+#include "./chemistry/GEAR/chemistry.h"
+#include "./chemistry/GEAR/chemistry_iact.h"
 #elif defined(CHEMISTRY_EAGLE)
 #include "./chemistry/EAGLE/chemistry.h"
 #include "./chemistry/EAGLE/chemistry_iact.h"
diff --git a/src/chemistry/EAGLE/chemistry.h b/src/chemistry/EAGLE/chemistry.h
index fa63c8cc877861d443d6cdb3cc1c8f0c94befefe..459de24ef3c5e9140fd136155ba55d2364795fb8 100644
--- a/src/chemistry/EAGLE/chemistry.h
+++ b/src/chemistry/EAGLE/chemistry.h
@@ -20,7 +20,7 @@
 #define SWIFT_CHEMISTRY_EAGLE_H
 
 /**
- * @file src/chemistry/gear/chemistry.h
+ * @file src/chemistry/EAGLE/chemistry.h
  * @brief Empty infrastructure for the cases without chemistry function
  */
 
diff --git a/src/chemistry/gear/chemistry.h b/src/chemistry/GEAR/chemistry.h
similarity index 99%
rename from src/chemistry/gear/chemistry.h
rename to src/chemistry/GEAR/chemistry.h
index 5321a5a963e36a59dedf3abeeea7506f4e92e1ee..a51051ca3ae45476986d39c868a9fc71bf7f9ae5 100644
--- a/src/chemistry/gear/chemistry.h
+++ b/src/chemistry/GEAR/chemistry.h
@@ -20,7 +20,7 @@
 #define SWIFT_CHEMISTRY_GEAR_H
 
 /**
- * @file src/chemistry/gear/chemistry.h
+ * @file src/chemistry/GEAR/chemistry.h
  * @brief Empty infrastructure for the cases without chemistry function
  */
 
diff --git a/src/chemistry/gear/chemistry_iact.h b/src/chemistry/GEAR/chemistry_iact.h
similarity index 100%
rename from src/chemistry/gear/chemistry_iact.h
rename to src/chemistry/GEAR/chemistry_iact.h
diff --git a/src/chemistry/gear/chemistry_io.h b/src/chemistry/GEAR/chemistry_io.h
similarity index 100%
rename from src/chemistry/gear/chemistry_io.h
rename to src/chemistry/GEAR/chemistry_io.h
diff --git a/src/chemistry/gear/chemistry_struct.h b/src/chemistry/GEAR/chemistry_struct.h
similarity index 100%
rename from src/chemistry/gear/chemistry_struct.h
rename to src/chemistry/GEAR/chemistry_struct.h
diff --git a/src/chemistry_io.h b/src/chemistry_io.h
index 2a690b6a85ae4b0805a67b5bb7059303df4835c0..877f96b0488164f8b06ceffc45aa3e1fa5809937 100644
--- a/src/chemistry_io.h
+++ b/src/chemistry_io.h
@@ -26,7 +26,7 @@
 #if defined(CHEMISTRY_NONE)
 #include "./chemistry/none/chemistry_io.h"
 #elif defined(CHEMISTRY_GEAR)
-#include "./chemistry/gear/chemistry_io.h"
+#include "./chemistry/GEAR/chemistry_io.h"
 #elif defined(CHEMISTRY_EAGLE)
 #include "./chemistry/EAGLE/chemistry_io.h"
 #else
diff --git a/src/chemistry_struct.h b/src/chemistry_struct.h
index aa8cfb369679583639cbd381d725a40ff2b62d4b..ffeecb3cef172416075a7413c94de9384bd0e7f7 100644
--- a/src/chemistry_struct.h
+++ b/src/chemistry_struct.h
@@ -31,7 +31,7 @@
 #if defined(CHEMISTRY_NONE)
 #include "./chemistry/none/chemistry_struct.h"
 #elif defined(CHEMISTRY_GEAR)
-#include "./chemistry/gear/chemistry_struct.h"
+#include "./chemistry/GEAR/chemistry_struct.h"
 #elif defined(CHEMISTRY_EAGLE)
 #include "./chemistry/EAGLE/chemistry_struct.h"
 #else