From d2193a89fa74ce9a797a5ec7958a1dbabf6e679d Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <schaller@strw.leidenuniv.nl>
Date: Wed, 5 Apr 2023 09:48:41 +0000
Subject: [PATCH] Rename the 'COLIBRE' cooling model to 'PS2020'

---
 configure.ac                                  | 23 +++++++------
 doc/Doxyfile.in                               |  2 +-
 examples/Cooling/CoolingBox/coolingBox.yml    |  2 +-
 ...ingTables.sh => getPS2020CoolingTables.sh} |  0
 examples/EAGLE_ICs/EAGLE_100/eagle_100.yml    |  4 +--
 examples/EAGLE_ICs/EAGLE_12/eagle_12.yml      |  4 +--
 examples/EAGLE_ICs/EAGLE_25/eagle_25.yml      |  4 +--
 .../EAGLE_ICs/EAGLE_25_low_res/eagle_25.yml   |  4 +--
 examples/EAGLE_ICs/EAGLE_50/eagle_50.yml      |  4 +--
 .../EAGLE_ICs/EAGLE_50_low_res/eagle_50.yml   |  4 +--
 examples/EAGLE_ICs/EAGLE_6/eagle_6.yml        |  4 +--
 ...ingTables.sh => getPS2020CoolingTables.sh} |  0
 examples/EAGLE_low_z/EAGLE_12/eagle_12.yml    |  4 +--
 examples/EAGLE_low_z/EAGLE_25/eagle_25.yml    |  4 +--
 examples/EAGLE_low_z/EAGLE_50/eagle_50.yml    |  4 +--
 examples/EAGLE_low_z/EAGLE_6/eagle_6.yml      |  4 +--
 .../idealised_cluster_M13.yml                 |  4 +--
 .../IdealisedCluster_M13/run.sh               |  4 +--
 .../idealised_cluster_M135.yml                |  4 +--
 .../IdealisedCluster_M135/run.sh              |  4 +--
 .../idealised_cluster_M14.yml                 |  4 +--
 .../IdealisedCluster_M14/run.sh               |  4 +--
 .../idealised_cluster_M15.yml                 |  4 +--
 .../IdealisedCluster_M15/run.sh               |  4 +--
 ...ingTables.sh => getPS2020CoolingTables.sh} |  0
 ...ingTables.sh => getPS2020CoolingTables.sh} |  0
 .../isolated_galaxy.yml                       |  4 +--
 .../IsolatedGalaxy_feedback/run.sh            |  4 +--
 .../isolated_galaxy.yml                       |  4 +--
 .../IsolatedGalaxy_starformation/run.sh       |  4 +--
 .../small_cosmo_volume.yml                    |  4 +--
 ...ingTables.sh => getPS2020CoolingTables.sh} |  0
 .../SmallCosmoVolume_lightcone/run.sh         |  2 +-
 .../small_cosmo_volume.yml                    |  4 +--
 .../StellarEvolution/stellar_evolution.yml    |  4 +--
 examples/parameter_example.yml                |  4 +--
 src/Makefile.am                               | 18 +++++------
 src/cooling.h                                 |  4 +--
 src/cooling/{COLIBRE => PS2020}/cooling.c     | 32 ++++++++++---------
 src/cooling/{COLIBRE => PS2020}/cooling.h     | 10 +++---
 .../{COLIBRE => PS2020}/cooling_debug.h       |  6 ++--
 src/cooling/{COLIBRE => PS2020}/cooling_io.h  |  8 ++---
 .../{COLIBRE => PS2020}/cooling_properties.h  |  6 ++--
 .../{COLIBRE => PS2020}/cooling_rates.h       | 12 +++----
 .../{COLIBRE => PS2020}/cooling_struct.h      |  6 ++--
 .../{COLIBRE => PS2020}/cooling_subgrid.h     |  6 ++--
 .../{COLIBRE => PS2020}/cooling_tables.c      | 10 +++---
 .../{COLIBRE => PS2020}/cooling_tables.h      |  8 ++---
 src/cooling/{COLIBRE => PS2020}/interpolate.h |  8 ++---
 src/cooling/QLA/cooling.h                     |  2 +-
 src/cooling/QLA/cooling_io.h                  |  2 +-
 src/cooling/QLA/cooling_rates.h               |  2 +-
 src/cooling/QLA/cooling_tables.c              |  2 +-
 src/cooling/QLA/interpolate.h                 |  2 +-
 src/cooling_debug.h                           |  4 +--
 src/cooling_io.h                              |  4 +--
 src/cooling_properties.h                      |  4 +--
 src/cooling_struct.h                          |  4 +--
 src/extra_io/EAGLE/extra.h                    |  6 ++--
 src/lightcone/lightcone_particle_io.c         |  4 +--
 src/lightcone/lightcone_particle_io.h         |  2 +-
 src/star_formation/EAGLE/star_formation.h     |  2 +-
 src/statistics.c                              |  4 +--
 63 files changed, 158 insertions(+), 157 deletions(-)
 rename examples/Cooling/{getColibreCoolingTables.sh => getPS2020CoolingTables.sh} (100%)
 rename examples/EAGLE_ICs/{getColibreCoolingTables.sh => getPS2020CoolingTables.sh} (100%)
 rename examples/IdealisedCluster/{getPS20CoolingTables.sh => getPS2020CoolingTables.sh} (100%)
 rename examples/IsolatedGalaxy/IsolatedGalaxy_feedback/{getPS20CoolingTables.sh => getPS2020CoolingTables.sh} (100%)
 rename examples/SmallCosmoVolume/SmallCosmoVolume_lightcone/{getColibreCoolingTables.sh => getPS2020CoolingTables.sh} (100%)
 rename src/cooling/{COLIBRE => PS2020}/cooling.c (98%)
 rename src/cooling/{COLIBRE => PS2020}/cooling.h (98%)
 rename src/cooling/{COLIBRE => PS2020}/cooling_debug.h (92%)
 rename src/cooling/{COLIBRE => PS2020}/cooling_io.h (98%)
 rename src/cooling/{COLIBRE => PS2020}/cooling_properties.h (97%)
 rename src/cooling/{COLIBRE => PS2020}/cooling_rates.h (99%)
 rename src/cooling/{COLIBRE => PS2020}/cooling_struct.h (91%)
 rename src/cooling/{COLIBRE => PS2020}/cooling_subgrid.h (99%)
 rename src/cooling/{COLIBRE => PS2020}/cooling_tables.c (98%)
 rename src/cooling/{COLIBRE => PS2020}/cooling_tables.h (95%)
 rename src/cooling/{COLIBRE => PS2020}/interpolate.h (99%)

diff --git a/configure.ac b/configure.ac
index 47aa6459bc..e45d075d88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1858,7 +1858,7 @@ case "$with_subgrid" in
 	enable_fof=yes
    ;;
    EAGLE-XL)
-	with_subgrid_cooling=COLIBRE
+	with_subgrid_cooling=PS2020
 	with_subgrid_chemistry=EAGLE
 	with_subgrid_tracers=EAGLE
 	with_subgrid_entropy_floor=EAGLE
@@ -2293,7 +2293,7 @@ fi
 #  Cooling function
 AC_ARG_WITH([cooling],
    [AS_HELP_STRING([--with-cooling=<model>],
-      [cooling function @<:@none, const-du, const-lambda, QLA, EAGLE, COLIBRE, Wiersma, Ploeckinger, grackle_* default: none@:>@.
+      [cooling function @<:@none, const-du, const-lambda, QLA, EAGLE, PS2020, Wiersma, grackle_* default: none@:>@.
       For Grackle, you need to provide the primordial chemistry parameter (e.g. grackle_0)]
    )],
    [with_cooling="$withval"],
@@ -2349,22 +2349,21 @@ case "$with_cooling" in
       AC_DEFINE([COOLING_EAGLE], [1], [Cooling following the EAGLE model (Wiersma+09 tables)])
       with_cooling_name="EAGLE (Wiersma+09 tables)"
    ;;
-   COLIBRE)
-      AC_DEFINE([COOLING_COLIBRE], [1], [Cooling following the COLIBRE model (Ploeckinger+20 tables)])
-      with_cooling_name="COLIBRE (Ploeckinger+20 tables)"
+   PS2020)
+      AC_DEFINE([COOLING_PS2020], [1], [Cooling following the PS2020 model (Ploeckinger+20 tables)])
+      with_cooling_name="PS2020 (Ploeckinger+20 tables)"
    ;;
