diff --git a/k3ng_keyer/keyer_features_and_options.h b/k3ng_keyer/config_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options.h
rename to k3ng_keyer/config_features_and_options.h
diff --git a/k3ng_keyer/keyer_hardware.h b/k3ng_keyer/config_hardware.h
similarity index 100%
rename from k3ng_keyer/keyer_hardware.h
rename to k3ng_keyer/config_hardware.h
diff --git a/k3ng_keyer/keyer_pin_settings.h b/k3ng_keyer/config_pin_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings.h
rename to k3ng_keyer/config_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings.h b/k3ng_keyer/config_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings.h
rename to k3ng_keyer/config_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_fk_10.h b/k3ng_keyer/fk_10_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_fk_10.h
rename to k3ng_keyer/fk_10_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_fk_10.h b/k3ng_keyer/fk_10_keyer_pin_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_fk_10.h
rename to k3ng_keyer/fk_10_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_fk_10.h b/k3ng_keyer/fk_10_keyer_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings_fk_10.h
rename to k3ng_keyer/fk_10_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_fk_11.h b/k3ng_keyer/fk_11_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_fk_11.h
rename to k3ng_keyer/fk_11_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_fk_11.h b/k3ng_keyer/fk_11_keyer_pin_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_fk_11.h
rename to k3ng_keyer/fk_11_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_fk_11.h b/k3ng_keyer/fk_11_keyer_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings_fk_11.h
rename to k3ng_keyer/fk_11_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_generic_STM32F103C.h b/k3ng_keyer/generic_STM32F103C_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_generic_STM32F103C.h
rename to k3ng_keyer/generic_STM32F103C_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_generic_STM32F103C.h b/k3ng_keyer/generic_STM32F103C_keyer_pin_settings.h
old mode 100755
new mode 100644
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_generic_STM32F103C.h
rename to k3ng_keyer/generic_STM32F103C_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_generic_STM32F103C.h b/k3ng_keyer/generic_STM32F103C_keyer_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings_generic_STM32F103C.h
rename to k3ng_keyer/generic_STM32F103C_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_iz3gme.h b/k3ng_keyer/iz3gme_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_iz3gme.h
rename to k3ng_keyer/iz3gme_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_iz3gme.h b/k3ng_keyer/iz3gme_keyer_pin_settings.h
old mode 100755
new mode 100644
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_iz3gme.h
rename to k3ng_keyer/iz3gme_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_iz3gme.h b/k3ng_keyer/iz3gme_keyer_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings_iz3gme.h
rename to k3ng_keyer/iz3gme_keyer_settings.h
diff --git a/k3ng_keyer/k3ng_keyer.ino b/k3ng_keyer/k3ng_keyer.ino
index 7bcc31ab..50bcb226 100644
--- a/k3ng_keyer/k3ng_keyer.ino
+++ b/k3ng_keyer/k3ng_keyer.ino
@@ -642,7 +642,7 @@ Recent Update History
       Fixed bug in command mode when OPTION_WATCHDOG_TIMER is enabled.  Thanks, disneysw.
 
     2.2.2016121001
-      Support for FUNtronics FK-10 contributed by disneysw. HARDWARE_FK_10 in keyer_hardware.h; files: keyer_pin_settings_fk_10.h, keyer_features_and_options_fk_10.h, keyer_settings_fk_10.h
+      Support for FUNtronics FK-10 contributed by disneysw. HARDWARE_FK_10 in keyer_hardware.h; files: fk_10_keyer_pin_settings.h, fk_10_keyer_features_and_options.h, fk_10_keyer_settings.h
 
     2.2.2016121201
       Additional work on web interface
@@ -915,7 +915,7 @@ Recent Update History
 
     2018.04.22.01
       Added OPTION_BLINK_HI_ON_PTT - on units that lack a sidetone speaker, this will blink HI on the PTT line on boot up
-      Fixed issue in keyer_pin_settings_mortty.h
+      Fixed issue in mortty_keyer_pin_settings.h
       Added TX Inhibit and TX Pause status in Command Line Interface Status \S command
 
     2018.04.23.01
@@ -1008,7 +1008,7 @@ Recent Update History
 
     2019.02.05.01
       Fixed bug in command mode K command when in ultimatic mode (Thanks, Rich)
-      Under Development: FEATURE_SINEWAVE_SIDETONE_USING_TIMER_1 and FEATURE_SINEWAVE_SIDETONE_USING_TIMER_3 in keyer_features_and_options_test.h
+      Under Development: FEATURE_SINEWAVE_SIDETONE_USING_TIMER_1 and FEATURE_SINEWAVE_SIDETONE_USING_TIMER_3 in test_keyer_features_and_options.h
 
     2019.02.05.02
       Improvement in how K1EL Winkey emulation buffered speed command speed changing and clearing is handled
