diff --git a/config/generic-archim2.cfg b/config/generic-archim2.cfg
index 8b159b149..a517909b4 100644
--- a/config/generic-archim2.cfg
+++ b/config/generic-archim2.cfg
@@ -129,7 +129,7 @@ max_temp: 130
 [fan]
 pin: PC26
 
-[heater_fan nozzle_cooling_fan]
+[heater_fan heatbreak_cooling_fan]
 pin: PC25
 
 [mcu]
diff --git a/config/generic-bigtreetech-e3-rrf-v1.1.cfg b/config/generic-bigtreetech-e3-rrf-v1.1.cfg
index 557009ee3..b0153cba2 100644
--- a/config/generic-bigtreetech-e3-rrf-v1.1.cfg
+++ b/config/generic-bigtreetech-e3-rrf-v1.1.cfg
@@ -90,7 +90,7 @@ pid_Kd: 948.182
 min_temp: 0
 max_temp: 130
 
-[heater_fan nozzle_cooling_fan]
+[heater_fan heatbreak_cooling_fan]
 pin: PB6
 
 [fan]
diff --git a/config/generic-bigtreetech-skr-e3-turbo.cfg b/config/generic-bigtreetech-skr-e3-turbo.cfg
index 1974afdbc..4784a6541 100644
--- a/config/generic-bigtreetech-skr-e3-turbo.cfg
+++ b/config/generic-bigtreetech-skr-e3-turbo.cfg
@@ -105,7 +105,7 @@ max_temp: 130
 [fan]
 pin: P2.1
 
-[heater_fan nozzle_cooling_fan]
+[heater_fan heatbreak_cooling_fan]
 pin: P2.2
 
 [mcu]
diff --git a/config/generic-bigtreetech-skr-mini-e3-v2.0.cfg b/config/generic-bigtreetech-skr-mini-e3-v2.0.cfg
index 96605da1c..eeacae331 100644
--- a/config/generic-bigtreetech-skr-mini-e3-v2.0.cfg
+++ b/config/generic-bigtreetech-skr-mini-e3-v2.0.cfg
@@ -100,7 +100,7 @@ pid_Kd: 948.182
 min_temp: 0
 max_temp: 130
 
-[heater_fan nozzle_cooling_fan]
+[heater_fan heatbreak_cooling_fan]
 pin: PC7
 
 [fan]
diff --git a/config/generic-bigtreetech-skr-mini-e3-v3.0.cfg b/config/generic-bigtreetech-skr-mini-e3-v3.0.cfg
index ed37afbda..2ea064b09 100644
--- a/config/generic-bigtreetech-skr-mini-e3-v3.0.cfg
+++ b/config/generic-bigtreetech-skr-mini-e3-v3.0.cfg
@@ -98,7 +98,7 @@ pid_Kd: 948.182
 min_temp: 0
 max_temp: 130
 
-[heater_fan nozzle_cooling_fan]
+[heater_fan heatbreak_cooling_fan]
 pin: PC7
 
 [heater_fan controller_fan]
diff --git a/config/generic-bigtreetech-skr-mini-mz.cfg b/config/generic-bigtreetech-skr-mini-mz.cfg
index 15f32864c..92afc7796 100644
--- a/config/generic-bigtreetech-skr-mini-mz.cfg
+++ b/config/generic-bigtreetech-skr-mini-mz.cfg
@@ -103,7 +103,7 @@ pid_Kd: 948.182
 min_temp: 0
 max_temp: 130
 
-[heater_fan nozzle_cooling_fan]
+[heater_fan heatbreak_cooling_fan]
 pin: PC7
 
 [fan]
diff --git a/config/generic-bigtreetech-skr-pico-v1.0.cfg b/config/generic-bigtreetech-skr-pico-v1.0.cfg
index 83f89d65c..06a0c9f7a 100644
--- a/config/generic-bigtreetech-skr-pico-v1.0.cfg
+++ b/config/generic-bigtreetech-skr-pico-v1.0.cfg
@@ -100,7 +100,7 @@ max_temp: 130
 [fan]
 pin: gpio17
 
-[heater_fan nozzle_cooling_fan]
+[heater_fan heatbreak_cooling_fan]
 pin: gpio18
 
 [heater_fan controller_fan]
diff --git a/config/generic-duet2-duex.cfg b/config/generic-duet2-duex.cfg
index 38903ed26..e63577135 100644
--- a/config/generic-duet2-duex.cfg
+++ b/config/generic-duet2-duex.cfg
@@ -288,7 +288,7 @@ max_temp: 130
 pin: PC23
 
 # Fan1 controlled by extruder