-   Ploeckinger)
-      AC_DEFINE([COOLING_COLIBRE], [1], [Cooling following the COLIBRE model (Ploeckinger+20 tables)])
-      with_cooling_name="COLIBRE (Ploeckinger+20 tables)"
+   COLIBRE)
+      AC_MSG_ERROR([This cooling model changed name. Please use 'PS2020'.])
    ;;
    *)
       AC_MSG_ERROR([Unknown cooling function: $with_cooling])
    ;;
 esac
 
-if test "$with_cooling" = "EAGLE" || test "$with_cooling" = "COLIBRE"; then
+if test "$with_cooling" = "EAGLE" || test "$with_cooling" = "PS2020"; then
    if test "$with_chemistry" = "none"; then
-      AC_MSG_ERROR([Cannot run with EAGLE or COLIBRE cooling without chemistry. Please pick a chemistry model])
+      AC_MSG_ERROR([Cannot run with EAGLE or PS2020 cooling without chemistry. Please pick a chemistry model])
    fi
 fi
 
@@ -2870,8 +2869,8 @@ AM_CONDITIONAL([HAVEQLAEAGLECOOLING], [test "$with_cooling" = "QLA-EAGLE"])
 # Check if using EAGLE cooling
 AM_CONDITIONAL([HAVEEAGLECOOLING], [test "$with_cooling" = "EAGLE"])
 
-# Check if using COLIBRE cooling
-AM_CONDITIONAL([HAVECOLIBRECOOLING], [test "$with_cooling" = "COLIBRE"])
+# Check if using PS2020 cooling
+AM_CONDITIONAL([HAVEPS2020COOLING], [test "$with_cooling" = "PS2020"])
 
 # Check if using EAGLE feedback
 AM_CONDITIONAL([HAVEEAGLETHERMALFEEDBACK], [test "${with_feedback%-thermal}" = "EAGLE"])
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 33bc6b8abb..8c1c29d90d 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -833,7 +833,7 @@ INPUT                  = @top_srcdir@ \
                          @top_srcdir@/src/cooling/const_lambda \
                          @top_srcdir@/src/cooling/Compton \
                          @top_srcdir@/src/cooling/EAGLE \
-                         @top_srcdir@/src/cooling/COLIBRE \
+                         @top_srcdir@/src/cooling/PS2020 \
                          @top_srcdir@/src/cooling/grackle \
                          @top_srcdir@/src/chemistry/EAGLE \
                          @top_srcdir@/src/chemistry/GEAR \
diff --git a/examples/Cooling/CoolingBox/coolingBox.yml b/examples/Cooling/CoolingBox/coolingBox.yml
index 7f43937814..f2bb1e75d7 100644
--- a/examples/Cooling/CoolingBox/coolingBox.yml
+++ b/examples/Cooling/CoolingBox/coolingBox.yml
@@ -82,7 +82,7 @@ EAGLEChemistry:             # Solar abundances
 GEARPressureFloor:
   jeans_factor: 0.       # Number of particles required to suppose a resolved clump and avoid the pressure floor.
 
-COLIBRECooling:
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
   H_reion_z:               7.5               # Redshift of Hydrogen re-ionization (Planck 2018)
   H_reion_eV_p_H:          2.0
diff --git a/examples/Cooling/getColibreCoolingTables.sh b/examples/Cooling/getPS2020CoolingTables.sh
similarity index 100%
rename from examples/Cooling/getColibreCoolingTables.sh
rename to examples/Cooling/getPS2020CoolingTables.sh
diff --git a/examples/EAGLE_ICs/EAGLE_100/eagle_100.yml b/examples/EAGLE_ICs/EAGLE_100/eagle_100.yml
index 55d97e3376..0fd2c5f589 100644
--- a/examples/EAGLE_ICs/EAGLE_100/eagle_100.yml
+++ b/examples/EAGLE_ICs/EAGLE_100/eagle_100.yml
@@ -130,8 +130,8 @@ EAGLECooling:
   He_reion_z_sigma:        0.5
   He_reion_eV_p_H:         2.0
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
   H_reion_z:               7.5               # Redshift of Hydrogen re-ionization (Planck 2018)
   H_reion_eV_p_H:          2.0
diff --git a/examples/EAGLE_ICs/EAGLE_12/eagle_12.yml b/examples/EAGLE_ICs/EAGLE_12/eagle_12.yml
index d37e62d290..2e33e031e1 100644
--- a/examples/EAGLE_ICs/EAGLE_12/eagle_12.yml
+++ b/examples/EAGLE_ICs/EAGLE_12/eagle_12.yml
@@ -129,8 +129,8 @@ EAGLECooling:
   He_reion_z_sigma:        0.5
   He_reion_eV_p_H:         2.0
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
   H_reion_z:               7.5               # Redshift of Hydrogen re-ionization (Planck 2018)
   H_reion_eV_p_H:          2.0
diff --git a/examples/EAGLE_ICs/EAGLE_25/eagle_25.yml b/examples/EAGLE_ICs/EAGLE_25/eagle_25.yml
index 739f4a2a76..7735507156 100644
--- a/examples/EAGLE_ICs/EAGLE_25/eagle_25.yml
+++ b/examples/EAGLE_ICs/EAGLE_25/eagle_25.yml
@@ -129,8 +129,8 @@ EAGLECooling:
   He_reion_z_sigma:        0.5
   He_reion_eV_p_H:         2.0
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
   H_reion_z:               7.5               # Redshift of Hydrogen re-ionization (Planck 2018)
   H_reion_eV_p_H:          2.0
diff --git a/examples/EAGLE_ICs/EAGLE_25_low_res/eagle_25.yml b/examples/EAGLE_ICs/EAGLE_25_low_res/eagle_25.yml
index 2958bb531f..743fa0d5de 100644
--- a/examples/EAGLE_ICs/EAGLE_25_low_res/eagle_25.yml
+++ b/examples/EAGLE_ICs/EAGLE_25_low_res/eagle_25.yml
@@ -126,8 +126,8 @@ EAGLECooling:
   He_reion_z_sigma:        0.5
   He_reion_eV_p_H:         2.0
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
   H_reion_z:               7.5               # Redshift of Hydrogen re-ionization (Planck 2018)
   H_reion_eV_p_H:          2.0
diff --git a/examples/EAGLE_ICs/EAGLE_50/eagle_50.yml b/examples/EAGLE_ICs/EAGLE_50/eagle_50.yml
index 99120ad01d..76f4546277 100644
--- a/examples/EAGLE_ICs/EAGLE_50/eagle_50.yml
+++ b/examples/EAGLE_ICs/EAGLE_50/eagle_50.yml
@@ -127,8 +127,8 @@ EAGLECooling:
   He_reion_z_sigma:        0.5
   He_reion_eV_p_H:         2.0
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
   H_reion_z:               7.5               # Redshift of Hydrogen re-ionization (Planck 2018)
   H_reion_eV_p_H:          2.0
diff --git a/examples/EAGLE_ICs/EAGLE_50_low_res/eagle_50.yml b/examples/EAGLE_ICs/EAGLE_50_low_res/eagle_50.yml
index f6a3ec3049..97af6a1f60 100644
--- a/examples/EAGLE_ICs/EAGLE_50_low_res/eagle_50.yml
+++ b/examples/EAGLE_ICs/EAGLE_50_low_res/eagle_50.yml
@@ -126,8 +126,8 @@ EAGLECooling:
   He_reion_z_sigma:        0.5
   He_reion_eV_p_H:         2.0
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
   H_reion_z:               7.5               # Redshift of Hydrogen re-ionization (Planck 2018)
   H_reion_eV_p_H:          2.0
diff --git a/examples/EAGLE_ICs/EAGLE_6/eagle_6.yml b/examples/EAGLE_ICs/EAGLE_6/eagle_6.yml
index 5fdc200155..4b8446c30d 100644
--- a/examples/EAGLE_ICs/EAGLE_6/eagle_6.yml
+++ b/examples/EAGLE_ICs/EAGLE_6/eagle_6.yml
@@ -129,8 +129,8 @@ EAGLECooling:
   He_reion_z_sigma:        0.5
   He_reion_eV_p_H:         2.0
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
   H_reion_z:               7.5               # Redshift of Hydrogen re-ionization (Planck 2018)
   H_reion_eV_p_H:          2.0
diff --git a/examples/EAGLE_ICs/getColibreCoolingTables.sh b/examples/EAGLE_ICs/getPS2020CoolingTables.sh
similarity index 100%
rename from examples/EAGLE_ICs/getColibreCoolingTables.sh
rename to examples/EAGLE_ICs/getPS2020CoolingTables.sh
diff --git a/examples/EAGLE_low_z/EAGLE_12/eagle_12.yml b/examples/EAGLE_low_z/EAGLE_12/eagle_12.yml
index 4c0a6496de..96fe8efe01 100644
--- a/examples/EAGLE_low_z/EAGLE_12/eagle_12.yml
+++ b/examples/EAGLE_low_z/EAGLE_12/eagle_12.yml
@@ -112,8 +112,8 @@ EAGLECooling:
   He_reion_z_sigma:        0.5
   He_reion_eV_p_H:         2.0
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5
   H_reion_z:               11.5
   H_reion_eV_p_H:          2.0
