diff --git a/Marlin/pins_FELIX2.h b/Marlin/pins_FELIX2.h
index 31c67ad193..83ce47bf5b 100644
--- a/Marlin/pins_FELIX2.h
+++ b/Marlin/pins_FELIX2.h
@@ -30,7 +30,7 @@
 
 #define BOARD_NAME "Felix 2.0+"
 
-#define HI_VOLT_PIN_D 7
+#define MOSFET_D_PIN 7
 
 #include "pins_RAMPS.h"
 
diff --git a/Marlin/pins_MKS_13.h b/Marlin/pins_MKS_13.h
index 065a0f2aa0..36fc0f7b8e 100644
--- a/Marlin/pins_MKS_13.h
+++ b/Marlin/pins_MKS_13.h
@@ -35,7 +35,7 @@
 
 #define BOARD_NAME "MKS > v1.3"
 
-#define HI_VOLT_PIN_D 7
+#define MOSFET_D_PIN 7
 
 #include "pins_RAMPS.h"
 
diff --git a/Marlin/pins_MKS_BASE.h b/Marlin/pins_MKS_BASE.h
index fc7a7f1fe9..fdaff06891 100644
--- a/Marlin/pins_MKS_BASE.h
+++ b/Marlin/pins_MKS_BASE.h
@@ -30,6 +30,6 @@
 
 #define BOARD_NAME "MKS BASE 1.0"
 
-#define HI_VOLT_PIN_D 7
+#define MOSFET_D_PIN 7
 
 #include "pins_RAMPS.h"
\ No newline at end of file
diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h
index 9aa45e5f66..fb378e07fc 100644
--- a/Marlin/pins_RAMPS.h
+++ b/Marlin/pins_RAMPS.h
@@ -138,49 +138,49 @@
  * Hi Voltage PWM Pin Assignments
  */
 
-#ifndef HI_VOLT_PIN_D
-  #define HI_VOLT_PIN_D  -1
+#ifndef MOSFET_D_PIN
+  #define MOSFET_D_PIN  -1
 #endif
-#ifndef HI_VOLT_PIN_C
-  #define HI_VOLT_PIN_C  8
+#ifndef RAMPS_D8_PIN
+  #define RAMPS_D8_PIN   8
 #endif
-#ifndef HI_VOLT_PIN_B
-  #define HI_VOLT_PIN_B  9
+#ifndef RAMPS_D9_PIN
+  #define RAMPS_D9_PIN   9
 #endif
-#ifndef HI_VOLT_PIN_A
-  #define HI_VOLT_PIN_A 10
+#ifndef RAMPS_D10_PIN
+  #define RAMPS_D10_PIN 10
 #endif
 
-#define HEATER_0_PIN     HI_VOLT_PIN_A
+#define HEATER_0_PIN     RAMPS_D10_PIN
 
 #if ENABLED(IS_RAMPS_EFB)                      // Hotend, Fan, Bed
-  #define FAN_PIN        HI_VOLT_PIN_B
-  #define HEATER_BED_PIN HI_VOLT_PIN_C
-  #define FAN1_PIN 4     // IO pin. Buffer needed
+  #define FAN_PIN        RAMPS_D9_PIN
+  #define HEATER_BED_PIN RAMPS_D8_PIN
 #elif ENABLED(IS_RAMPS_EEF)                    // Hotend, Hotend, Fan
-  #define HEATER_1_PIN   HI_VOLT_PIN_B
-  #define FAN_PIN        HI_VOLT_PIN_C
-  #define FAN1_PIN 4     // IO pin. Buffer needed
+  #define HEATER_1_PIN   RAMPS_D9_PIN
+  #define FAN_PIN        RAMPS_D8_PIN
 #elif ENABLED(IS_RAMPS_EEB)                    // Hotend, Hotend, Bed
-  #define HEATER_1_PIN   HI_VOLT_PIN_B
-  #define HEATER_BED_PIN HI_VOLT_PIN_C
-  #define FAN_PIN 4      // IO pin. Buffer needed
+  #define HEATER_1_PIN   RAMPS_D9_PIN
+  #define HEATER_BED_PIN RAMPS_D8_PIN
 #elif ENABLED(IS_RAMPS_EFF)                    // Hotend, Fan, Fan
-  #define FAN_PIN        HI_VOLT_PIN_B
-  #define FAN1_PIN       HI_VOLT_PIN_C
+  #define FAN_PIN        RAMPS_D9_PIN
+  #define FAN1_PIN       RAMPS_D8_PIN
   #define CONTROLLERFAN_PIN  -1
 #elif ENABLED(IS_RAMPS_SF)                     // Spindle, Fan
-  #define FAN_PIN        HI_VOLT_PIN_C
+  #define FAN_PIN        RAMPS_D8_PIN
 #else                                          // Non-specific are "EFB" by legacy
-  #define FAN_PIN        HI_VOLT_PIN_B
-  #define HEATER_BED_PIN HI_VOLT_PIN_C
+  #define FAN_PIN        RAMPS_D9_PIN
+  #define HEATER_BED_PIN RAMPS_D8_PIN
   #if HOTENDS == 1
-    #define FAN1_PIN     HI_VOLT_PIN_D
+    #define FAN1_PIN     MOSFET_D_PIN
   #else
-    #define HEATER_1_PIN HI_VOLT_PIN_D
+    #define HEATER_1_PIN MOSFET_D_PIN
   #endif
 #endif
 
+#ifndef FAN_PIN
+  #define FAN_PIN 4      // IO pin. Buffer needed
+#endif
 
 /**
  * LCD Controller Pin Assignments
diff --git a/Marlin/pins_SAINSMART_2IN1.h b/Marlin/pins_SAINSMART_2IN1.h
index 848b10d449..8d272ada4a 100644
--- a/Marlin/pins_SAINSMART_2IN1.h
+++ b/Marlin/pins_SAINSMART_2IN1.h
@@ -30,9 +30,9 @@
 
 #define BOARD_NAME "Sainsmart"
 
-#define HI_VOLT_PIN_A  9 // E
-#define HI_VOLT_PIN_B  7 // F PART FAN in front of board next to Extruder heat
-     // HI_VOLT_PIN_C  8 // B
-#define HI_VOLT_PIN_D 10 // F / E
+#define RAMPS_D10_PIN 9 // E
+#define RAMPS_D9_PIN  7 // F PART FAN in front of board next to Extruder heat
+     // RAMPS_D8_PIN  8 // B
+#define MOSFET_D_PIN 10 // F / E
 
 #include "pins_RAMPS.h"