@@ -1188,7 +1188,7 @@ Recent Update History
 
     2020.03.07.01
       Added OPTION_WINKEY_PINCONFIG_PTT_CONTROLS_PTT_LINE - K1EL Winkeyer PTT setting activates/deactivates PTT line rather than controls buffered character PTT hold
-      TinyKeyer - OPTION_DISABLE_SERIAL_PORT_CHECKING_WHILE_SENDING_CW enabled by default for TinyKeyer (keyer_features_and_options_tinykeyer.h)
+      TinyKeyer - OPTION_DISABLE_SERIAL_PORT_CHECKING_WHILE_SENDING_CW enabled by default for TinyKeyer (tinykeyer_keyer_features_and_options.h)
 
     2020.03.07.02
       Command Line Interface - Added \] to disable and enable PTT
@@ -1386,7 +1386,7 @@ If you offer a hardware kit using this software, show your appreciation by sendi
 #define eeprom_magic_number 41               // you can change this number to have the unit re-initialize EEPROM
 
 #include <stdio.h>
-#include "keyer_hardware.h"
+#include "config_hardware.h"
 
 #if defined(ARDUINO_SAM_DUE)
   #include <SPI.h>
@@ -1409,49 +1409,49 @@ If you offer a hardware kit using this software, show your appreciation by sendi
 #endif //ARDUINO_SAM_DUE
 
 #if defined(HARDWARE_OPENCWKEYER_MK2)
-  #include "keyer_features_and_options_opencwkeyer_mk2.h"
+  #include "opencwkeyer_mk2_keyer_features_and_options.h"
 #elif defined(HARDWARE_NANOKEYER_REV_B)
-  #include "keyer_features_and_options_nanokeyer_rev_b.h"
+  #include "nanokeyer_rev_b_keyer_features_and_options.h"
 #elif defined(HARDWARE_NANOKEYER_REV_D)
-  #include "keyer_features_and_options_nanokeyer_rev_d.h"
+  #include "nanokeyer_rev_d_keyer_features_and_options.h"
 #elif defined(HARDWARE_OPEN_INTERFACE)
-  #include "keyer_features_and_options_open_interface.h"
+  #include "open_interface_keyer_features_and_options.h"
 #elif defined(HARDWARE_TINYKEYER)
-  #include "keyer_features_and_options_tinykeyer.h"
+  #include "tinykeyer_keyer_features_and_options.h"
 #elif defined(HARDWARE_FK_10)
-  #include "keyer_features_and_options_fk_10.h"
+  #include "fk_10_keyer_features_and_options.h"
 #elif defined(HARDWARE_FK_11)
-  #include "keyer_features_and_options_fk_11.h"
+  #include "fk_11_keyer_features_and_options.h"
 #elif defined(HARDWARE_MAPLE_MINI)//sp5iou 20180328
-  #include "keyer_features_and_options_maple_mini.h"
+  #include "maple_mini_keyer_features_and_options.h"
 #elif defined(HARDWARE_GENERIC_STM32F103C)//sp5iou 20180329
-  #include "keyer_features_and_options_generic_STM32F103C.h"
+  #include "generic_STM32F103C_keyer_features_and_options.h"
 #elif defined(HARDWARE_MORTTY)
-  #include "keyer_features_and_options_mortty.h"
+  #include "mortty_keyer_features_and_options.h"
 #elif defined(HARDWARE_MORTTY_REGULAR)
-  #include "keyer_features_and_options_mortty_regular.h"
+  #include "mortty_regular_keyer_features_and_options.h"
 #elif defined(HARDWARE_MORTTY_REGULAR_WITH_POTENTIOMETER)
-  #include "keyer_features_and_options_mortty_regular_with_potentiometer.h"
+  #include "mortty_regular_with_potentiometer_keyer_features_and_options.h"
 #elif defined(HARDWARE_MORTTY_SO2R)
-  #include "keyer_features_and_options_mortty_so2r.h"
+  #include "mortty_so2r_keyer_features_and_options.h"
 #elif defined(HARDWARE_MORTTY_SO2R_WITH_POTENTIOMETER)
-  #include "keyer_features_and_options_mortty_so2r_with_potentiometer.h"
+  #include "mortty_so2r_with_potentiometer_keyer_features_and_options.h"
 #elif defined(HARDWARE_K5BCQ)
