diff --git a/.travis.yml b/.travis.yml
index 75dc169261d2b5e012e872a72ad2bcb6141d8cda..23d673f4b28b0356ecc93e3b945868ec5f8853f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,11 +56,11 @@ before_script:
   #
 script:
   #
-  # Backup Configuration.h, Configuration_adv.h, and pins_RAMPS_14.h
+  # Backup Configuration.h, Configuration_adv.h, and pins_RAMPS.h
   #
   - cp Marlin/Configuration.h Marlin/Configuration.h.backup
   - cp Marlin/Configuration_adv.h Marlin/Configuration_adv.h.backup
-  - cp Marlin/pins_RAMPS_14.h Marlin/pins_RAMPS_14.h.backup
+  - cp Marlin/pins_RAMPS.h Marlin/pins_RAMPS.h.backup
   #
   # Build with the default configurations
   #
@@ -221,7 +221,7 @@ script:
   #
   - restore_configs
   - opt_enable_adv Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS
-  - pins_set RAMPS_14 X_MAX_PIN -1
+  - pins_set RAMPS X_MAX_PIN -1
   - opt_set_adv Z2_MAX_PIN 2
   - build_marlin
   #
diff --git a/Marlin/pins.h b/Marlin/pins.h
index 548d44fdf7bb62a139251800f449e4c4a376f766..3657675db5d8cad340d077ff82c036393213597c 100644
--- a/Marlin/pins.h
+++ b/Marlin/pins.h
@@ -58,19 +58,19 @@
   #include "pins_RAMPS_13.h"
 #elif MB(RAMPS_14_EFB)
   #define IS_RAMPS_EFB
-  #include "pins_RAMPS_14.h"
+  #include "pins_RAMPS.h"
 #elif MB(RAMPS_14_EEB)
   #define IS_RAMPS_EEB
-  #include "pins_RAMPS_14.h"
+  #include "pins_RAMPS.h"
 #elif MB(RAMPS_14_EFF)
   #define IS_RAMPS_EFF
-  #include "pins_RAMPS_14.h"
+  #include "pins_RAMPS.h"
 #elif MB(RAMPS_14_EEF)
   #define IS_RAMPS_EEF
-  #include "pins_RAMPS_14.h"
+  #include "pins_RAMPS.h"
 #elif MB(RAMPS_14_SF)
   #define IS_RAMPS_SF
-  #include "pins_RAMPS_14.h"
+  #include "pins_RAMPS.h"
 #elif MB(GEN6)
   #include "pins_GEN6.h"
 #elif MB(GEN6_DELUXE)
@@ -146,7 +146,7 @@
 #elif MB(LEAPFROG)
   #include "pins_LEAPFROG.h"
 #elif MB(BAM_DICE)
-  #include "pins_RAMPS_14.h"
+  #include "pins_RAMPS.h"
 #elif MB(BAM_DICE_DUE)
   #include "pins_BAM_DICE_DUE.h"
 #elif MB(FELIX2)
diff --git a/Marlin/pins_3DRAG.h b/Marlin/pins_3DRAG.h
index db19e5df2c2fc5ad22984f992ac0f310f866a0e2..a3a6169028ed59723da0b1c43b628be06e8a6123 100644
--- a/Marlin/pins_3DRAG.h
+++ b/Marlin/pins_3DRAG.h
@@ -36,7 +36,7 @@
   #define DEFAULT_SOURCE_CODE_URL "http://3dprint.elettronicain.it/"
 #endif
 
-#include "pins_RAMPS_14.h"
+#include "pins_RAMPS.h"
 
 #undef Z_ENABLE_PIN
 #define Z_ENABLE_PIN       63
diff --git a/Marlin/pins_AZTEEG_X3.h b/Marlin/pins_AZTEEG_X3.h
index ed8f4a5ebb6107385374910b6f00096e87e717a8..05a5a269fd53faaa2898fb4f1ef29eac7f80f573 100644
--- a/Marlin/pins_AZTEEG_X3.h
+++ b/Marlin/pins_AZTEEG_X3.h
@@ -30,7 +30,7 @@
 
 #define BOARD_NAME "Azteeg X3"
 
-#include "pins_RAMPS_14.h"
+#include "pins_RAMPS.h"
 
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
 
diff --git a/Marlin/pins_AZTEEG_X3_PRO.h b/Marlin/pins_AZTEEG_X3_PRO.h
index 3331a299a01ea1c48d5a93b75b00bb666d7d39f4..b531ec30d0cdeac721d03183dc4021b0e3838014 100644
--- a/Marlin/pins_AZTEEG_X3_PRO.h
+++ b/Marlin/pins_AZTEEG_X3_PRO.h
@@ -26,7 +26,7 @@
 
 #define BOARD_NAME "Azteeg X3 Pro"
 
