diff --git a/Marlin/pinsDebug.h b/Marlin/pinsDebug.h
index e50a0c693..03cee3d71 100644
--- a/Marlin/pinsDebug.h
+++ b/Marlin/pinsDebug.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (C) 2016, 2017 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
@@ -43,8 +43,8 @@ bool endstop_monitor_flag = false;
 
 #define _ADD_PIN_2(PIN_NAME, ENTRY_NAME) static const char ENTRY_NAME[] PROGMEM = { PIN_NAME };
 #define _ADD_PIN(PIN_NAME, COUNTER) _ADD_PIN_2(PIN_NAME, entry_NAME_##COUNTER)
-#define REPORT_NAME_DIGITAL(COUNTER, NAME) _ADD_PIN(NAME, COUNTER)
-#define REPORT_NAME_ANALOG(COUNTER, NAME) _ADD_PIN(NAME, COUNTER)
+#define REPORT_NAME_DIGITAL(COUNTER, NAME) _ADD_PIN(#NAME, COUNTER)
+#define REPORT_NAME_ANALOG(COUNTER, NAME) _ADD_PIN(#NAME, COUNTER)
 
 #include "pinsDebug_list.h"
 #line 51
diff --git a/Marlin/pins_CHEAPTRONICv2.h b/Marlin/pins_CHEAPTRONICv2.h
index 327883898..e6840abeb 100644
--- a/Marlin/pins_CHEAPTRONICv2.h
+++ b/Marlin/pins_CHEAPTRONICv2.h
@@ -109,7 +109,9 @@
 //
 // Other board specific pins
 //
-#define FIL_RUNOUT_PIN     37   // board input labeled as F-DET
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN   37   // board input labeled as F-DET
+#endif
 #define Z_MIN_PROBE_PIN    36   // additional external board input labeled as E-SENS (should be used for Z-probe)
 #define LED_PIN            13
 #define SPINDLE_ENABLE_PIN  4   // additional PWM pin 1 at JP1 connector - should be used for laser control too
diff --git a/Marlin/pins_CNCONTROLS_12.h b/Marlin/pins_CNCONTROLS_12.h
index 50c87cda6..5cf462a94 100644
--- a/Marlin/pins_CNCONTROLS_12.h
+++ b/Marlin/pins_CNCONTROLS_12.h
@@ -91,7 +91,9 @@
 
 // Common I/O
 
-#define FIL_RUNOUT_PIN     18
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN   18
+#endif
 //#define PWM_1_PIN          12
 //#define PWM_2_PIN          13
 //#define SPARE_IO           17