diff --git a/docs/Command_Templates.md b/docs/Command_Templates.md
index 1c97880b..e216a118 100644
--- a/docs/Command_Templates.md
+++ b/docs/Command_Templates.md
@@ -168,10 +168,10 @@ The following are common printer attributes:
 - `printer.toolhead.homed_axes`: The current cartesian axes considered
   to be in a "homed" state. This is a string containing one or more of
   "x", "y", "z".
-- `printer.heater.available_heaters`: Returns a list of all currently
+- `printer.heaters.available_heaters`: Returns a list of all currently
   available heaters by their full config section names,
   e.g. `["extruder", "heater_bed", "heater_generic my_custom_heater"]`.
-- `printer.heater.available_sensors`: Returns a list of all currently
+- `printer.heaters.available_sensors`: Returns a list of all currently
   available temperature sensors by their full config section names,
   e.g. `["extruder", "heater_bed", "heater_generic my_custom_heater",
   "temperature_sensor electronics_temp"]`.
diff --git a/docs/Config_Changes.md b/docs/Config_Changes.md
index 191346b5..24a26d6e 100644
--- a/docs/Config_Changes.md
+++ b/docs/Config_Changes.md
@@ -6,6 +6,9 @@ All dates in this document are approximate.
 
 # Changes
 
+20200425: The gcode_macro command template variable `printer.heater`
+was renamed to `printer.heaters`.
+
 20200313: The default lcd layout for multi-extruder printers with a
 16x4 screen has changed.  The single extruder screen layout is now the
 default and it will show the currently active extruder.  To use the