diff --git a/keyboards/simontester/Makefile b/keyboards/clueboard4/Makefile
similarity index 100%
rename from keyboards/simontester/Makefile
rename to keyboards/clueboard4/Makefile
diff --git a/keyboards/simontester/boards/GENERIC_STM32_F04/board.c b/keyboards/clueboard4/boards/GENERIC_STM32_F04/board.c
similarity index 100%
rename from keyboards/simontester/boards/GENERIC_STM32_F04/board.c
rename to keyboards/clueboard4/boards/GENERIC_STM32_F04/board.c
diff --git a/keyboards/simontester/boards/GENERIC_STM32_F04/board.h b/keyboards/clueboard4/boards/GENERIC_STM32_F04/board.h
similarity index 100%
rename from keyboards/simontester/boards/GENERIC_STM32_F04/board.h
rename to keyboards/clueboard4/boards/GENERIC_STM32_F04/board.h
diff --git a/keyboards/simontester/boards/GENERIC_STM32_F04/board.mk b/keyboards/clueboard4/boards/GENERIC_STM32_F04/board.mk
similarity index 100%
rename from keyboards/simontester/boards/GENERIC_STM32_F04/board.mk
rename to keyboards/clueboard4/boards/GENERIC_STM32_F04/board.mk
diff --git a/keyboards/simontester/boards/GENERIC_STM32_F04/cfg/board.chcfg b/keyboards/clueboard4/boards/GENERIC_STM32_F04/cfg/board.chcfg
similarity index 98%
rename from keyboards/simontester/boards/GENERIC_STM32_F04/cfg/board.chcfg
rename to keyboards/clueboard4/boards/GENERIC_STM32_F04/cfg/board.chcfg
index f0f3082f..946bdf03 100644
--- a/keyboards/simontester/boards/GENERIC_STM32_F04/cfg/board.chcfg
+++ b/keyboards/clueboard4/boards/GENERIC_STM32_F04/cfg/board.chcfg
@@ -8,8 +8,8 @@
     <output_path>..</output_path>
     <hal_version>3.0.x</hal_version>
   </configuration_settings>
-  <board_name>Clueboard SimonTester</board_name>
-  <board_id>CB_SIMONTESTER</board_id>
+  <board_name>Clueboard4</board_name>
+  <board_id>CLUEBOARD4</board_id>
   <board_functions></board_functions>
   <subtype>STM32F042G</subtype>
   <clocks HSEFrequency="0" HSEBypass="true" LSEFrequency="0"
diff --git a/keyboards/simontester/bootloader_defs.h b/keyboards/clueboard4/bootloader_defs.h
similarity index 100%
rename from keyboards/simontester/bootloader_defs.h
rename to keyboards/clueboard4/bootloader_defs.h
diff --git a/keyboards/simontester/chconf.h b/keyboards/clueboard4/chconf.h
similarity index 100%
rename from keyboards/simontester/chconf.h
rename to keyboards/clueboard4/chconf.h
diff --git a/keyboards/simontester/simontester.c b/keyboards/clueboard4/clueboard4.c
similarity index 96%
rename from keyboards/simontester/simontester.c
rename to keyboards/clueboard4/clueboard4.c
index c8b3d14b..c3e225e1 100644
--- a/keyboards/simontester/simontester.c
+++ b/keyboards/clueboard4/clueboard4.c
@@ -13,4 +13,4 @@
  * 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 "simontester.h"
+#include "clueboard4.h"
diff --git a/keyboards/simontester/simontester.h b/keyboards/clueboard4/clueboard4.h
similarity index 95%
rename from keyboards/simontester/simontester.h
rename to keyboards/clueboard4/clueboard4.h
index 33aa4496..edefc364 100644
--- a/keyboards/simontester/simontester.h
+++ b/keyboards/clueboard4/clueboard4.h
@@ -13,8 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef SIMONTESTER_H
-#define SIMONTESTER_H
+#ifndef CLUEBOARD4_H
+#define CLUEBOARD4_H
 
 #include "quantum.h"
 
diff --git a/keyboards/simontester/config.h b/keyboards/clueboard4/config.h
similarity index 100%
rename from keyboards/simontester/config.h
rename to keyboards/clueboard4/config.h
diff --git a/keyboards/simontester/halconf.h b/keyboards/clueboard4/halconf.h
similarity index 100%
rename from keyboards/simontester/halconf.h
rename to keyboards/clueboard4/halconf.h
diff --git a/keyboards/simontester/keymaps/default/keymap.c b/keyboards/clueboard4/keymaps/default/keymap.c
similarity index 98%
rename from keyboards/simontester/keymaps/default/keymap.c
rename to keyboards/clueboard4/keymaps/default/keymap.c
index 677ed501..f57c0c4d 100644
--- a/keyboards/simontester/keymaps/default/keymap.c
+++ b/keyboards/clueboard4/keymaps/default/keymap.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 "simontester.h"
+#include "clueboard4.h"
 #include "printf.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/clueboard4/keymaps/default/readme.md b/keyboards/clueboard4/keymaps/default/readme.md
new file mode 100644
index 00000000..2cba0489
--- /dev/null
+++ b/keyboards/clueboard4/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for clueboard4
diff --git a/keyboards/simontester/led.c b/keyboards/clueboard4/led.c
similarity index 100%
rename from keyboards/simontester/led.c
rename to keyboards/clueboard4/led.c
diff --git a/keyboards/simontester/matrix.c b/keyboards/clueboard4/matrix.c
similarity index 99%
rename from keyboards/simontester/matrix.c
rename to keyboards/clueboard4/matrix.c
index a28f5fc4..0f4fbc0f 100644
--- a/keyboards/simontester/matrix.c
+++ b/keyboards/clueboard4/matrix.c
@@ -9,7 +9,7 @@
 #include "matrix.h"
 
 
-/* Clueboard SimonTester
+/* Clueboard4
  *
  * Column pins are input with internal pull-down. 
  * Row pins are output and strobe with high.
diff --git a/keyboards/simontester/mcuconf.h b/keyboards/clueboard4/mcuconf.h
similarity index 100%
rename from keyboards/simontester/mcuconf.h
rename to keyboards/clueboard4/mcuconf.h
diff --git a/keyboards/simontester/readme.md b/keyboards/clueboard4/readme.md
similarity index 79%
rename from keyboards/simontester/readme.md
rename to keyboards/clueboard4/readme.md
index 3bd2cd07..76d94c1c 100644
--- a/keyboards/simontester/readme.md
+++ b/keyboards/clueboard4/readme.md
@@ -1,5 +1,5 @@
-simontester keyboard firmware
-======================
+clueboard4 keyboard firmware
+============================
 
 ## Quantum MK Firmware
 
@@ -7,7 +7,7 @@ For the full Quantum feature list, see [the parent readme](/).
 
 ## Building
 
-Download or clone the whole firmware and navigate to the keyboards/simontester folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. 
+Download or clone the whole firmware and navigate to the keyboards/clueboard4 folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. 
 
 Depending on which keymap you would like to use, you will have to compile slightly differently.
 
diff --git a/keyboards/simontester/rules.mk b/keyboards/clueboard4/rules.mk
similarity index 100%
rename from keyboards/simontester/rules.mk
rename to keyboards/clueboard4/rules.mk
diff --git a/keyboards/simontester/keymaps/default/readme.md b/keyboards/simontester/keymaps/default/readme.md
deleted file mode 100644
index 0a125fa1..00000000
--- a/keyboards/simontester/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for simontester