From 9bb259b660925c7a5cd64b3a0a4484cdf757b504 Mon Sep 17 00:00:00 2001
From: skullY <skullydazed@gmail.com>
Date: Sat, 21 Oct 2017 13:51:02 -0700
Subject: [PATCH] Fix the naming for clueboard files

---
 docs/contributing.md                                   | 2 +-
 keyboards/clueboard/17/{clueboard_17.c => 17.c}        | 2 +-
 keyboards/clueboard/17/{clueboard_17.h => 17.h}        | 0
 keyboards/clueboard/17/keymaps/default/keymap.c        | 2 +-
 keyboards/clueboard/60/{clueboard_60.c => 60.c}        | 2 +-
 keyboards/clueboard/60/{clueboard_60.h => 60.h}        | 0
 keyboards/clueboard/60/keymaps/default/keymap.c        | 2 +-
 keyboards/clueboard/60/keymaps/default_aek/keymap.c    | 2 +-
 keyboards/clueboard/66/66.c                            | 1 +
 keyboards/clueboard/66/{clueboard_66.h => 66.h}        | 0
 keyboards/clueboard/66/clueboard_66.c                  | 1 -
 keyboards/clueboard/66/keymaps/bloodlvst/keymap.c      | 2 +-
 keyboards/clueboard/66/keymaps/caps_fn/keymap.c        | 2 +-
 keyboards/clueboard/66/keymaps/colemak/keymap.c        | 2 +-
 keyboards/clueboard/66/keymaps/default/keymap.c        | 2 +-
 keyboards/clueboard/66/keymaps/jokrik/keymap.c         | 2 +-
 keyboards/clueboard/66/keymaps/mac_optimized/keymap.c  | 2 +-
 keyboards/clueboard/66/keymaps/magicmonty/keymap.c     | 2 +-
 keyboards/clueboard/66/keymaps/maximised/keymap.c      | 2 +-
 keyboards/clueboard/66/keymaps/mouse_keys/keymap.c     | 2 +-
 keyboards/clueboard/66/keymaps/serubin/keymap.c        | 2 +-
 keyboards/clueboard/66/keymaps/shift_fn/keymap.c       | 2 +-
 keyboards/clueboard/66/keymaps/skully/keymap.c         | 2 +-
 keyboards/clueboard/66/keymaps/smt/keymap.c            | 2 +-
 keyboards/clueboard/66/keymaps/tetris/keymap.c         | 2 +-
 keyboards/clueboard/66/keymaps/unix_optimized/keymap.c | 2 +-
 keyboards/clueboard/66/keymaps/win_optimized/keymap.c  | 2 +-
 keyboards/clueboard/66/keymaps/xyverz/keymap.c         | 2 +-
 keyboards/clueboard/66/rev1/rev1.h                     | 2 +-
 keyboards/clueboard/66/rev2/rev2.h                     | 2 +-
 keyboards/clueboard/66/rev3/rev3.h                     | 2 +-
 keyboards/clueboard/card/{cluecard.c => card.c}        | 2 +-
 keyboards/clueboard/card/{cluecard.h => card.h}        | 0
 keyboards/clueboard/card/keymaps/default/keymap.c      | 2 +-
 keyboards/clueboard/card/keymaps/rgb_effects/keymap.c  | 2 +-
 35 files changed, 30 insertions(+), 30 deletions(-)
 rename keyboards/clueboard/17/{clueboard_17.c => 17.c} (97%)
 rename keyboards/clueboard/17/{clueboard_17.h => 17.h} (100%)
 rename keyboards/clueboard/60/{clueboard_60.c => 60.c} (96%)
 rename keyboards/clueboard/60/{clueboard_60.h => 60.h} (100%)
 create mode 100644 keyboards/clueboard/66/66.c
 rename keyboards/clueboard/66/{clueboard_66.h => 66.h} (100%)
 delete mode 100644 keyboards/clueboard/66/clueboard_66.c
 rename keyboards/clueboard/card/{cluecard.c => card.c} (98%)
 rename keyboards/clueboard/card/{cluecard.h => card.h} (100%)