diff --git a/examples/EAGLE_low_z/EAGLE_25/eagle_25.yml b/examples/EAGLE_low_z/EAGLE_25/eagle_25.yml
index 03ab1520be..8ba338df28 100644
--- a/examples/EAGLE_low_z/EAGLE_25/eagle_25.yml
+++ b/examples/EAGLE_low_z/EAGLE_25/eagle_25.yml
@@ -120,8 +120,8 @@ EAGLECooling:
   He_reion_z_sigma:        0.5
   He_reion_eV_p_H:         2.0
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5
   H_reion_z:               11.5
   H_reion_eV_p_H:          2.0
diff --git a/examples/EAGLE_low_z/EAGLE_50/eagle_50.yml b/examples/EAGLE_low_z/EAGLE_50/eagle_50.yml
index d93d2d8cef..e59d92389a 100644
--- a/examples/EAGLE_low_z/EAGLE_50/eagle_50.yml
+++ b/examples/EAGLE_low_z/EAGLE_50/eagle_50.yml
@@ -111,8 +111,8 @@ EAGLECooling:
   He_reion_z_sigma:        0.5
   He_reion_eV_p_H:         2.0
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5
   H_reion_z:               11.5
   H_reion_eV_p_H:          2.0
diff --git a/examples/EAGLE_low_z/EAGLE_6/eagle_6.yml b/examples/EAGLE_low_z/EAGLE_6/eagle_6.yml
index 963821e177..a77e1bb827 100644
--- a/examples/EAGLE_low_z/EAGLE_6/eagle_6.yml
+++ b/examples/EAGLE_low_z/EAGLE_6/eagle_6.yml
@@ -123,8 +123,8 @@ EAGLECooling:
   He_reion_z_sigma:        0.5
   He_reion_eV_p_H:         2.0
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5
   H_reion_z:               11.5
   H_reion_eV_p_H:          2.0
diff --git a/examples/IdealisedCluster/IdealisedCluster_M13/idealised_cluster_M13.yml b/examples/IdealisedCluster/IdealisedCluster_M13/idealised_cluster_M13.yml
index 2705555943..501961c070 100644
--- a/examples/IdealisedCluster/IdealisedCluster_M13/idealised_cluster_M13.yml
+++ b/examples/IdealisedCluster/IdealisedCluster_M13/idealised_cluster_M13.yml
@@ -100,8 +100,8 @@ EAGLEChemistry:
   init_abundance_Silicon:   0.000222    # Inital fraction of particle mass in Silicon
   init_abundance_Iron:      0.000431    # Inital fraction of particle mass in Iron
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
   H_reion_z:               7.5               # Redshift of Hydrogen re-ionization (Planck 2018)
   H_reion_eV_p_H:          2.0
diff --git a/examples/IdealisedCluster/IdealisedCluster_M13/run.sh b/examples/IdealisedCluster/IdealisedCluster_M13/run.sh
index 6a777d4e3e..b61378c979 100755
--- a/examples/IdealisedCluster/IdealisedCluster_M13/run.sh
+++ b/examples/IdealisedCluster/IdealisedCluster_M13/run.sh
@@ -8,8 +8,8 @@ fi
 
 if [ ! -e UV_dust1_CR1_G1_shield1.hdf5 ]
 then
-    echo "Fetching PS20 cooling tables for the isolated galaxy example..."
-    ../getPS20CoolingTables.sh
+    echo "Fetching PS2020 cooling tables for the isolated galaxy example..."
+    ../getPS2020CoolingTables.sh
 fi
 
 if [ ! -e yieldtables ] 
diff --git a/examples/IdealisedCluster/IdealisedCluster_M135/idealised_cluster_M135.yml b/examples/IdealisedCluster/IdealisedCluster_M135/idealised_cluster_M135.yml
index 40697364da..0ebd235b25 100644
--- a/examples/IdealisedCluster/IdealisedCluster_M135/idealised_cluster_M135.yml
+++ b/examples/IdealisedCluster/IdealisedCluster_M135/idealised_cluster_M135.yml
@@ -100,8 +100,8 @@ EAGLEChemistry:
   init_abundance_Silicon:   0.000222    # Inital fraction of particle mass in Silicon
   init_abundance_Iron:      0.000431    # Inital fraction of particle mass in Iron
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
   H_reion_z:               7.5               # Redshift of Hydrogen re-ionization (Planck 2018)
   H_reion_eV_p_H:          2.0
diff --git a/examples/IdealisedCluster/IdealisedCluster_M135/run.sh b/examples/IdealisedCluster/IdealisedCluster_M135/run.sh
index 2310894992..8518427416 100755
--- a/examples/IdealisedCluster/IdealisedCluster_M135/run.sh
+++ b/examples/IdealisedCluster/IdealisedCluster_M135/run.sh
@@ -8,8 +8,8 @@ fi
 
 if [ ! -e UV_dust1_CR1_G1_shield1.hdf5 ]
 then
-    echo "Fetching PS20 cooling tables for the isolated galaxy example..."
-    ../getPS20CoolingTables.sh
+    echo "Fetching PS2020 cooling tables for the isolated galaxy example..."
+    ../getPS2020CoolingTables.sh
 fi
 
 if [ ! -e yieldtables ] 
diff --git a/examples/IdealisedCluster/IdealisedCluster_M14/idealised_cluster_M14.yml b/examples/IdealisedCluster/IdealisedCluster_M14/idealised_cluster_M14.yml
index a6f4be54da..742a9e50a4 100644
--- a/examples/IdealisedCluster/IdealisedCluster_M14/idealised_cluster_M14.yml
+++ b/examples/IdealisedCluster/IdealisedCluster_M14/idealised_cluster_M14.yml
@@ -100,8 +100,8 @@ EAGLEChemistry:
   init_abundance_Silicon:   0.000222    # Inital fraction of particle mass in Silicon
   init_abundance_Iron:      0.000431    # Inital fraction of particle mass in Iron
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
   H_reion_z:               7.5               # Redshift of Hydrogen re-ionization (Planck 2018)
   H_reion_eV_p_H:          2.0
diff --git a/examples/IdealisedCluster/IdealisedCluster_M14/run.sh b/examples/IdealisedCluster/IdealisedCluster_M14/run.sh
index 38500cd97a..fc7b6b1e11 100755
--- a/examples/IdealisedCluster/IdealisedCluster_M14/run.sh
+++ b/examples/IdealisedCluster/IdealisedCluster_M14/run.sh
@@ -8,8 +8,8 @@ fi
 
 if [ ! -e UV_dust1_CR1_G1_shield1.hdf5 ]
 then
-    echo "Fetching PS20 cooling tables for the isolated galaxy example..."
-    ../getPS20CoolingTables.sh
+    echo "Fetching PS2020 cooling tables for the isolated galaxy example..."
+    ../getPS2020CoolingTables.sh
 fi
 
 if [ ! -e yieldtables ] 
diff --git a/examples/IdealisedCluster/IdealisedCluster_M15/idealised_cluster_M15.yml b/examples/IdealisedCluster/IdealisedCluster_M15/idealised_cluster_M15.yml
index 40730bbac3..b5b69a1f81 100644
--- a/examples/IdealisedCluster/IdealisedCluster_M15/idealised_cluster_M15.yml
+++ b/examples/IdealisedCluster/IdealisedCluster_M15/idealised_cluster_M15.yml
@@ -100,8 +100,8 @@ EAGLEChemistry:
   init_abundance_Silicon:   0.000222    # Inital fraction of particle mass in Silicon
   init_abundance_Iron:      0.000431    # Inital fraction of particle mass in Iron
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
   H_reion_z:               7.5               # Redshift of Hydrogen re-ionization (Planck 2018)
   H_reion_eV_p_H:          2.0
diff --git a/examples/IdealisedCluster/IdealisedCluster_M15/run.sh b/examples/IdealisedCluster/IdealisedCluster_M15/run.sh
index c791af80b0..9b71b7d5fd 100755
--- a/examples/IdealisedCluster/IdealisedCluster_M15/run.sh
+++ b/examples/IdealisedCluster/IdealisedCluster_M15/run.sh
@@ -8,8 +8,8 @@ fi
 
 if [ ! -e UV_dust1_CR1_G1_shield1.hdf5 ]
 then