-  #include "keyer_features_and_options_k5bcq.h"
+  #include "k5bcq_keyer_features_and_options.h"
 #elif defined(HARDWARE_MEGAKEYER)
-  #include "keyer_features_and_options_megakeyer.h"
+  #include "megakeyer_keyer_features_and_options.h"
 #elif defined(HARDWARE_TEST_EVERYTHING)
-  #include "keyer_features_and_options_test_everything.h"
+  #include "test_everything_keyer_features_and_options.h"
 #elif defined(HARDWARE_YAACWK)
-  #include "keyer_features_and_options_yaacwk.h"
+  #include "yaacwk_keyer_features_and_options.h"
 #elif defined(HARDWARE_TEST)
-  #include "keyer_features_and_options_test.h"
+  #include "test_keyer_features_and_options.h"
 #elif defined(HARDWARE_IZ3GME)
-  #include "keyer_features_and_options_iz3gme.h"
+  #include "iz3gme_keyer_features_and_options.h"
 #elif defined(HARDWARE_YCCC_SO2R_MINI)
-  #include "keyer_features_and_options_yccc_so2r_mini.h"
+  #include "yccc_so2r_mini_keyer_features_and_options.h"
 #else
-  #include "keyer_features_and_options.h"
+  #include "config_features_and_options.h"
 #endif
 
 #include "keyer.h"
@@ -1465,71 +1465,71 @@ If you offer a hardware kit using this software, show your appreciation by sendi
 #include "keyer_debug.h"
 
 #if defined(HARDWARE_OPENCWKEYER_MK2)
-  #include "keyer_pin_settings_opencwkeyer_mk2.h"
-  #include "keyer_settings_opencwkeyer_mk2.h"
+  #include "opencwkeyer_mk2_keyer_pin_settings.h"
+  #include "opencwkeyer_mk2_keyer_settings.h"
 #elif defined(HARDWARE_NANOKEYER_REV_B)
-  #include "keyer_pin_settings_nanokeyer_rev_b.h"
-  #include "keyer_settings_nanokeyer_rev_b.h"
+  #include "nanokeyer_rev_b_keyer_pin_settings.h"
+  #include "nanokeyer_rev_b_keyer_settings.h"
 #elif defined(HARDWARE_NANOKEYER_REV_D)
-  #include "keyer_pin_settings_nanokeyer_rev_d.h"
-  #include "keyer_settings_nanokeyer_rev_d.h"
+  #include "nanokeyer_rev_d_keyer_pin_settings.h"
+  #include "nanokeyer_rev_d_keyer_settings.h"
 #elif defined(HARDWARE_OPEN_INTERFACE)
-  #include "keyer_pin_settings_open_interface.h"
-  #include "keyer_settings_open_interface.h"
+  #include "open_interface_keyer_pin_settings.h"
+  #include "open_interface_keyer_settings.h"
 #elif defined(HARDWARE_TINYKEYER)
-  #include "keyer_pin_settings_tinykeyer.h"
-  #include "keyer_settings_tinykeyer.h"
+  #include "tinykeyer_keyer_pin_settings.h"
+  #include "tinykeyer_keyer_settings.h"
 #elif defined(HARDWARE_FK_10)
-  #include "keyer_pin_settings_fk_10.h"
-  #include "keyer_settings_fk_10.h"
+  #include "fk_10_keyer_pin_settings.h"
+  #include "fk_10_keyer_settings.h"
 #elif defined(HARDWARE_FK_11)
-  #include "keyer_pin_settings_fk_11.h"
-  #include "keyer_settings_fk_11.h"
+  #include "fk_11_keyer_pin_settings.h"
+  #include "fk_11_keyer_settings.h"
 #elif defined(HARDWARE_MAPLE_MINI)
-  #include "keyer_pin_settings_maple_mini.h"
-  #include "keyer_settings_maple_mini.h"
+  #include "maple_mini_keyer_pin_settings.h"
+  #include "maple_mini_keyer_settings.h"
 #elif defined(HARDWARE_GENERIC_STM32F103C)
-  #include "keyer_pin_settings_generic_STM32F103C.h"
-  #include "keyer_settings_generic_STM32F103C.h"
+  #include "generic_STM32F103C_keyer_pin_settings.h"
+  #include "generic_STM32F103C_keyer_settings.h"
 #elif defined(HARDWARE_MORTTY)
-  #include "keyer_pin_settings_mortty.h"
-  #include "keyer_settings_mortty.h"
+  #include "mortty_keyer_pin_settings.h"
+  #include "mortty_keyer_settings.h"
 #elif defined(HARDWARE_MORTTY_REGULAR)