-[heater_fan nozzle_cooling_fan]
+[heater_fan heatbreak_cooling_fan]
 pin: PC26
 heater: extruder
 heater_temp: 45
diff --git a/config/generic-duet2-maestro.cfg b/config/generic-duet2-maestro.cfg
index 82e57f72f..c3618d781 100644
--- a/config/generic-duet2-maestro.cfg
+++ b/config/generic-duet2-maestro.cfg
@@ -123,7 +123,7 @@ max_temp: 130
 [fan]
 pin: PC23  # FAN0
 
-#[heater_fan nozzle_cooling_fan]
+#[heater_fan heatbreak_cooling_fan]
 #pin: PC22  # FAN1
 
 #[heater_fan board_cooling_fan]
diff --git a/config/generic-duet2.cfg b/config/generic-duet2.cfg
index 79d3b324f..fba451866 100644
--- a/config/generic-duet2.cfg
+++ b/config/generic-duet2.cfg
@@ -101,7 +101,7 @@ max_temp: 130
 [fan]
 pin: PC23  # FAN0
 
-#[heater_fan nozzle_cooling_fan]
+#[heater_fan heatbreak_cooling_fan]
 #pin: PC26  # FAN1
 
 #[heater_fan board_cooling_fan]
diff --git a/config/generic-einsy-rambo.cfg b/config/generic-einsy-rambo.cfg
index 9015ae678..d532b8bf3 100644
--- a/config/generic-einsy-rambo.cfg
+++ b/config/generic-einsy-rambo.cfg
@@ -95,7 +95,7 @@ max_temp: 130
 [fan]
 pin: PH5
 
-#[heater_fan nozzle_cooling_fan]
+#[heater_fan heatbreak_cooling_fan]
 #pin: PH3
 
 [temperature_sensor board_sensor]
diff --git a/config/generic-fysetc-cheetah-v1.2.cfg b/config/generic-fysetc-cheetah-v1.2.cfg
index 1474b837e..d2e3fb95e 100644
--- a/config/generic-fysetc-cheetah-v1.2.cfg
+++ b/config/generic-fysetc-cheetah-v1.2.cfg
@@ -97,7 +97,7 @@ max_temp: 130
 [fan]
 pin: PC8
 
-[heater_fan nozzle_cooling_fan]
+[heater_fan heatbreak_cooling_fan]
 pin: PB0
 
 [mcu]
diff --git a/config/generic-mini-rambo.cfg b/config/generic-mini-rambo.cfg
index 21c999ac2..61e2ac847 100644
--- a/config/generic-mini-rambo.cfg
+++ b/config/generic-mini-rambo.cfg
@@ -65,7 +65,7 @@ max_temp: 130
 [fan]
 pin: PH5
 
-#[heater_fan nozzle_cooling_fan]
+#[heater_fan heatbreak_cooling_fan]
 #pin: PH3
 
 [mcu]
diff --git a/config/generic-printrboard-g2.cfg b/config/generic-printrboard-g2.cfg
index 356d93f6c..ffbe80cd2 100644
--- a/config/generic-printrboard-g2.cfg
+++ b/config/generic-printrboard-g2.cfg
@@ -104,7 +104,7 @@ max_temp: 290
 [fan]
 pin: PB27
 
-[heater_fan nozzle_cooling_fan]
+[heater_fan heatbreak_cooling_fan]
 pin: PA6
 
 [mcu]
diff --git a/config/generic-radds.cfg b/config/generic-radds.cfg
index f3cee4359..f07f3cb47 100644
--- a/config/generic-radds.cfg
+++ b/config/generic-radds.cfg
@@ -81,7 +81,7 @@ max_temp: 130
 [fan]
 pin: PC21
 
-#[heater_fan nozzle_cooling_fan]
+#[heater_fan heatbreak_cooling_fan]
 #pin: PC22
 
 [mcu]
diff --git a/config/generic-rambo.cfg b/config/generic-rambo.cfg
index 1686da254..8eb04c1ff 100644
--- a/config/generic-rambo.cfg
+++ b/config/generic-rambo.cfg
@@ -75,7 +75,7 @@ max_temp: 130
 [fan]
 pin: PH5
 
-#[heater_fan nozzle_cooling_fan]
+#[heater_fan heatbreak_cooling_fan]
 #pin: PH3
 
 [mcu]