-#include "pins_RAMPS_14.h"
+#include "pins_RAMPS.h"
 
 #undef FAN_PIN
 #define FAN_PIN             6 //Part Cooling System
diff --git a/Marlin/pins_BAM_DICE_DUE.h b/Marlin/pins_BAM_DICE_DUE.h
index f75a6c4421b34c8aeb8ca7b460583e3fce520100..0c5914f2b95aed96cfd4ba8dd2dc68e029fb7433 100644
--- a/Marlin/pins_BAM_DICE_DUE.h
+++ b/Marlin/pins_BAM_DICE_DUE.h
@@ -30,7 +30,7 @@
 
 #define BOARD_NAME "2PrintBeta Due"
 
-#include "pins_RAMPS_14.h"
+#include "pins_RAMPS.h"
 
 #undef TEMP_0_PIN
 #undef TEMP_1_PIN
diff --git a/Marlin/pins_FELIX2.h b/Marlin/pins_FELIX2.h
index d164f99c7c7c355adcd817f522f842c1b487c65a..31c67ad193a5b35c70c2caf77b94cf9b89282afa 100644
--- a/Marlin/pins_FELIX2.h
+++ b/Marlin/pins_FELIX2.h
@@ -32,7 +32,7 @@
 
 #define HI_VOLT_PIN_D 7
 
-#include "pins_RAMPS_14.h"
+#include "pins_RAMPS.h"
 
 #undef SDPOWER
 #define SDPOWER             1
diff --git a/Marlin/pins_MKS_13.h b/Marlin/pins_MKS_13.h
index eee34dd6f3ad8a2b9f9540cfdcf99d923b9f1dc5..065a0f2aa0c8fe88fc1b79cab79b0f27b2b18caa 100644
--- a/Marlin/pins_MKS_13.h
+++ b/Marlin/pins_MKS_13.h
@@ -37,7 +37,7 @@
 
 #define HI_VOLT_PIN_D 7
 
-#include "pins_RAMPS_14.h"
+#include "pins_RAMPS.h"
 
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
   /**
diff --git a/Marlin/pins_MKS_BASE.h b/Marlin/pins_MKS_BASE.h
index 92895b1d73e804ac99880784401482edf1ceb73d..fc7a7f1fe9adbb045126b17f599c9eb35b505f45 100644
--- a/Marlin/pins_MKS_BASE.h
+++ b/Marlin/pins_MKS_BASE.h
@@ -32,4 +32,4 @@
 
 #define HI_VOLT_PIN_D 7
 
-#include "pins_RAMPS_14.h"
\ No newline at end of file
+#include "pins_RAMPS.h"
\ No newline at end of file
diff --git a/Marlin/pins_RAMPS_14.h b/Marlin/pins_RAMPS.h
similarity index 100%
rename from Marlin/pins_RAMPS_14.h
rename to Marlin/pins_RAMPS.h
diff --git a/Marlin/pins_RAMPS_13.h b/Marlin/pins_RAMPS_13.h
index e3a854b1176da6197894ab8af1e1cfb7b3879b66..effce907064f1e729fd18fecbd92b52cc99e4c15 100644
--- a/Marlin/pins_RAMPS_13.h
+++ b/Marlin/pins_RAMPS_13.h
@@ -38,4 +38,4 @@
 #endif
 
 #define IS_RAMPS_13
-#include "pins_RAMPS_14.h"
+#include "pins_RAMPS.h"
diff --git a/Marlin/pins_RIGIDBOARD.h b/Marlin/pins_RIGIDBOARD.h
index 7fdc1ae3047708af4b8f2c2a97cb4edd4a634a8b..6b7645205dbf1905cbc5f1ed21c73b2eac359e38 100644
--- a/Marlin/pins_RIGIDBOARD.h
+++ b/Marlin/pins_RIGIDBOARD.h
@@ -24,7 +24,7 @@
  * RIGIDBOARD Arduino Mega with RAMPS v1.4 pin assignments
  */
 
-#include "pins_RAMPS_14.h"
+#include "pins_RAMPS.h"
 
 #undef BOARD_NAME
 #define BOARD_NAME "RigidBoard"
diff --git a/Marlin/pins_SAINSMART_2IN1.h b/Marlin/pins_SAINSMART_2IN1.h
index c032d4d6fe22761fc022fc727ac45ff26a3477c4..848b10d449c1734fd79369df079fe1586ec78900 100644
--- a/Marlin/pins_SAINSMART_2IN1.h
+++ b/Marlin/pins_SAINSMART_2IN1.h
@@ -35,4 +35,4 @@
      // HI_VOLT_PIN_C  8 // B
 #define HI_VOLT_PIN_D 10 // F / E
 
-#include "pins_RAMPS_14.h"
+#include "pins_RAMPS.h"