-  #include "keyer_pin_settings_mortty_regular.h"
-  #include "keyer_settings_mortty_regular.h"
+  #include "mortty_regular_keyer_pin_settings.h"
+  #include "mortty_regular_keyer_settings.h"
 #elif defined(HARDWARE_MORTTY_REGULAR_WITH_POTENTIOMETER)
-  #include "keyer_pin_settings_mortty_regular_with_potentiometer.h"
-  #include "keyer_settings_mortty_regular_with_potentiometer.h"
+  #include "mortty_regular_with_potentiometer_keyer_pin_settings.h"
+  #include "mortty_regular_with_potentiometer_keyer_settings.h"
 #elif defined(HARDWARE_MORTTY_SO2R)
-  #include "keyer_pin_settings_mortty_so2r.h"
-  #include "keyer_settings_mortty_so2r.h"
+  #include "mortty_so2r_keyer_pin_settings.h"
+  #include "mortty_so2r_keyer_settings.h"
 #elif defined(HARDWARE_MORTTY_SO2R_WITH_POTENTIOMETER)
-  #include "keyer_pin_settings_mortty_so2r_with_potentiometer.h"
-  #include "keyer_settings_mortty_so2r_with_potentiometer.h"
+  #include "mortty_so2r_with_potentiometer_keyer_pin_settings.h"
+  #include "mortty_so2r_with_potentiometer_keyer_settings.h"
 #elif defined(HARDWARE_K5BCQ)
-  #include "keyer_pin_settings_k5bcq.h"
-  #include "keyer_settings_k5bcq.h"
+  #include "k5bcq_keyer_pin_settings.h"
+  #include "k5bcq_keyer_settings.h"
 #elif defined(HARDWARE_MEGAKEYER)
-  #include "keyer_pin_settings_megakeyer.h"
-  #include "keyer_settings_megakeyer.h"
+  #include "megakeyer_keyer_pin_settings.h"
+  #include "megakeyer_keyer_settings.h"
 #elif defined(HARDWARE_TEST_EVERYTHING)
-  #include "keyer_pin_settings_test_everything.h"
-  #include "keyer_settings_test_everything.h"
+  #include "test_everything_keyer_pin_settings.h"
+  #include "test_everything_keyer_settings.h"
 #elif defined(HARDWARE_YAACWK)
-  #include "keyer_pin_settings_yaacwk.h"
-  #include "keyer_settings_yaacwk.h"
+  #include "yaacwk_keyer_pin_settings.h"
+  #include "yaacwk_keyer_settings.h"
 #elif defined(HARDWARE_TEST)
-  #include "keyer_pin_settings_test.h"
-  #include "keyer_settings_test.h"
+  #include "test_keyer_pin_settings.h"
+  #include "test_keyer_settings.h"
 #elif defined(HARDWARE_IZ3GME)
-  #include "keyer_pin_settings_iz3gme.h"
-  #include "keyer_settings_iz3gme.h"
+  #include "iz3gme_keyer_pin_settings.h"
+  #include "iz3gme_keyer_settings.h"
 #elif defined(HARDWARE_YCCC_SO2R_MINI)
-  #include "keyer_pin_settings_yccc_so2r_mini.h"
-  #include "keyer_settings_yccc_so2r_mini.h"
+  #include "yccc_so2r_mini_keyer_pin_settings.h"
+  #include "yccc_so2r_mini_keyer_settings.h"
 #else
-  #include "keyer_pin_settings.h"
-  #include "keyer_settings.h"
+  #include "config_pin_settings.h"
+  #include "config_settings.h"
 #endif
 
 #if (paddle_left == 0) || (paddle_right == 0)