-    echo "Fetching PS20 cooling tables for the isolated galaxy example..."
-    ../getPS20CoolingTables.sh
+    echo "Fetching PS2020 cooling tables for the isolated galaxy example..."
+    ../getPS2020CoolingTables.sh
 fi
 
 if [ ! -e yieldtables ] 
diff --git a/examples/IdealisedCluster/getPS20CoolingTables.sh b/examples/IdealisedCluster/getPS2020CoolingTables.sh
similarity index 100%
rename from examples/IdealisedCluster/getPS20CoolingTables.sh
rename to examples/IdealisedCluster/getPS2020CoolingTables.sh
diff --git a/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/getPS20CoolingTables.sh b/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/getPS2020CoolingTables.sh
similarity index 100%
rename from examples/IsolatedGalaxy/IsolatedGalaxy_feedback/getPS20CoolingTables.sh
rename to examples/IsolatedGalaxy/IsolatedGalaxy_feedback/getPS2020CoolingTables.sh
diff --git a/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml b/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml
index c14d46ed5d..8717af63bd 100644
--- a/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml
+++ b/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml
@@ -75,8 +75,8 @@ EAGLECooling:
   He_reion_z_sigma:        0.5               # Spread in redshift of the  Helium re-ionization Gaussian
   He_reion_eV_p_H:         2.0               # Energy inject by Helium re-ionization in electron-volt per Hydrogen atom
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the Ploeckinger+20 cooling tables
   H_reion_z:               7.5               # Redshift of Hydrogen re-ionization (Planck 2018)
   H_reion_eV_p_H:          2.0
diff --git a/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/run.sh b/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/run.sh
index 702e6a2c3f..6931897b2c 100755
--- a/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/run.sh
+++ b/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/run.sh
@@ -14,8 +14,8 @@ fi
 
 if [ ! -e UV_dust1_CR1_G1_shield1.hdf5 ]
 then
-    echo "Fetching PS20 cooling tables for the isolated galaxy example..."
-    ./getPS20CoolingTables.sh
+    echo "Fetching PS2020 cooling tables for the isolated galaxy example..."
+    ./getPS2020CoolingTables.sh
 fi
 
 if [ ! -e yieldtables ] 
diff --git a/examples/IsolatedGalaxy/IsolatedGalaxy_starformation/isolated_galaxy.yml b/examples/IsolatedGalaxy/IsolatedGalaxy_starformation/isolated_galaxy.yml
index fb8936126d..5872bc986a 100644
--- a/examples/IsolatedGalaxy/IsolatedGalaxy_starformation/isolated_galaxy.yml
+++ b/examples/IsolatedGalaxy/IsolatedGalaxy_starformation/isolated_galaxy.yml
@@ -68,8 +68,8 @@ EAGLECooling:
   He_reion_z_sigma:        0.5               # Spread in redshift of the  Helium re-ionization Gaussian
   He_reion_eV_p_H:         2.0               # Energy inject by Helium re-ionization in electron-volt per Hydrogen atom
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the Ploeckinger+20 cooling tables
   H_reion_z:               7.5               # Redshift of Hydrogen re-ionization (Planck 2018)
   H_reion_eV_p_H:          2.0
diff --git a/examples/IsolatedGalaxy/IsolatedGalaxy_starformation/run.sh b/examples/IsolatedGalaxy/IsolatedGalaxy_starformation/run.sh
index 842caee52f..f5f9393d71 100755
--- a/examples/IsolatedGalaxy/IsolatedGalaxy_starformation/run.sh
+++ b/examples/IsolatedGalaxy/IsolatedGalaxy_starformation/run.sh
@@ -14,8 +14,8 @@ fi
 
 if [ ! -e UV_dust1_CR1_G1_shield1.hdf5 ]
 then
-    echo "Fetching PS20 cooling tables for the isolated galaxy example..."
-    ./getPS20CoolingTables.sh
+    echo "Fetching PS2020 cooling tables for the isolated galaxy example..."
+    ./getPS2020CoolingTables.sh
 fi
 
 if [ ! -e yieldtables ] 
diff --git a/examples/SmallCosmoVolume/SmallCosmoVolume_cooling/small_cosmo_volume.yml b/examples/SmallCosmoVolume/SmallCosmoVolume_cooling/small_cosmo_volume.yml
index c308cbd538..b1839de14b 100644
--- a/examples/SmallCosmoVolume/SmallCosmoVolume_cooling/small_cosmo_volume.yml
+++ b/examples/SmallCosmoVolume/SmallCosmoVolume_cooling/small_cosmo_volume.yml
@@ -78,8 +78,8 @@ EAGLECooling:
   He_reion_z_sigma:        0.5
   He_reion_eV_p_H:         2.0
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5
   H_reion_z:               11.5
   H_reion_eV_p_H:          2.0
diff --git a/examples/SmallCosmoVolume/SmallCosmoVolume_lightcone/getColibreCoolingTables.sh b/examples/SmallCosmoVolume/SmallCosmoVolume_lightcone/getPS2020CoolingTables.sh
similarity index 100%
rename from examples/SmallCosmoVolume/SmallCosmoVolume_lightcone/getColibreCoolingTables.sh
rename to examples/SmallCosmoVolume/SmallCosmoVolume_lightcone/getPS2020CoolingTables.sh
diff --git a/examples/SmallCosmoVolume/SmallCosmoVolume_lightcone/run.sh b/examples/SmallCosmoVolume/SmallCosmoVolume_lightcone/run.sh
index 314d173f7c..64fca85958 100755
--- a/examples/SmallCosmoVolume/SmallCosmoVolume_lightcone/run.sh
+++ b/examples/SmallCosmoVolume/SmallCosmoVolume_lightcone/run.sh
@@ -10,7 +10,7 @@ fi
 if [ ! -e UV_dust1_CR1_G1_shield1.hdf5 ]
 then
     echo "Fetching cooling tables for the small cosmological volume example..."
-    ./getColibreCoolingTables.sh
+    ./getPS2020CoolingTables.sh
 fi
 
 if [ ! -e photometry ]
diff --git a/examples/SmallCosmoVolume/SmallCosmoVolume_lightcone/small_cosmo_volume.yml b/examples/SmallCosmoVolume/SmallCosmoVolume_lightcone/small_cosmo_volume.yml
index 9bf9901583..5bd006dc97 100644
--- a/examples/SmallCosmoVolume/SmallCosmoVolume_lightcone/small_cosmo_volume.yml
+++ b/examples/SmallCosmoVolume/SmallCosmoVolume_lightcone/small_cosmo_volume.yml
@@ -109,8 +109,8 @@ EAGLECooling:
   He_reion_z_sigma:        0.5
   He_reion_eV_p_H:         2.0
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
   H_reion_z:               7.5               # Redshift of Hydrogen re-ionization (Planck 2018)
   H_reion_eV_p_H:          2.0
diff --git a/examples/SubgridTests/StellarEvolution/stellar_evolution.yml b/examples/SubgridTests/StellarEvolution/stellar_evolution.yml
index dfef34e759..8fa7c81a13 100644
--- a/examples/SubgridTests/StellarEvolution/stellar_evolution.yml
+++ b/examples/SubgridTests/StellarEvolution/stellar_evolution.yml
@@ -79,8 +79,8 @@ EAGLECooling:
   He_reion_z_sigma:        0.5               # Spread in redshift of the  Helium re-ionization Gaussian
   He_reion_eV_p_H:         2.0               # Energy inject by Helium re-ionization in electron-volt per Hydrogen atom
 
-# COLIBRE cooling parameters
-COLIBRECooling:
+# PS2020 cooling parameters
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
   H_reion_z:               7.5               # Redshift of Hydrogen re-ionization (Planck 2018)
   H_reion_eV_p_H:          2.0
diff --git a/examples/parameter_example.yml b/examples/parameter_example.yml
index 976115b264..3f2a8d0627 100644
--- a/examples/parameter_example.yml
+++ b/examples/parameter_example.yml
@@ -479,8 +479,8 @@ QLACooling:
   He_reion_eV_p_H:         2.0               # Energy inject by Helium re-ionization in electron-volt per Hydrogen atom
   rapid_cooling_threshold: 0.333333          # Switch to rapid cooling regime for dt / t_cool above this threshold.
 
-# COLIBRE cooling parameters (EAGLE-XL)
-COLIBRECooling:
+# PS2020 cooling parameters (EAGLE-XL)
+PS2020Cooling:
   dir_name:                ./UV_dust1_CR1_G1_shield1.hdf5 # Location of the cooling tables
   H_reion_z:               7.5               # Redshift of Hydrogen re-ionization (Planck 2018)
   H_reion_eV_p_H:          2.0               # Energy inject by Hydrogen re-ionization in electron-volt per Hydrogen atom
