diff --git a/src/chemistry.c b/src/chemistry.c
index 091a0b363d16507894f3dcbba2ca79860f3cbaa9..fb327a5edee678d6eb31dca0ae107beb1b30c83d 100644
--- a/src/chemistry.c
+++ b/src/chemistry.c
@@ -36,7 +36,7 @@
 void chemistry_init(const struct swift_params* parameter_file,
                     const struct unit_system* us,
                     const struct phys_const* phys_const,
-                    struct chemistry_data* data) {
+                    struct chemistry_global_data* data) {
 
   chemistry_init_backend(parameter_file, us, phys_const, data);
 }
@@ -46,9 +46,9 @@ void chemistry_init(const struct swift_params* parameter_file,
  *
  * Calls chemistry_print_backend for the chosen chemistry model.
  *
- * @brief The #chemistry_data containing information about the current model.
+ * @brief The #chemistry_global_data containing information about the current model.
  */
-void chemistry_print(const struct chemistry_data* data) {
+void chemistry_print(const struct chemistry_global_data* data) {
   chemistry_print_backend(data);
 }
 
diff --git a/src/chemistry.h b/src/chemistry.h
index a5cbd77efbaab99e98ca5f031512e7e5bef0a613..d54c0c4801d931c0a530b7b420a97ba8096334c9 100644
--- a/src/chemistry.h
+++ b/src/chemistry.h
@@ -46,9 +46,9 @@
 void chemistry_init(const struct swift_params* parameter_file,
                     const struct unit_system* us,
                     const struct phys_const* phys_const,
-                    struct chemistry_data* data);
+                    struct chemistry_global_data* data);
 
-void chemistry_print(const struct chemistry_data* data);
+void chemistry_print(const struct chemistry_global_data* data);
 
 /* Dump/restore. */
 void chemistry_struct_dump(const struct chemistry_data* chemistry,
diff --git a/src/engine.c b/src/engine.c
index aacaa4a89ccf6898a709e1013b47d2114ce29c2f..b5c9c848db1591db035fed23eb3fd5bc372dd6fd 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -5202,7 +5202,7 @@ void engine_init(
     const struct hydro_props *hydro, struct gravity_props *gravity,
     const struct external_potential *potential,
     const struct cooling_function_data *cooling_func,
-    const struct chemistry_data *chemistry, struct sourceterms *sourceterms) {
+    const struct chemistry_global_data *chemistry, struct sourceterms *sourceterms) {
 
   /* Clean-up everything */
   bzero(e, sizeof(struct engine));
diff --git a/src/engine.h b/src/engine.h
index 4c37aab593fdffc5f68ea16cb83b29ad782debf0..cd1b47f23f4cfb4bb07e3c1dbda69442d1f95738 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -287,7 +287,7 @@ struct engine {
   const struct cooling_function_data *cooling_func;
 
   /* Properties of the chemistry model */
-  const struct chemistry_data *chemistry;
+  const struct chemistry_global_data *chemistry;
 
   /* Properties of source terms */
   struct sourceterms *sourceterms;
@@ -338,7 +338,7 @@ void engine_init(
     const struct hydro_props *hydro, struct gravity_props *gravity,
     const struct external_potential *potential,
     const struct cooling_function_data *cooling_func,
-    const struct chemistry_data *chemistry, struct sourceterms *sourceterms);
+    const struct chemistry_global_data *chemistry, struct sourceterms *sourceterms);
 void engine_config(int restart, struct engine *e,
                    const struct swift_params *params, int nr_nodes, int nodeID,
                    int nr_threads, int with_aff, int verbose,
diff --git a/src/space.c b/src/space.c
index 3da35b64a3f77b4de183c24188d3237d7680f621..05a0719224dfbf1838e2338218e02242381f6e29 100644
--- a/src/space.c
+++ b/src/space.c
@@ -2640,7 +2640,7 @@ void space_synchronize_particle_positions(struct space *s) {
  * Calls chemistry_first_init_part() on all the particles
  */
 void space_first_init_parts(struct space *s,
-                            const struct chemistry_data *chemistry,
+                            const struct chemistry_global_data *chemistry,
                             const struct cooling_function_data *cool_func) {
 
   const size_t nr_parts = s->nr_parts;
diff --git a/src/space.h b/src/space.h
index 76d9369db22740440831fe13eb4d57672e4f9951..b3f7f839651a81f525f7071c25a0aab5ebc067aa 100644
--- a/src/space.h
+++ b/src/space.h
@@ -226,7 +226,7 @@ void space_do_parts_sort();
 void space_do_gparts_sort();
 void space_do_sparts_sort();
 void space_first_init_parts(struct space *s,
-                            const struct chemistry_data *chemistry,
+                            const struct chemistry_global_data *chemistry,
                             const struct cooling_function_data *cool_func);
 void space_first_init_gparts(struct space *s,
                              const struct gravity_props *grav_props);