diff --git a/docs/contributing.md b/docs/contributing.md
index 755dd012f3ca..58af8ce53b17 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -80,7 +80,7 @@ We have a few different types of changes in QMK, each requiring a different leve
 * Make sure your code change actually compiles.
   * Keymaps: Make sure that `make keyboard:your_new_keymap` does not return an error
   * Keyboards: Make sure that `make keyboard:all` does not return any errors
-  * Core: Make sure that `make allkb` does not return any errors.
+  * Core: Make sure that `make all` does not return any errors.
 * Make sure commit messages are understandable on their own. You should put a short description (no more than 70 characters) on the first line, the second line should be empty, and on the 3rd and later lines you should describe your commit in detail, if required. Example:
 
 ```
diff --git a/keyboards/clueboard/17/clueboard_17.c b/keyboards/clueboard/17/17.c
similarity index 97%
rename from keyboards/clueboard/17/clueboard_17.c
rename to keyboards/clueboard/17/17.c
index 04cc81217803..f84e3253e9c6 100644
--- a/keyboards/clueboard/17/clueboard_17.c
+++ b/keyboards/clueboard/17/17.c
@@ -1,4 +1,4 @@
-#include "clueboard_17.h"
+#include "17.h"
 
 int pwm_level;
 
diff --git a/keyboards/clueboard/17/clueboard_17.h b/keyboards/clueboard/17/17.h
similarity index 100%
rename from keyboards/clueboard/17/clueboard_17.h
rename to keyboards/clueboard/17/17.h
diff --git a/keyboards/clueboard/17/keymaps/default/keymap.c b/keyboards/clueboard/17/keymaps/default/keymap.c
index 7a0d51851508..e8f3525a869f 100644
--- a/keyboards/clueboard/17/keymaps/default/keymap.c
+++ b/keyboards/clueboard/17/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_17.h"
+#include "17.h"
 
 #include "backlight.h"
 
diff --git a/keyboards/clueboard/60/clueboard_60.c b/keyboards/clueboard/60/60.c
similarity index 96%
rename from keyboards/clueboard/60/clueboard_60.c
rename to keyboards/clueboard/60/60.c
index a0b74db72fe2..aac4e94c3daa 100644
--- a/keyboards/clueboard/60/clueboard_60.c
+++ b/keyboards/clueboard/60/60.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "clueboard_60.h"
+#include "60.h"
 
 void matrix_init_kb(void) {
 
diff --git a/keyboards/clueboard/60/clueboard_60.h b/keyboards/clueboard/60/60.h
similarity index 100%
rename from keyboards/clueboard/60/clueboard_60.h
rename to keyboards/clueboard/60/60.h
diff --git a/keyboards/clueboard/60/keymaps/default/keymap.c b/keyboards/clueboard/60/keymaps/default/keymap.c
index e662057f086f..1b0c71264097 100644
--- a/keyboards/clueboard/60/keymaps/default/keymap.c
+++ b/keyboards/clueboard/60/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_60.h"
+#include "60.h"
 
 #define _______ KC_TRNS
 
diff --git a/keyboards/clueboard/60/keymaps/default_aek/keymap.c b/keyboards/clueboard/60/keymaps/default_aek/keymap.c
index d2d3db7720e8..63b1d8ba2e6b 100644
--- a/keyboards/clueboard/60/keymaps/default_aek/keymap.c
+++ b/keyboards/clueboard/60/keymaps/default_aek/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_60.h"
+#include "60.h"
 
 #define _______ KC_TRNS
 
diff --git a/keyboards/clueboard/66/66.c b/keyboards/clueboard/66/66.c
new file mode 100644
index 000000000000..15d7422f1866
--- /dev/null
+++ b/keyboards/clueboard/66/66.c
@@ -0,0 +1 @@
+#include "66.h"
diff --git a/keyboards/clueboard/66/clueboard_66.h b/keyboards/clueboard/66/66.h
similarity index 100%
rename from keyboards/clueboard/66/clueboard_66.h
rename to keyboards/clueboard/66/66.h
diff --git a/keyboards/clueboard/66/clueboard_66.c b/keyboards/clueboard/66/clueboard_66.c
deleted file mode 100644
index 1e000e62dea7..000000000000
--- a/keyboards/clueboard/66/clueboard_66.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "clueboard_66.h"
diff --git a/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c b/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
index bc50afa2f247..d23b4cb84634 100644
--- a/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
+++ b/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/caps_fn/keymap.c b/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
index 78eb43390e7d..4a5fa72db1d8 100644
--- a/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
+++ b/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/colemak/keymap.c b/keyboards/clueboard/66/keymaps/colemak/keymap.c
index b2921cca242c..4759823e8a24 100644
--- a/keyboards/clueboard/66/keymaps/colemak/keymap.c
+++ b/keyboards/clueboard/66/keymaps/colemak/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/default/keymap.c b/keyboards/clueboard/66/keymaps/default/keymap.c
index ad623c548003..869165392060 100644
--- a/keyboards/clueboard/66/keymaps/default/keymap.c
+++ b/keyboards/clueboard/66/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/jokrik/keymap.c b/keyboards/clueboard/66/keymaps/jokrik/keymap.c
index dd38e904c212..9b03ae3ad5f4 100644
--- a/keyboards/clueboard/66/keymaps/jokrik/keymap.c
+++ b/keyboards/clueboard/66/keymaps/jokrik/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c b/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
index 8c3568e5930e..8f54a7bea91c 100644
--- a/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
index 6df7d7869708..66915de1be3b 100644
--- a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
+++ b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/maximised/keymap.c b/keyboards/clueboard/66/keymaps/maximised/keymap.c
index 260f97477333..bf577d1aaf4f 100644
--- a/keyboards/clueboard/66/keymaps/maximised/keymap.c
+++ b/keyboards/clueboard/66/keymaps/maximised/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c b/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
index 15e068aa1486..e3422a5a6ba0 100644
--- a/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
+++ b/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/serubin/keymap.c b/keyboards/clueboard/66/keymaps/serubin/keymap.c
index 112670d662be..1c9f21d42720 100644
--- a/keyboards/clueboard/66/keymaps/serubin/keymap.c
+++ b/keyboards/clueboard/66/keymaps/serubin/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/shift_fn/keymap.c b/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
index 0d57e38a10bb..cf6223efbab1 100644
--- a/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
+++ b/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/skully/keymap.c b/keyboards/clueboard/66/keymaps/skully/keymap.c
index 2e23948b2301..8ec2bed077f7 100644
--- a/keyboards/clueboard/66/keymaps/skully/keymap.c
+++ b/keyboards/clueboard/66/keymaps/skully/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/smt/keymap.c b/keyboards/clueboard/66/keymaps/smt/keymap.c
index c61b32f8b6c9..095623ccc80a 100644
--- a/keyboards/clueboard/66/keymaps/smt/keymap.c
+++ b/keyboards/clueboard/66/keymaps/smt/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
diff --git a/keyboards/clueboard/66/keymaps/tetris/keymap.c b/keyboards/clueboard/66/keymaps/tetris/keymap.c
index 4bf2465a9fd2..4eeb719f92c4 100644
--- a/keyboards/clueboard/66/keymaps/tetris/keymap.c
+++ b/keyboards/clueboard/66/keymaps/tetris/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 #include "tetris_text.h"
 
 // Helpful defines
diff --git a/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c b/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
index dab959bdc7e2..91f5250c7e8f 100644
--- a/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/win_optimized/keymap.c b/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
index fb83aaa24ce7..83c9a6716c21 100644
--- a/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
+++ b/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
@@ -1,4 +1,4 @@
-#include "clueboard_66.h"
+#include "66.h"
 
 // Helpful defines
 #define _______ KC_TRNS
diff --git a/keyboards/clueboard/66/keymaps/xyverz/keymap.c b/keyboards/clueboard/66/keymaps/xyverz/keymap.c
index b725b11dd77c..d7093f0a3c84 100644
--- a/keyboards/clueboard/66/keymaps/xyverz/keymap.c
+++ b/keyboards/clueboard/66/keymaps/xyverz/keymap.c
@@ -1,7 +1,7 @@
 // Xyverz' keymap.
 // It's based on the default keymap, but Dvorak!
 
-#include "clueboard_66.h"
+#include "66.h"
 
 // Used for SHIFT_ESC
 #define MODS_CTRL_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
diff --git a/keyboards/clueboard/66/rev1/rev1.h b/keyboards/clueboard/66/rev1/rev1.h
index cc94085f9292..ca54df1ec2a3 100644
--- a/keyboards/clueboard/66/rev1/rev1.h
+++ b/keyboards/clueboard/66/rev1/rev1.h
@@ -1,7 +1,7 @@
 #ifndef REV1_H
 #define REV1_H
 
-#include "../clueboard_66.h"
+#include "../66.h"
 
 /* Clueboard matrix layout
  * ,-----------------------------------------------------------.  ,---.
diff --git a/keyboards/clueboard/66/rev2/rev2.h b/keyboards/clueboard/66/rev2/rev2.h
index da7ce500f9e8..9a1b7271987d 100644
--- a/keyboards/clueboard/66/rev2/rev2.h
+++ b/keyboards/clueboard/66/rev2/rev2.h
@@ -1,7 +1,7 @@
 #ifndef REV2_H
 #define REV2_H
 
-#include "clueboard_66.h"
+#include "66.h"
 
 /* Clueboard matrix layout
  * ,-----------------------------------------------------------.  ,---.
diff --git a/keyboards/clueboard/66/rev3/rev3.h b/keyboards/clueboard/66/rev3/rev3.h
index 7fd243c80920..9f3cdb10509a 100644
--- a/keyboards/clueboard/66/rev3/rev3.h
+++ b/keyboards/clueboard/66/rev3/rev3.h
@@ -1,7 +1,7 @@
 #ifndef REV3_H
 #define REV3_H
 
-#include "clueboard_66.h"
+#include "66.h"
 
 /* Clueboard matrix layout
  * ,-----------------------------------------------------------.  ,---.
diff --git a/keyboards/clueboard/card/cluecard.c b/keyboards/clueboard/card/card.c
similarity index 98%
rename from keyboards/clueboard/card/cluecard.c
rename to keyboards/clueboard/card/card.c
index 81db252d2805..9b4b397d9251 100644
--- a/keyboards/clueboard/card/cluecard.c
+++ b/keyboards/clueboard/card/card.c
@@ -1,4 +1,4 @@
-#include "cluecard.h"
+#include "card.h"
 #define BL_RED OCR1B
 #define BL_GREEN OCR1A
 #define BL_BLUE OCR1C
diff --git a/keyboards/clueboard/card/cluecard.h b/keyboards/clueboard/card/card.h
similarity index 100%
rename from keyboards/clueboard/card/cluecard.h
rename to keyboards/clueboard/card/card.h
diff --git a/keyboards/clueboard/card/keymaps/default/keymap.c b/keyboards/clueboard/card/keymaps/default/keymap.c
index cd87750a8149..5fa6ae20a933 100644
--- a/keyboards/clueboard/card/keymaps/default/keymap.c
+++ b/keyboards/clueboard/card/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "cluecard.h"
+#include "card.h"
 #ifdef AUDIO_ENABLE
 	#include "audio.h"
 #endif
diff --git a/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c b/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c
index 74c95ce8a83a..15cf5325d034 100644
--- a/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c
+++ b/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c
@@ -1,4 +1,4 @@
-#include "cluecard.h"
+#include "card.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = KEYMAP(