diff --git a/config/printer-eryone-er20-2021.cfg b/config/printer-eryone-er20-2021.cfg
index 9fc25f521..a23cafc8a 100644
--- a/config/printer-eryone-er20-2021.cfg
+++ b/config/printer-eryone-er20-2021.cfg
@@ -112,7 +112,7 @@ max_temp: 100
 [fan]
 pin: PB5
 
-[heater_fan nozzle_cooling_fan]
+[heater_fan heatbreak_cooling_fan]
 pin: PB4
 
 [mcu]
diff --git a/config/printer-eryone-thinker-series-v2-2020.cfg b/config/printer-eryone-thinker-series-v2-2020.cfg
index 78fb8aac6..478995480 100644
--- a/config/printer-eryone-thinker-series-v2-2020.cfg
+++ b/config/printer-eryone-thinker-series-v2-2020.cfg
@@ -67,7 +67,7 @@ max_extrude_only_distance: 300
 [fan]
 pin: PH5
 
-[heater_fan nozzle_cooling_fan]
+[heater_fan heatbreak_cooling_fan]
 pin: PH3
 
 [heater_bed]
diff --git a/config/printer-lulzbot-mini1-2016.cfg b/config/printer-lulzbot-mini1-2016.cfg
index b1471dd1a..9be60cbdd 100644
--- a/config/printer-lulzbot-mini1-2016.cfg
+++ b/config/printer-lulzbot-mini1-2016.cfg
@@ -114,7 +114,7 @@ max_temp: 130
 #define FAN_PIN             8
 pin: PH5
 
-[heater_fan nozzle_cooling_fan]
+[heater_fan heatbreak_cooling_fan]
 #define FAN1_PIN            6
 pin: PH3
 
diff --git a/config/printer-lulzbot-taz6-2017.cfg b/config/printer-lulzbot-taz6-2017.cfg
index 8046381f9..7f775b57f 100644
--- a/config/printer-lulzbot-taz6-2017.cfg
+++ b/config/printer-lulzbot-taz6-2017.cfg
@@ -97,7 +97,7 @@ max_temp: 130
 [fan]
 pin: PH5
 
-[heater_fan nozzle_cooling_fan]
+[heater_fan heatbreak_cooling_fan]
 pin: PH3
 
 [mcu]
diff --git a/config/printer-lulzbot-taz6-dual-v3-2017.cfg b/config/printer-lulzbot-taz6-dual-v3-2017.cfg
index 2ec91f9ee..f94b06846 100644
--- a/config/printer-lulzbot-taz6-dual-v3-2017.cfg
+++ b/config/printer-lulzbot-taz6-dual-v3-2017.cfg
@@ -128,7 +128,7 @@ max_temp: 130
 #On Dual v3 heat break fan is connected to PH3 (part cooling fan on single extruder)
 pin: PH3
 
-[heater_fan nozzle_cooling_fan]
+[heater_fan heatbreak_cooling_fan]
 #On Dual v3 part fans are connected to PH5 (heat break fan on single extruder)
 pin: PH5
 
diff --git a/config/printer-makergear-m2-2016.cfg b/config/printer-makergear-m2-2016.cfg
index db0cfbf8c..4379a4bec 100644
--- a/config/printer-makergear-m2-2016.cfg
+++ b/config/printer-makergear-m2-2016.cfg
@@ -70,7 +70,7 @@ max_temp: 90
 [fan]
 pin: PH5
 
-[heater_fan nozzle_cooling_fan]
+[heater_fan heatbreak_cooling_fan]
 pin: PH3
 
 [mcu]
diff --git a/config/printer-mtw-create-2015.cfg b/config/printer-mtw-create-2015.cfg
index 674d0be9c..7480c4bd1 100644
--- a/config/printer-mtw-create-2015.cfg
+++ b/config/printer-mtw-create-2015.cfg
@@ -104,7 +104,7 @@ mesh_max: 225, 225
 [fan]
 pin: PH5
 
-[heater_fan nozzle_cooling_fan]
+[heater_fan heatbreak_cooling_fan]
 pin: PH3
 
 [mcu]
diff --git a/config/printer-seemecnc-rostock-max-v2-2015.cfg b/config/printer-seemecnc-rostock-max-v2-2015.cfg
index 31eb100bd..70ebd876c 100644
--- a/config/printer-seemecnc-rostock-max-v2-2015.cfg
+++ b/config/printer-seemecnc-rostock-max-v2-2015.cfg
@@ -63,7 +63,7 @@ max_temp: 300
 [fan]
 pin: PH5
 
-[heater_fan nozzle_cooling_fan]
+[heater_fan heatbreak_cooling_fan]
 pin: PH4
 heater: extruder