diff --git a/src/Makefile.am b/src/Makefile.am
index 80a24fd178..85437067b1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -101,10 +101,10 @@ if HAVEEAGLECOOLING
 EAGLE_COOLING_SOURCES += cooling/EAGLE/cooling.c cooling/EAGLE/cooling_tables.c
 endif
 
-# source files for COLIBRE cooling
-COLIBRE_COOLING_SOURCES =
-if HAVECOLIBRECOOLING
-COLIBRE_COOLING_SOURCES += cooling/COLIBRE/cooling.c cooling/COLIBRE/cooling_tables.c
+# source files for PS2020 cooling
+PS2020_COOLING_SOURCES =
+if HAVEPS2020COOLING
+PS2020_COOLING_SOURCES += cooling/PS2020/cooling.c cooling/PS2020/cooling_tables.c
 endif
 
 # source files for EAGLE feedback
@@ -185,7 +185,7 @@ AM_SOURCES += $(EAGLE_EXTRA_IO_SOURCES)
 AM_SOURCES += $(QLA_COOLING_SOURCES) $(QLA_EAGLE_COOLING_SOURCES) 
 AM_SOURCES += $(EAGLE_COOLING_SOURCES) $(EAGLE_FEEDBACK_SOURCES) 
 AM_SOURCES += $(GRACKLE_COOLING_SOURCES) $(GEAR_FEEDBACK_SOURCES) 
-AM_SOURCES += $(COLIBRE_COOLING_SOURCES)
+AM_SOURCES += $(PS2020_COOLING_SOURCES)
 AM_SOURCES += $(SPHM1RT_RT_SOURCES)
 AM_SOURCES += $(GEAR_RT_SOURCES)
 
@@ -393,10 +393,10 @@ nobase_noinst_HEADERS += cooling/QLA_EAGLE/cooling_properties.h cooling/QLA_EAGL
 nobase_noinst_HEADERS += cooling/QLA/cooling.h cooling/QLA/cooling_struct.h cooling/QLA/cooling_tables.h 
 nobase_noinst_HEADERS += cooling/QLA/cooling_io.h cooling/QLA/interpolate.h cooling/QLA/cooling_rates.h 
 nobase_noinst_HEADERS += cooling/QLA/cooling_properties.h cooling/QLA/cooling_debug.h
-nobase_noinst_HEADERS += cooling/COLIBRE/cooling.h cooling/COLIBRE/cooling_struct.h cooling/COLIBRE/cooling_subgrid.h 
-nobase_noinst_HEADERS += cooling/COLIBRE/cooling_io.h cooling/COLIBRE/interpolate.h cooling/COLIBRE/cooling_rates.h 
-nobase_noinst_HEADERS += cooling/COLIBRE/cooling_tables.h cooling/COLIBRE/cooling_subgrid.h
-nobase_noinst_HEADERS += cooling/COLIBRE/cooling_properties.h cooling/COLIBRE/cooling_debug.h
+nobase_noinst_HEADERS += cooling/PS2020/cooling.h cooling/PS2020/cooling_struct.h cooling/PS2020/cooling_subgrid.h 
+nobase_noinst_HEADERS += cooling/PS2020/cooling_io.h cooling/PS2020/interpolate.h cooling/PS2020/cooling_rates.h 
+nobase_noinst_HEADERS += cooling/PS2020/cooling_tables.h cooling/PS2020/cooling_subgrid.h
+nobase_noinst_HEADERS += cooling/PS2020/cooling_properties.h cooling/PS2020/cooling_debug.h
 nobase_noinst_HEADERS += chemistry/none/chemistry.h 
 nobase_noinst_HEADERS += chemistry/none/chemistry_io.h 
 nobase_noinst_HEADERS += chemistry/none/chemistry_csds.h
diff --git a/src/cooling.h b/src/cooling.h
index 747de00f6f..04358b7a4d 100644
--- a/src/cooling.h
+++ b/src/cooling.h
@@ -51,8 +51,8 @@
 #include "./cooling/QLA_EAGLE/cooling.h"
 #elif defined(COOLING_EAGLE)
 #include "./cooling/EAGLE/cooling.h"
-#elif defined(COOLING_COLIBRE)
-#include "./cooling/COLIBRE/cooling.h"
+#elif defined(COOLING_PS2020)
+#include "./cooling/PS2020/cooling.h"
 #else
 #error "Invalid choice of cooling function."
 #endif
diff --git a/src/cooling/COLIBRE/cooling.c b/src/cooling/PS2020/cooling.c
similarity index 98%
rename from src/cooling/COLIBRE/cooling.c
rename to src/cooling/PS2020/cooling.c
index a1739db908..3292841019 100644
--- a/src/cooling/COLIBRE/cooling.c
+++ b/src/cooling/PS2020/cooling.c
@@ -17,8 +17,8 @@
  *
  ******************************************************************************/
 /**
- * @file src/cooling/COLIBRE/cooling.c
- * @brief COLIBRE cooling functions
+ * @file src/cooling/PS2020/cooling.c
+ * @brief PS2020 cooling functions
  */
 
 /* Config parameters. */
@@ -1439,7 +1439,7 @@ void cooling_init_backend(struct swift_params *parameter_file,
 
   /* read some parameters */
 
-  parser_get_param_string(parameter_file, "COLIBRECooling:dir_name",
+  parser_get_param_string(parameter_file, "PS2020Cooling:dir_name",
                           cooling->cooling_table_path);
 
   /* Despite the names, the values of H_reion_heat_cgs and He_reion_heat_cgs
@@ -1448,25 +1448,25 @@ void cooling_init_backend(struct swift_params *parameter_file,
 
   cooling->H_reion_done = 0;
   cooling->H_reion_z =
-      parser_get_param_float(parameter_file, "COLIBRECooling:H_reion_z");
+      parser_get_param_float(parameter_file, "PS2020Cooling:H_reion_z");
   cooling->H_reion_heat_cgs =
-      parser_get_param_float(parameter_file, "COLIBRECooling:H_reion_eV_p_H");
-  cooling->He_reion_z_centre = parser_get_param_float(
-      parameter_file, "COLIBRECooling:He_reion_z_centre");
+      parser_get_param_float(parameter_file, "PS2020Cooling:H_reion_eV_p_H");
+  cooling->He_reion_z_centre =
+      parser_get_param_float(parameter_file, "PS2020Cooling:He_reion_z_centre");
   cooling->He_reion_z_sigma =
-      parser_get_param_float(parameter_file, "COLIBRECooling:He_reion_z_sigma");
+      parser_get_param_float(parameter_file, "PS2020Cooling:He_reion_z_sigma");
   cooling->He_reion_heat_cgs =
-      parser_get_param_float(parameter_file, "COLIBRECooling:He_reion_eV_p_H");
+      parser_get_param_float(parameter_file, "PS2020Cooling:He_reion_eV_p_H");
 
   /* Properties for the subgrid properties model ---------------------------- */
   cooling->dlogT_EOS = parser_get_param_float(
-      parameter_file, "COLIBRECooling:delta_logTEOS_subgrid_properties");
+      parameter_file, "PS2020Cooling:delta_logTEOS_subgrid_properties");
 
   /* Optional parameters to correct the abundances */
   cooling->Ca_over_Si_ratio_in_solar = parser_get_opt_param_float(
-      parameter_file, "COLIBRECooling:Ca_over_Si_in_solar", 1.f);
+      parameter_file, "PS2020Cooling:Ca_over_Si_in_solar", 1.f);
   cooling->S_over_Si_ratio_in_solar = parser_get_opt_param_float(
-      parameter_file, "COLIBRECooling:S_over_Si_in_solar", 1.f);
+      parameter_file, "PS2020Cooling:S_over_Si_in_solar", 1.f);
 
   /* Convert H_reion_heat_cgs and He_reion_heat_cgs to cgs
    * (units used internally by the cooling routines). This is done by
@@ -1511,7 +1511,7 @@ void cooling_init_backend(struct swift_params *parameter_file,
   /* Get the minimal temperature allowed */
   cooling->Tmin = hydro_props->minimal_temperature;
   if (cooling->Tmin < 10.)
-    error("COLIBRE cooling cannot handle a minimal temperature below 10 K");
+    error("PS2020 cooling cannot handle a minimal temperature below 10 K");
 
   /* Recover the minimal energy allowed (in internal units) */
   const double u_min = hydro_props->minimal_internal_energy;
