diff --git a/keyboards/massdrop/alt67/alt67.h b/keyboards/massdrop/alt/alt.h
similarity index 100%
rename from keyboards/massdrop/alt67/alt67.h
rename to keyboards/massdrop/alt/alt.h
diff --git a/keyboards/massdrop/alt67/config.h b/keyboards/massdrop/alt/config.h
similarity index 98%
rename from keyboards/massdrop/alt67/config.h
rename to keyboards/massdrop/alt/config.h
index c67ae7d432..a486f34a0c 100644
--- a/keyboards/massdrop/alt67/config.h
+++ b/keyboards/massdrop/alt/config.h
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER          0x0101
 
 #define MANUFACTURER        "Massdrop Inc."
-#define PRODUCT             "ALT67 Keyboard"
+#define PRODUCT             "ALT Keyboard"
 #define SERIAL_NUM          "Unavailable"
 
 /* key matrix size */
diff --git a/keyboards/massdrop/alt67/config_led.h b/keyboards/massdrop/alt/config_led.h
similarity index 100%
rename from keyboards/massdrop/alt67/config_led.h
rename to keyboards/massdrop/alt/config_led.h
diff --git a/keyboards/massdrop/alt67/info.json b/keyboards/massdrop/alt/info.json
similarity index 100%
rename from keyboards/massdrop/alt67/info.json
rename to keyboards/massdrop/alt/info.json
diff --git a/keyboards/massdrop/alt67/keymaps/default/keymap.c b/keyboards/massdrop/alt/keymaps/default/keymap.c
similarity index 99%
rename from keyboards/massdrop/alt67/keymaps/default/keymap.c
rename to keyboards/massdrop/alt/keymaps/default/keymap.c
index b8d0b6c03c..3f0b84e387 100644
--- a/keyboards/massdrop/alt67/keymaps/default/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/default/keymap.c
@@ -1,6 +1,6 @@
 #include QMK_KEYBOARD_H
 
-enum alt67_keycodes {
+enum alt_keycodes {
     L_BRI = SAFE_RANGE, //LED Brightness Increase
     L_BRD,              //LED Brightness Decrease
     L_PTN,              //LED Pattern Select Next
diff --git a/keyboards/massdrop/alt67/led_programs.c b/keyboards/massdrop/alt/led_programs.c
similarity index 99%
rename from keyboards/massdrop/alt67/led_programs.c
rename to keyboards/massdrop/alt/led_programs.c
index a8aab28d98..b3b7a7e90e 100644
--- a/keyboards/massdrop/alt67/led_programs.c
+++ b/keyboards/massdrop/alt/led_programs.c
@@ -15,7 +15,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 "alt67.h"
+#include "alt.h"
 #include "led_matrix.h"
 
 //Teal <-> Salmon
diff --git a/keyboards/massdrop/alt67/matrix.c b/keyboards/massdrop/alt/matrix.c
similarity index 99%
rename from keyboards/massdrop/alt67/matrix.c
rename to keyboards/massdrop/alt/matrix.c
index e107b4c22c..75a4d62b99 100644
--- a/keyboards/massdrop/alt67/matrix.c
+++ b/keyboards/massdrop/alt/matrix.c
@@ -15,7 +15,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 "alt67.h"
+#include "alt.h"
 
 #include "d51_util.h"
 #include "debug.h"
diff --git a/keyboards/massdrop/alt67/matrix.h b/keyboards/massdrop/alt/matrix.h
similarity index 100%
rename from keyboards/massdrop/alt67/matrix.h
rename to keyboards/massdrop/alt/matrix.h
diff --git a/keyboards/massdrop/alt67/readme.md b/keyboards/massdrop/alt/readme.md
similarity index 83%
rename from keyboards/massdrop/alt67/readme.md
rename to keyboards/massdrop/alt/readme.md
index 551c10c208..57e2e5f174 100644
--- a/keyboards/massdrop/alt67/readme.md
+++ b/keyboards/massdrop/alt/readme.md
@@ -5,16 +5,16 @@
 The Massdrop ALT is a 65% mechanical keyboard featuring dual USB-C connectors, an integrated Hi-Speed USB 2.0 hub, and fully customizable RGB backlighting and underlighting.
 
 Keyboard Maintainer: [Massdrop](https://github.com/massdrop)  
-Hardware Supported: Massdrop, Inc. ALT67 PCBs utilizing Microchip's ATSAMD51J18A MCU and USB2422 2-Port USB 2.0 Hi-Speed Hub Controller, and ISSI's IS31FL3733 LED Drivers.  
+Hardware Supported: Massdrop, Inc. ALT PCBs utilizing Microchip's ATSAMD51J18A MCU and USB2422 2-Port USB 2.0 Hi-Speed Hub Controller, and ISSI's IS31FL3733 LED Drivers.  
 Hardware Availability: [Massdrop ALT Mechanical Keyboard](https://www.massdrop.com/buy/massdrop-alt-mechanical-keyboard)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make massdrop/alt67:default
+    make massdrop/alt:default
 
 For information on flashing this keyboard, visit the following links:
 
 [Massdrop Loader Releases](https://github.com/Massdrop/mdloader/releases/tag/0.0.1)  
 [Massdrop Loader Repository and Instructions](https://github.com/Massdrop/mdloader)
 
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/massdrop/alt67/rules.mk b/keyboards/massdrop/alt/rules.mk
similarity index 100%
rename from keyboards/massdrop/alt67/rules.mk
rename to keyboards/massdrop/alt/rules.mk
diff --git a/keyboards/massdrop/ctrl/keymaps/default/keymap.c b/keyboards/massdrop/ctrl/keymaps/default/keymap.c
index 8e84d4fee5..ac58f336e3 100644
--- a/keyboards/massdrop/ctrl/keymaps/default/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/default/keymap.c
@@ -1,6 +1,6 @@
 #include QMK_KEYBOARD_H
 
-enum alt67_keycodes {
+enum ctrl_keycodes {
     L_BRI = SAFE_RANGE, //LED Brightness Increase
     L_BRD,              //LED Brightness Decrease
     L_PTN,              //LED Pattern Select Next
diff --git a/tmk_core/protocol/arm_atsam/usb/usb2422.h b/tmk_core/protocol/arm_atsam/usb/usb2422.h
index 6c763dd8c5..85ad596a62 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb2422.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb2422.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef _USB2422_H_
 #define _USB2422_H_
 
-#define USB2422_ALT67_1P0
 #define REV_USB2422        0x100
 
 #define USB2422_ADDR       0x58 //I2C device address, one instance