diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h
index 7cb89e9962..9aa45e5f66 100644
--- a/Marlin/pins_RAMPS.h
+++ b/Marlin/pins_RAMPS.h
@@ -151,28 +151,27 @@
   #define HI_VOLT_PIN_A 10
 #endif
 
+#define HEATER_0_PIN     HI_VOLT_PIN_A
+
 #if ENABLED(IS_RAMPS_EFB)                      // Hotend, Fan, Bed
-  #define HEATER_0_PIN   HI_VOLT_PIN_A
   #define FAN_PIN        HI_VOLT_PIN_B
   #define HEATER_BED_PIN HI_VOLT_PIN_C
+  #define FAN1_PIN 4     // IO pin. Buffer needed
 #elif ENABLED(IS_RAMPS_EEF)                    // Hotend, Hotend, Fan
-  #define HEATER_0_PIN   HI_VOLT_PIN_A
   #define HEATER_1_PIN   HI_VOLT_PIN_B
   #define FAN_PIN        HI_VOLT_PIN_C
+  #define FAN1_PIN 4     // IO pin. Buffer needed
 #elif ENABLED(IS_RAMPS_EEB)                    // Hotend, Hotend, Bed
-  #define HEATER_0_PIN   HI_VOLT_PIN_A
   #define HEATER_1_PIN   HI_VOLT_PIN_B
   #define HEATER_BED_PIN HI_VOLT_PIN_C
-  #define FAN_PIN 4 // IO pin. Buffer needed
-#elif ENABLED(IS_RAMPS_EFF)                    // Hotend, Fan, Fan (EFF is reversed?)
-  #define HEATER_0_PIN   HI_VOLT_PIN_C
+  #define FAN_PIN 4      // IO pin. Buffer needed
+#elif ENABLED(IS_RAMPS_EFF)                    // Hotend, Fan, Fan
   #define FAN_PIN        HI_VOLT_PIN_B
-  #define FAN1_PIN       HI_VOLT_PIN_A
+  #define FAN1_PIN       HI_VOLT_PIN_C
   #define CONTROLLERFAN_PIN  -1
 #elif ENABLED(IS_RAMPS_SF)                     // Spindle, Fan
   #define FAN_PIN        HI_VOLT_PIN_C
 #else                                          // Non-specific are "EFB" by legacy
-  #define HEATER_0_PIN   HI_VOLT_PIN_A
   #define FAN_PIN        HI_VOLT_PIN_B
   #define HEATER_BED_PIN HI_VOLT_PIN_C
   #if HOTENDS == 1