@@ -1563,7 +1563,7 @@ void cooling_init_backend(struct swift_params *parameter_file,
    * we never use this scheme (i.e. always drift
    * the internal energies). */
   cooling->rapid_cooling_threshold = parser_get_param_double(
-      parameter_file, "COLIBRECooling:rapid_cooling_threshold");
+      parameter_file, "PS2020Cooling:rapid_cooling_threshold");
 
   /* Finally, read the tables */
   read_cooling_header(cooling);
@@ -1593,7 +1593,9 @@ void cooling_restore_tables(struct cooling_function_data *cooling,
  */
 void cooling_print_backend(const struct cooling_function_data *cooling) {
 
-  message("Cooling function is 'COLIBRE'.");
+  message(
+      "Cooling function is 'PS2020' i.e. using the tables of "
+      "Ploeckinger&Schaye (2020).");
 }
 
 /**
diff --git a/src/cooling/COLIBRE/cooling.h b/src/cooling/PS2020/cooling.h
similarity index 98%
rename from src/cooling/COLIBRE/cooling.h
rename to src/cooling/PS2020/cooling.h
index e7dba14eff..1bacfaa86a 100644
--- a/src/cooling/COLIBRE/cooling.h
+++ b/src/cooling/PS2020/cooling.h
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
-#ifndef SWIFT_COOLING_COLIBRE_H
-#define SWIFT_COOLING_COLIBRE_H
+#ifndef SWIFT_COOLING_PS2020_H
+#define SWIFT_COOLING_PS2020_H
 
 /**
- * @file src/cooling/COLIBRE/cooling.h
- * @brief COLIBRE cooling function declarations
+ * @file src/cooling/PS2020/cooling.h
+ * @brief PS2020 cooling function declarations
  */
 
 /* Local includes. */
@@ -216,4 +216,4 @@ __attribute__((always_inline)) INLINE static void cooling_convert_quantities(
 __attribute__((always_inline)) INLINE static void
 cooling_update_feedback_particle(struct xpart *restrict xp) {}
 
-#endif /* SWIFT_COOLING_COLIBRE_H */
+#endif /* SWIFT_COOLING_PS2020_H */
diff --git a/src/cooling/COLIBRE/cooling_debug.h b/src/cooling/PS2020/cooling_debug.h
similarity index 92%
rename from src/cooling/COLIBRE/cooling_debug.h
rename to src/cooling/PS2020/cooling_debug.h
index 4e4beef779..e049f7fc32 100644
--- a/src/cooling/COLIBRE/cooling_debug.h
+++ b/src/cooling/PS2020/cooling_debug.h
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
-#ifndef SWIFT_COOLING_COLIBRE_DEBUG_H
-#define SWIFT_COOLING_COLIBRE_DEBUG_H
+#ifndef SWIFT_COOLING_PS2020_DEBUG_H
+#define SWIFT_COOLING_PS2020_DEBUG_H
 
 __attribute__((always_inline)) INLINE static void cooling_debug_particle(
     const struct part* p, const struct xpart* xp) {
@@ -32,4 +32,4 @@ __attribute__((always_inline)) INLINE static void cooling_debug_particle(
   }
 }
 
-#endif /* SWIFT_COOLING_COLIBRE_DEBUG_H */
+#endif /* SWIFT_COOLING_PS2020_DEBUG_H */
diff --git a/src/cooling/COLIBRE/cooling_io.h b/src/cooling/PS2020/cooling_io.h
similarity index 98%
rename from src/cooling/COLIBRE/cooling_io.h
rename to src/cooling/PS2020/cooling_io.h
index ddeb56b851..dc088df626 100644
--- a/src/cooling/COLIBRE/cooling_io.h
+++ b/src/cooling/PS2020/cooling_io.h
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
-#ifndef SWIFT_COOLING_COLIBRE_IO_H
-#define SWIFT_COOLING_COLIBRE_IO_H
+#ifndef SWIFT_COOLING_PS2020_IO_H
+#define SWIFT_COOLING_PS2020_IO_H
 
 /* Config parameters. */
 #include <config.h>
@@ -40,7 +40,7 @@ __attribute__((always_inline)) INLINE static void cooling_write_flavour(
     hid_t h_grp, hid_t h_grp_columns,
     const struct cooling_function_data* cooling) {
 
-  io_write_attribute_s(h_grp, "Cooling Model", "COLIBRE");
+  io_write_attribute_s(h_grp, "Cooling Model", "PS2020");
 
   const int number_of_species = 3;
   const int species_name_length = 4;
@@ -237,4 +237,4 @@ __attribute__((always_inline)) INLINE static int cooling_write_particles(
   return 8;
 }
 
-#endif /* SWIFT_COOLING_COLIBRE_IO_H */
+#endif /* SWIFT_COOLING_PS2020_IO_H */
diff --git a/src/cooling/COLIBRE/cooling_properties.h b/src/cooling/PS2020/cooling_properties.h
similarity index 97%
rename from src/cooling/COLIBRE/cooling_properties.h
rename to src/cooling/PS2020/cooling_properties.h
index 4dd44a7e92..6fa0a8c81f 100644
--- a/src/cooling/COLIBRE/cooling_properties.h
+++ b/src/cooling/PS2020/cooling_properties.h
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
-#ifndef SWIFT_COOLING_PROPERTIES_COLIBRE_H
-#define SWIFT_COOLING_PROPERTIES_COLIBRE_H
+#ifndef SWIFT_COOLING_PROPERTIES_PS2020_H
+#define SWIFT_COOLING_PROPERTIES_PS2020_H
 
 #define colibre_table_path_name_length 500
 
@@ -210,4 +210,4 @@ enum cooling_subgrid_properties {
   cooling_compute_subgrid_H2_fraction
 };
 
-#endif /* SWIFT_COOLING_PROPERTIES_COLIBRE_H */
+#endif /* SWIFT_COOLING_PROPERTIES_PS2020_H */
diff --git a/src/cooling/COLIBRE/cooling_rates.h b/src/cooling/PS2020/cooling_rates.h
similarity index 99%
rename from src/cooling/COLIBRE/cooling_rates.h
rename to src/cooling/PS2020/cooling_rates.h
index e5f56b7d28..d1d14ef321 100644
--- a/src/cooling/COLIBRE/cooling_rates.h
+++ b/src/cooling/PS2020/cooling_rates.h
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
-#ifndef SWIFT_COLIBRE_COOLING_RATES_H
-#define SWIFT_COLIBRE_COOLING_RATES_H
+#ifndef SWIFT_PS2020_COOLING_RATES_H
+#define SWIFT_PS2020_COOLING_RATES_H
 
 /* Config parameters. */
 #include <config.h>
@@ -80,7 +80,7 @@ __attribute__((always_inline)) INLINE int element_from_table_to_code(
  *
  * The solar abundances are taken from the tables themselves.
  *
- * The COLIBRE chemistry model does not track S and Ca. We assume
+ * The PS2020 chemistry model does not track S and Ca. We assume
  * that their abundance with respect to solar is the same as
  * the ratio for Si.
  *
@@ -527,7 +527,7 @@ INLINE static float colibre_electron_density_temperature(
  * @param iheat heating channel to be used
  *
  * Throughout the code: onlyicool = onlyiheat = icool = iheat = 0
- * These are only used for testing: examples/CoolingRates/CoolingRatesCOLIBRE
+ * These are only used for testing: examples/CoolingRates/CoolingRatesPS2020
  */
 INLINE static double colibre_cooling_rate(
     const double log_u_cgs, const double redshift, const double n_H_cgs,
@@ -676,7 +676,7 @@ INLINE static double colibre_cooling_rate(
  * @param iheat heating channel to be used
  *
  * Throughout the code: onlyicool = onlyiheat = icool = iheat = 0
- * These are only used for testing: examples/CoolingRates/CoolingRatesCOLIBRE
+ * These are only used for testing: examples/CoolingRates/CoolingRatesPS2020
  */
 INLINE static double colibre_cooling_rate_temperature(
     const double log_T_cgs, const double redshift, const double n_H_cgs,
@@ -789,4 +789,4 @@ INLINE static double colibre_cooling_rate_temperature(
   return heating_rate - cooling_rate - Compton_cooling_rate;
 }
 
-#endif /* SWIFT_COLIBRE_COOLING_RATES_H */
+#endif /* SWIFT_PS2020_COOLING_RATES_H */
diff --git a/src/cooling/COLIBRE/cooling_struct.h b/src/cooling/PS2020/cooling_struct.h
similarity index 91%
rename from src/cooling/COLIBRE/cooling_struct.h
rename to src/cooling/PS2020/cooling_struct.h
index a151ea505c..f948faec7d 100644
--- a/src/cooling/COLIBRE/cooling_struct.h
+++ b/src/cooling/PS2020/cooling_struct.h
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
-#ifndef SWIFT_COOLING_STRUCT_COLIBRE_H
-#define SWIFT_COOLING_STRUCT_COLIBRE_H
+#ifndef SWIFT_COOLING_STRUCT_PS2020_H
+#define SWIFT_COOLING_STRUCT_PS2020_H
 
 /**
  * @brief Properties of the cooling stored in the #part data.
@@ -40,4 +40,4 @@ struct cooling_xpart_data {
   float radiated_energy;
 };
 
-#endif /* SWIFT_COOLING_STRUCT_COLIBRE_H */
+#endif /* SWIFT_COOLING_STRUCT_PS2020_H */
diff --git a/src/cooling/COLIBRE/cooling_subgrid.h b/src/cooling/PS2020/cooling_subgrid.h
similarity index 99%
rename from src/cooling/COLIBRE/cooling_subgrid.h
rename to src/cooling/PS2020/cooling_subgrid.h
index ed50efebd5..5f811439c9 100644
--- a/src/cooling/COLIBRE/cooling_subgrid.h
+++ b/src/cooling/PS2020/cooling_subgrid.h
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
-#ifndef SWIFT_COLIBRE_COOLING_SUBGRID_H
-#define SWIFT_COLIBRE_COOLING_SUBGRID_H
+#ifndef SWIFT_PS2020_COOLING_SUBGRID_H
+#define SWIFT_PS2020_COOLING_SUBGRID_H
 
 /* Config parameters. */
 #include <config.h>
@@ -586,4 +586,4 @@ double compute_subgrid_property(
   return standard_return;
 }
 
-#endif /* SWIFT_COLIBRE_COOLING_SUBGRID_H */
+#endif /* SWIFT_PS2020_COOLING_SUBGRID_H */
diff --git a/src/cooling/COLIBRE/cooling_tables.c b/src/cooling/PS2020/cooling_tables.c
similarity index 98%
rename from src/cooling/COLIBRE/cooling_tables.c
rename to src/cooling/PS2020/cooling_tables.c
index bce5946f99..f7b4024eb4 100644
--- a/src/cooling/COLIBRE/cooling_tables.c
+++ b/src/cooling/PS2020/cooling_tables.c
@@ -18,8 +18,8 @@
  ******************************************************************************/
 
 /**
- * @file src/cooling/COLIBRE/cooling_tables.c
- * @brief Functions to read COLIBRE tables
+ * @file src/cooling/PS2020/cooling_tables.c
+ * @brief Functions to read PS2020 tables
  */
 
 /* Config parameters. */
@@ -42,7 +42,7 @@
 #include "interpolate.h"
 
 /**
- * @brief Reads in COLIBRE cooling table header. Consists of tables
+ * @brief Reads in PS2020 cooling table header. Consists of tables
  * of values for temperature, hydrogen number density, metallicity,
  * abundance ratios, and elements used to index the cooling tables.
  *
@@ -361,7 +361,7 @@ void read_cooling_tables(struct cooling_function_data *restrict cooling) {
 
   /* Dataset is named /Tdep/ElectronFractions in the published version of the
    * tables and for historical reasons /Tdep/ElectronFractionsVol in the version
-   * used in the COLIBRE repository. Content is identical but we deal
+   * used in the PS2020 repository. Content is identical but we deal
    * here with both names */
   if (H5Lexists(tempfile_id, "/Tdep/ElectronFractionsVol", H5P_DEFAULT) > 0) {
     dataset = H5Dopen(tempfile_id, "/Tdep/ElectronFractionsVol", H5P_DEFAULT);
@@ -389,7 +389,7 @@ void read_cooling_tables(struct cooling_function_data *restrict cooling) {
 
   /* Dataset is named /Udep/ElectronFractions in the published version of the
    * tables and for historical reasons /Udep/ElectronFractionsVol in the version
-   * used in the COLIBRE repository. Content is identical but we deal
+   * used in the PS2020 repository. Content is identical but we deal
    * here with both names */
   if (H5Lexists(tempfile_id, "/Udep/ElectronFractionsVol", H5P_DEFAULT) > 0) {
     dataset = H5Dopen(tempfile_id, "/Udep/ElectronFractionsVol", H5P_DEFAULT);
diff --git a/src/cooling/COLIBRE/cooling_tables.h b/src/cooling/PS2020/cooling_tables.h
similarity index 95%
rename from src/cooling/COLIBRE/cooling_tables.h
rename to src/cooling/PS2020/cooling_tables.h
index 3eb70ee999..753d5415e6 100644
--- a/src/cooling/COLIBRE/cooling_tables.h
+++ b/src/cooling/PS2020/cooling_tables.h
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
-#ifndef SWIFT_COLIBRE_COOL_TABLES_H
-#define SWIFT_COLIBRE_COOL_TABLES_H
+#ifndef SWIFT_PS2020_COOL_TABLES_H
+#define SWIFT_PS2020_COOL_TABLES_H
 
 /**
- * @file src/cooling/COLIBRE/cooling_tables.h
- * @brief COLIBRE cooling function
+ * @file src/cooling/PS2020/cooling_tables.h
+ * @brief PS2020 cooling function
  */
 
 /* Config parameters. */
diff --git a/src/cooling/COLIBRE/interpolate.h b/src/cooling/PS2020/interpolate.h
similarity index 99%
rename from src/cooling/COLIBRE/interpolate.h
rename to src/cooling/PS2020/interpolate.h
index 4f0c8c7b88..629fb4337f 100644
--- a/src/cooling/COLIBRE/interpolate.h
+++ b/src/cooling/PS2020/interpolate.h
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
-#ifndef SWIFT_INTERPOL_COLIBRE_H
-#define SWIFT_INTERPOL_COLIBRE_H
+#ifndef SWIFT_INTERPOL_PS2020_H
+#define SWIFT_INTERPOL_PS2020_H
 
 /**
- * @file src/cooling/COLIBRE/interpolate.h
- * @brief Interpolation functions for COLIBRE tables
+ * @file src/cooling/PS2020/interpolate.h
+ * @brief Interpolation functions for PS2020 tables
  */
 
 /* Config parameters. */
diff --git a/src/cooling/QLA/cooling.h b/src/cooling/QLA/cooling.h
index 1e3441b90b..dca77090a4 100644
--- a/src/cooling/QLA/cooling.h
+++ b/src/cooling/QLA/cooling.h
@@ -21,7 +21,7 @@
 
 /**
  * @file src/cooling/QLA/cooling.h
- * @brief Quick Lyman alpha cooling (COLIBRE with primoridal Z) function
+ * @brief Quick Lyman alpha cooling (PS2020 with primoridal Z) function
  * declarations
  */
 
diff --git a/src/cooling/QLA/cooling_io.h b/src/cooling/QLA/cooling_io.h
index 5f4352f5c6..aedfbf33ba 100644
--- a/src/cooling/QLA/cooling_io.h
+++ b/src/cooling/QLA/cooling_io.h
@@ -41,7 +41,7 @@ __attribute__((always_inline)) INLINE static void cooling_write_flavour(
     const struct cooling_function_data* cooling) {
 
   io_write_attribute_s(h_grp, "Cooling Model",
-                       "Quick Lyman-alpha (COLIBRE with primordial Z only)");
+                       "Quick Lyman-alpha (PS2020 with primordial Z only)");
 }
 #endif
 
diff --git a/src/cooling/QLA/cooling_rates.h b/src/cooling/QLA/cooling_rates.h
index 0a2d544ae6..271d403ca8 100644
--- a/src/cooling/QLA/cooling_rates.h
+++ b/src/cooling/QLA/cooling_rates.h
@@ -36,7 +36,7 @@
  *
  * The solar abundances are taken from the tables themselves.
  *
- * The COLIBRE chemistry model does not track S and Ca. We assume
+ * The PS2020 chemistry model does not track S and Ca. We assume
  * that their abundance with respect to solar is the same as
  * the ratio for Si.
  *
diff --git a/src/cooling/QLA/cooling_tables.c b/src/cooling/QLA/cooling_tables.c
index 728df70232..64db2a310b 100644
--- a/src/cooling/QLA/cooling_tables.c
+++ b/src/cooling/QLA/cooling_tables.c
@@ -42,7 +42,7 @@
 #include "interpolate.h"
 
 /**
- * @brief Reads in COLIBRE cooling table header. Consists of tables
+ * @brief Reads in PS2020 cooling table header. Consists of tables
  * of values for temperature, hydrogen number density, metallicity,
  * abundance ratios, and elements used to index the cooling tables.
  *
diff --git a/src/cooling/QLA/interpolate.h b/src/cooling/QLA/interpolate.h
index 2444e31fb4..67f4dd8bb4 100644
--- a/src/cooling/QLA/interpolate.h
+++ b/src/cooling/QLA/interpolate.h
@@ -21,7 +21,7 @@
 
 /**
  * @file src/cooling/QLA/interpolate.h
- * @brief Interpolation functions for Quick Lyman-alpha cooling tables (COLIBRE)
+ * @brief Interpolation functions for Quick Lyman-alpha cooling tables (PS2020)
  */
 
 /* Config parameters. */
diff --git a/src/cooling_debug.h b/src/cooling_debug.h
index 50d213eaf9..37d34e6bd8 100644
--- a/src/cooling_debug.h
+++ b/src/cooling_debug.h
@@ -39,8 +39,8 @@
 #include "./cooling/QLA_EAGLE/cooling_debug.h"
 #elif defined(COOLING_EAGLE)
 #include "./cooling/EAGLE/cooling_debug.h"
-#elif defined(COOLING_COLIBRE)
-#include "./cooling/COLIBRE/cooling_debug.h"
+#elif defined(COOLING_PS2020)
+#include "./cooling/PS2020/cooling_debug.h"
 #else
 #error "Invalid choice of cooling function."
 #endif
diff --git a/src/cooling_io.h b/src/cooling_io.h
index ed08fe3371..d3439b4d0a 100644
--- a/src/cooling_io.h
+++ b/src/cooling_io.h
@@ -39,8 +39,8 @@
 #include "./cooling/QLA_EAGLE/cooling_io.h"
 #elif defined(COOLING_EAGLE)
 #include "./cooling/EAGLE/cooling_io.h"
-#elif defined(COOLING_COLIBRE)
-#include "./cooling/COLIBRE/cooling_io.h"
+#elif defined(COOLING_PS2020)
+#include "./cooling/PS2020/cooling_io.h"
 #else
 #error "Invalid choice of cooling function."
 #endif
diff --git a/src/cooling_properties.h b/src/cooling_properties.h
index ba399d1e9c..f48d153137 100644
--- a/src/cooling_properties.h
+++ b/src/cooling_properties.h
@@ -44,8 +44,8 @@
 #include "./cooling/QLA_EAGLE/cooling_properties.h"
 #elif defined(COOLING_EAGLE)
 #include "./cooling/EAGLE/cooling_properties.h"
-#elif defined(COOLING_COLIBRE)
-#include "./cooling/COLIBRE/cooling_properties.h"
+#elif defined(COOLING_PS2020)
+#include "./cooling/PS2020/cooling_properties.h"
 #else
 #error "Invalid choice of cooling function."
 #endif
diff --git a/src/cooling_struct.h b/src/cooling_struct.h
index c7962624cc..b205cbfef3 100644
--- a/src/cooling_struct.h
+++ b/src/cooling_struct.h
@@ -44,8 +44,8 @@
 #include "./cooling/QLA_EAGLE/cooling_struct.h"
 #elif defined(COOLING_EAGLE)
 #include "./cooling/EAGLE/cooling_struct.h"
-#elif defined(COOLING_COLIBRE)
-#include "./cooling/COLIBRE/cooling_struct.h"
+#elif defined(COOLING_PS2020)
+#include "./cooling/PS2020/cooling_struct.h"
 #else
 #error "Invalid choice of cooling function."
 #endif
diff --git a/src/extra_io/EAGLE/extra.h b/src/extra_io/EAGLE/extra.h
index 7ed12ef86f..95698eca08 100644
--- a/src/extra_io/EAGLE/extra.h
+++ b/src/extra_io/EAGLE/extra.h
@@ -677,7 +677,7 @@ INLINE static float do_xray_interpolation(
    *
    * The interpolation table structure is as follows:
    * First we have the individual element contributions in the same order
-   * as the COLIBRE cooling model. As we only include metals, the first
+   * as the PS2020 cooling model. As we only include metals, the first
    * entry is Carbon, second Nitrogen, etc.
    * The contribution of no metals is the last entry.
    *
@@ -695,7 +695,7 @@ INLINE static float do_xray_interpolation(
   const float x_ray_no_metals_cgs = exp10f(log10_x_ray_no_metals_cgs);
   float x_ray_cgs = x_ray_no_metals_cgs;
 
-  /* Loop over the *individual metals* used in the COLIBRE cooling */
+  /* Loop over the *individual metals* used in the PS2020 cooling */
   for (int elem = element_C; elem <= element_Fe; elem++) {
 
     /* Note: we deduct 2 since the interpolation tables do not include H and He
@@ -772,7 +772,7 @@ INLINE static double extra_io_get_xray_fluxes(const struct part *p,
   }
 
   /* We now need to convert the array we received from the chemistry
-   * module (likely EAGLE) into the COLIBRE-cooling format.
+   * module (likely EAGLE) into the PS2020-cooling format.
    * This means adding un-tracked elements and changing their order */
 
   /* Finally onvert to abundances relative to solar */
diff --git a/src/lightcone/lightcone_particle_io.c b/src/lightcone/lightcone_particle_io.c
index b58feec5c4..9d3584412a 100644
--- a/src/lightcone/lightcone_particle_io.c
+++ b/src/lightcone/lightcone_particle_io.c
@@ -129,7 +129,7 @@ void lightcone_io_append_gas_output_fields(
                                  OFFSET(metal_mass_fraction_total),
                                  UNIT_CONV_NO_UNITS, 0.0, "FMantissa9");
 #endif
-#ifdef COOLING_COLIBRE
+#ifdef COOLING_PS2020
   lightcone_io_field_list_append(list, "ElectronNumberDensities", DOUBLE, 1,
                                  OFFSET(electron_density),
                                  UNIT_CONV_NUMBER_DENSITY, 0.0, "DMantissa9");
@@ -423,7 +423,7 @@ int lightcone_store_gas(const struct engine *e, struct lightcone_props *props,
       p->chemistry_data.smoothed_metal_mass_fraction_total;
 #endif
 
-#ifdef COOLING_COLIBRE
+#ifdef COOLING_PS2020
   data->electron_density = cooling_get_electron_density(
       e->physical_constants, e->hydro_properties, e->internal_units,
       e->cosmology, e->cooling_func, p, xp);
diff --git a/src/lightcone/lightcone_particle_io.h b/src/lightcone/lightcone_particle_io.h
index 8ebe555bf9..a313a05461 100644
--- a/src/lightcone/lightcone_particle_io.h
+++ b/src/lightcone/lightcone_particle_io.h
@@ -107,7 +107,7 @@ struct lightcone_gas_data {
   float metal_mass_fraction_total;
   float smoothed_metal_mass_fraction_total;
 #endif
-#ifdef COOLING_COLIBRE
+#ifdef COOLING_PS2020
   double electron_density;
   double ycompton;
 #endif
diff --git a/src/star_formation/EAGLE/star_formation.h b/src/star_formation/EAGLE/star_formation.h
index 88fa46dfbe..8fd2ca89c6 100644
--- a/src/star_formation/EAGLE/star_formation.h
+++ b/src/star_formation/EAGLE/star_formation.h
@@ -830,7 +830,7 @@ INLINE static void starformation_init_backend(
     error(
         "The 'Subgrid' SF threshold in the EAGLE star formation model cannot "
         "be used in combination with EAGLE cooling. A cooling model with "
-        "subgrid quantities (such as 'COLIBRE' using the Ploeckinger tables) "
+        "subgrid quantities (such as 'PS2020' using the Ploeckinger tables) "
         "must be used. Alternatively, the 'Zdep' threshold should be used as "
         "it can be combined with any cooling model.");
 #endif
diff --git a/src/statistics.c b/src/statistics.c
index 8987c95f49..87212bda61 100644
--- a/src/statistics.c
+++ b/src/statistics.c
@@ -183,8 +183,8 @@ void stats_collect_part_mapper(void *map_data, int nr_parts, void *extra_data) {
     /* Collect metal mass */
     stats.gas_Z_mass += chemistry_get_total_metal_mass_for_stats(p);
 
-#if defined(CHEMISTRY_EAGLE) || defined(CHEMISTRY_COLIBRE)
-#if defined(COOLING_EAGLE) || defined(COOLING_COLIBRE) || \
+#if defined(CHEMISTRY_EAGLE) || defined(CHEMISTRY_PS2020)
+#if defined(COOLING_EAGLE) || defined(COOLING_PS2020) || \
     defined(COOLING_CHIMES) || defined(COOLING_CHIMES_HYBRID)
 
     const struct unit_system *us = e->internal_units;
-- 
GitLab