diff --git a/k3ng_keyer/keyer_features_and_options_k5bcq.h b/k3ng_keyer/k5bcq_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_k5bcq.h
rename to k3ng_keyer/k5bcq_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_k5bcq.h b/k3ng_keyer/k5bcq_keyer_pin_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_k5bcq.h
rename to k3ng_keyer/k5bcq_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_k5bcq.h b/k3ng_keyer/k5bcq_keyer_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings_k5bcq.h
rename to k3ng_keyer/k5bcq_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_maple_mini.h b/k3ng_keyer/maple_mini_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_maple_mini.h
rename to k3ng_keyer/maple_mini_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_maple_mini.h b/k3ng_keyer/maple_mini_keyer_pin_settings.h
old mode 100755
new mode 100644
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_maple_mini.h
rename to k3ng_keyer/maple_mini_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_maple_mini.h b/k3ng_keyer/maple_mini_keyer_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings_maple_mini.h
rename to k3ng_keyer/maple_mini_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_megakeyer.h b/k3ng_keyer/megakeyer_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_megakeyer.h
rename to k3ng_keyer/megakeyer_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_megakeyer.h b/k3ng_keyer/megakeyer_keyer_pin_settings.h
old mode 100755
new mode 100644
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_megakeyer.h
rename to k3ng_keyer/megakeyer_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_megakeyer.h b/k3ng_keyer/megakeyer_keyer_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings_megakeyer.h
rename to k3ng_keyer/megakeyer_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_mortty.h b/k3ng_keyer/mortty_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_mortty.h
rename to k3ng_keyer/mortty_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_mortty.h b/k3ng_keyer/mortty_keyer_pin_settings.h
old mode 100755
new mode 100644
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_mortty.h
rename to k3ng_keyer/mortty_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_mortty.h b/k3ng_keyer/mortty_keyer_settings.h
old mode 100755
new mode 100644
similarity index 100%
rename from k3ng_keyer/keyer_settings_mortty.h
rename to k3ng_keyer/mortty_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_mortty_regular.h b/k3ng_keyer/mortty_regular_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_mortty_regular.h
rename to k3ng_keyer/mortty_regular_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_mortty_regular.h b/k3ng_keyer/mortty_regular_keyer_pin_settings.h
old mode 100755
new mode 100644
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_mortty_regular.h
rename to k3ng_keyer/mortty_regular_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_mortty_regular.h b/k3ng_keyer/mortty_regular_keyer_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings_mortty_regular.h
rename to k3ng_keyer/mortty_regular_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_mortty_regular_with_potentiometer.h b/k3ng_keyer/mortty_regular_with_potentiometer_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_mortty_regular_with_potentiometer.h
rename to k3ng_keyer/mortty_regular_with_potentiometer_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_mortty_regular_with_potentiometer.h b/k3ng_keyer/mortty_regular_with_potentiometer_keyer_pin_settings.h
old mode 100755
new mode 100644
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_mortty_regular_with_potentiometer.h
rename to k3ng_keyer/mortty_regular_with_potentiometer_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_mortty_regular_with_potentiometer.h b/k3ng_keyer/mortty_regular_with_potentiometer_keyer_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings_mortty_regular_with_potentiometer.h
rename to k3ng_keyer/mortty_regular_with_potentiometer_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_mortty_so2r.h b/k3ng_keyer/mortty_so2r_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_mortty_so2r.h
rename to k3ng_keyer/mortty_so2r_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_mortty_so2r.h b/k3ng_keyer/mortty_so2r_keyer_pin_settings.h
old mode 100755
new mode 100644
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_mortty_so2r.h
rename to k3ng_keyer/mortty_so2r_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_mortty_so2r.h b/k3ng_keyer/mortty_so2r_keyer_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings_mortty_so2r.h
rename to k3ng_keyer/mortty_so2r_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_mortty_so2r_with_potentiometer.h b/k3ng_keyer/mortty_so2r_with_potentiometer_keyer_features_and_options.h
old mode 100755
new mode 100644
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_mortty_so2r_with_potentiometer.h
rename to k3ng_keyer/mortty_so2r_with_potentiometer_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_mortty_so2r_with_potentiometer.h b/k3ng_keyer/mortty_so2r_with_potentiometer_keyer_pin_settings.h
old mode 100755
new mode 100644
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_mortty_so2r_with_potentiometer.h
rename to k3ng_keyer/mortty_so2r_with_potentiometer_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_mortty_so2r_with_potentiometer.h b/k3ng_keyer/mortty_so2r_with_potentiometer_keyer_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings_mortty_so2r_with_potentiometer.h
rename to k3ng_keyer/mortty_so2r_with_potentiometer_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_nanokeyer_rev_b.h b/k3ng_keyer/nanokeyer_rev_b_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_nanokeyer_rev_b.h
rename to k3ng_keyer/nanokeyer_rev_b_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_nanokeyer_rev_b.h b/k3ng_keyer/nanokeyer_rev_b_keyer_pin_settings.h
old mode 100755
new mode 100644
similarity index 97%
rename from k3ng_keyer/keyer_pin_settings_nanokeyer_rev_b.h
rename to k3ng_keyer/nanokeyer_rev_b_keyer_pin_settings.h
index 5fb88ce4..e54e169d
--- a/k3ng_keyer/keyer_pin_settings_nanokeyer_rev_b.h
+++ b/k3ng_keyer/nanokeyer_rev_b_keyer_pin_settings.h
@@ -1,99 +1,99 @@
-#ifndef keyer_pin_settings_h
-#define keyer_pin_settings_h
-
-#define paddle_left 2
-#define paddle_right 5
-#define tx_key_line_1 11        // (high = key down/tx on)
-#define tx_key_line_2 13        // Rev A & B nanoKeyer PTT port
-#define tx_key_line_3 0
-#define tx_key_line_4 0
-#define tx_key_line_5 0
-#define tx_key_line_6 0
-#define sidetone_line 4         // connect a speaker for sidetone
-#define potentiometer A7        // Rev A & B nanoKeyer
-#define ptt_tx_1 0              // PTT ("push to talk") lines
-//#define ptt_tx_1 13           // nanoKeyer PTT port
-#define ptt_tx_2 0              // Can be used for keying fox transmitter, T/R switch, or keying slow boatanchors
-#define ptt_tx_3 0              // These are optional - set to 0 if unused
-#define ptt_tx_4 0
-#define ptt_tx_5 0
-#define ptt_tx_6 0
-#define analog_buttons_pin A6   // Rev A & B nanokeyer
-#define lcd_rs A2
-#define lcd_enable 10
-#define lcd_d4 6
-#define lcd_d5 7
-#define lcd_d6 8
-#define lcd_d7 9
-#define ps2_keyboard_data A5    // Rev A & B nanokeyer
-#define ps2_keyboard_clock 3
-#define tx_key_dit 0            // if defined, goes active for dit (any transmitter) - customized with tx_key_dit_and_dah_pins_active_state and tx_key_dit_and_dah_pins_inactive_state
-#define tx_key_dah 0            // if defined, goes active for dah (any transmitter) - customized with tx_key_dit_and_dah_pins_active_state and tx_key_dit_and_dah_pins_inactive_state
-
-#define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
-
-#if defined(FEATURE_SLEEP)
-  #define keyer_awake 13       // Goes active when keyer is awake, inactive when in sleep mode; change active and inactive states in keyer_settings file
-#endif
-
-#if defined(FEATURE_LCD_BACKLIGHT_AUTO_DIM)
-  #define keyer_power_led 0   // must be a PWM-capable pin
-#endif
-
-#if defined(FEATURE_CAPACITIVE_PADDLE_PINS)
-  #define capactive_paddle_pin_inhibit_pin 0     // if this pin is defined and is set high, the capacitive paddle pins will switch to normal (non-capacitive) sensing mode
-#endif
-
-/*
-FEATURE_SIDETONE_SWITCH
-  Enabling this feature and an external toggle switch  adds switch control for playing cw sidetone.
-  ST Switch status is displayed in the status command.  This feature will override the software control of the sidetone (\o).
-  Arduino pin is assigned by SIDETONE_SWITCH 
-*/
-
-#ifdef FEATURE_SIDETONE_SWITCH
-  #define SIDETONE_SWITCH 8
-#endif //FEATURE_SIDETONE_SWITCH
-
-#ifdef FEATURE_4x4_KEYPAD
-  #define Row3 33
-  #define Row2 32
-  #define Row1 31
-  #define Row0 30
-  #define Col3 37
-  #define Col2 36
-  #define Col1 35
-  #define Col0 34
-#endif
-
-#ifdef FEATURE_3x4_KEYPAD
-  #define Row3 33
-  #define Row2 32
-  #define Row1 31
-  #define Row0 30
-  #define Col2 36
-  #define Col1 35
-  #define Col0 34
-#endif
-
-#ifdef FEATURE_SEQUENCER
-  #define sequencer_1_pin 0
-  #define sequencer_2_pin 0
-  #define sequencer_3_pin 0
-  #define sequencer_4_pin 0
-  #define sequencer_5_pin 0
-#endif //FEATURE_SEQUENCER
-
-#define ptt_input_pin 0
-
-#define tx_inhibit_pin 0
-#define tx_pause_pin 0   
-
-#define pin_sending_mode_automatic 0  // goes HIGH when keyer is sending code automatically
-#define pin_sending_mode_manual 0     // goes HIGH when keyer is sending code manually (i.e. the paddle or straight key)
-
-#else
-
-  #error "Multiple pin_settings.h files included somehow..."
-
+#ifndef keyer_pin_settings_h
+#define keyer_pin_settings_h
+
+#define paddle_left 2
+#define paddle_right 5
+#define tx_key_line_1 11        // (high = key down/tx on)
+#define tx_key_line_2 13        // Rev A & B nanoKeyer PTT port
+#define tx_key_line_3 0
+#define tx_key_line_4 0
+#define tx_key_line_5 0
+#define tx_key_line_6 0
+#define sidetone_line 4         // connect a speaker for sidetone
+#define potentiometer A7        // Rev A & B nanoKeyer
+#define ptt_tx_1 0              // PTT ("push to talk") lines
+//#define ptt_tx_1 13           // nanoKeyer PTT port
+#define ptt_tx_2 0              // Can be used for keying fox transmitter, T/R switch, or keying slow boatanchors
+#define ptt_tx_3 0              // These are optional - set to 0 if unused
+#define ptt_tx_4 0
+#define ptt_tx_5 0
+#define ptt_tx_6 0
+#define analog_buttons_pin A6   // Rev A & B nanokeyer
+#define lcd_rs A2
+#define lcd_enable 10
+#define lcd_d4 6
+#define lcd_d5 7
+#define lcd_d6 8
+#define lcd_d7 9
+#define ps2_keyboard_data A5    // Rev A & B nanokeyer
+#define ps2_keyboard_clock 3
+#define tx_key_dit 0            // if defined, goes active for dit (any transmitter) - customized with tx_key_dit_and_dah_pins_active_state and tx_key_dit_and_dah_pins_inactive_state
+#define tx_key_dah 0            // if defined, goes active for dah (any transmitter) - customized with tx_key_dit_and_dah_pins_active_state and tx_key_dit_and_dah_pins_inactive_state
+
+#define potentiometer_enable_pin 0  // if defined, the potentiometer will be enabled only when this pin is held low; set to 0 to ignore this pin
+
+#if defined(FEATURE_SLEEP)
+  #define keyer_awake 13       // Goes active when keyer is awake, inactive when in sleep mode; change active and inactive states in keyer_settings file
+#endif
+
+#if defined(FEATURE_LCD_BACKLIGHT_AUTO_DIM)
+  #define keyer_power_led 0   // must be a PWM-capable pin
+#endif
+
+#if defined(FEATURE_CAPACITIVE_PADDLE_PINS)
+  #define capactive_paddle_pin_inhibit_pin 0     // if this pin is defined and is set high, the capacitive paddle pins will switch to normal (non-capacitive) sensing mode
+#endif
+
+/*
+FEATURE_SIDETONE_SWITCH
+  Enabling this feature and an external toggle switch  adds switch control for playing cw sidetone.
+  ST Switch status is displayed in the status command.  This feature will override the software control of the sidetone (\o).
+  Arduino pin is assigned by SIDETONE_SWITCH 
+*/
+
+#ifdef FEATURE_SIDETONE_SWITCH
+  #define SIDETONE_SWITCH 8
+#endif //FEATURE_SIDETONE_SWITCH
+
+#ifdef FEATURE_4x4_KEYPAD
+  #define Row3 33
+  #define Row2 32
+  #define Row1 31
+  #define Row0 30
+  #define Col3 37
+  #define Col2 36
+  #define Col1 35
+  #define Col0 34
+#endif
+
+#ifdef FEATURE_3x4_KEYPAD
+  #define Row3 33
+  #define Row2 32
+  #define Row1 31
+  #define Row0 30
+  #define Col2 36
+  #define Col1 35
+  #define Col0 34
+#endif
+
+#ifdef FEATURE_SEQUENCER
+  #define sequencer_1_pin 0
+  #define sequencer_2_pin 0
+  #define sequencer_3_pin 0
+  #define sequencer_4_pin 0
+  #define sequencer_5_pin 0
+#endif //FEATURE_SEQUENCER
+
+#define ptt_input_pin 0
+
+#define tx_inhibit_pin 0
+#define tx_pause_pin 0   
+
+#define pin_sending_mode_automatic 0  // goes HIGH when keyer is sending code automatically
+#define pin_sending_mode_manual 0     // goes HIGH when keyer is sending code manually (i.e. the paddle or straight key)
+
+#else
+
+  #error "Multiple pin_settings.h files included somehow..."
+
 #endif //keyer_pin_settings_h
\ No newline at end of file
diff --git a/k3ng_keyer/keyer_settings_nanokeyer_rev_b.h b/k3ng_keyer/nanokeyer_rev_b_keyer_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings_nanokeyer_rev_b.h
rename to k3ng_keyer/nanokeyer_rev_b_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_nanokeyer_rev_d.h b/k3ng_keyer/nanokeyer_rev_d_keyer_features_and_options.h
old mode 100755
new mode 100644
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_nanokeyer_rev_d.h
rename to k3ng_keyer/nanokeyer_rev_d_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_nanokeyer_rev_d.h b/k3ng_keyer/nanokeyer_rev_d_keyer_pin_settings.h
old mode 100755
new mode 100644
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_nanokeyer_rev_d.h
rename to k3ng_keyer/nanokeyer_rev_d_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_nanokeyer_rev_d.h b/k3ng_keyer/nanokeyer_rev_d_keyer_settings.h
old mode 100755
new mode 100644
similarity index 100%
rename from k3ng_keyer/keyer_settings_nanokeyer_rev_d.h
rename to k3ng_keyer/nanokeyer_rev_d_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_open_interface.h b/k3ng_keyer/open_interface_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_open_interface.h
rename to k3ng_keyer/open_interface_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_open_interface.h b/k3ng_keyer/open_interface_keyer_pin_settings.h
old mode 100755
new mode 100644
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_open_interface.h
rename to k3ng_keyer/open_interface_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_open_interface.h b/k3ng_keyer/open_interface_keyer_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings_open_interface.h
rename to k3ng_keyer/open_interface_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_opencwkeyer_mk2.h b/k3ng_keyer/opencwkeyer_mk2_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_opencwkeyer_mk2.h
rename to k3ng_keyer/opencwkeyer_mk2_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_opencwkeyer_mk2.h b/k3ng_keyer/opencwkeyer_mk2_keyer_pin_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_opencwkeyer_mk2.h
rename to k3ng_keyer/opencwkeyer_mk2_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_opencwkeyer_mk2.h b/k3ng_keyer/opencwkeyer_mk2_keyer_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings_opencwkeyer_mk2.h
rename to k3ng_keyer/opencwkeyer_mk2_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_test_everything.h b/k3ng_keyer/test_everything_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_test_everything.h
rename to k3ng_keyer/test_everything_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_test_everything.h b/k3ng_keyer/test_everything_keyer_pin_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_test_everything.h
rename to k3ng_keyer/test_everything_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_test_everything.h b/k3ng_keyer/test_everything_keyer_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings_test_everything.h
rename to k3ng_keyer/test_everything_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_test.h b/k3ng_keyer/test_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_test.h
rename to k3ng_keyer/test_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_test.h b/k3ng_keyer/test_keyer_pin_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_test.h
rename to k3ng_keyer/test_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_test.h b/k3ng_keyer/test_keyer_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings_test.h
rename to k3ng_keyer/test_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_tinykeyer.h b/k3ng_keyer/tinykeyer_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_tinykeyer.h
rename to k3ng_keyer/tinykeyer_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_tinykeyer.h b/k3ng_keyer/tinykeyer_keyer_pin_settings.h
old mode 100755
new mode 100644
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_tinykeyer.h
rename to k3ng_keyer/tinykeyer_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_tinykeyer.h b/k3ng_keyer/tinykeyer_keyer_settings.h
old mode 100755
new mode 100644
similarity index 100%
rename from k3ng_keyer/keyer_settings_tinykeyer.h
rename to k3ng_keyer/tinykeyer_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_yaacwk.h b/k3ng_keyer/yaacwk_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_yaacwk.h
rename to k3ng_keyer/yaacwk_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_yaacwk.h b/k3ng_keyer/yaacwk_keyer_pin_settings.h
old mode 100755
new mode 100644
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_yaacwk.h
rename to k3ng_keyer/yaacwk_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_yaacwk.h b/k3ng_keyer/yaacwk_keyer_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings_yaacwk.h
rename to k3ng_keyer/yaacwk_keyer_settings.h
diff --git a/k3ng_keyer/keyer_features_and_options_yccc_so2r_mini.h b/k3ng_keyer/yccc_so2r_mini_keyer_features_and_options.h
similarity index 100%
rename from k3ng_keyer/keyer_features_and_options_yccc_so2r_mini.h
rename to k3ng_keyer/yccc_so2r_mini_keyer_features_and_options.h
diff --git a/k3ng_keyer/keyer_pin_settings_yccc_so2r_mini.h b/k3ng_keyer/yccc_so2r_mini_keyer_pin_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_pin_settings_yccc_so2r_mini.h
rename to k3ng_keyer/yccc_so2r_mini_keyer_pin_settings.h
diff --git a/k3ng_keyer/keyer_settings_yccc_so2r_mini.h b/k3ng_keyer/yccc_so2r_mini_keyer_settings.h
similarity index 100%
rename from k3ng_keyer/keyer_settings_yccc_so2r_mini.h
rename to k3ng_keyer/yccc_so2r_mini_keyer_settings.h