diff --git a/build.sh b/build.sh
index 7df2aba..41c340d 100755
--- a/build.sh
+++ b/build.sh
@@ -5,7 +5,7 @@
 #
 # Be careful, it may not be using the latest QMK.
 
-docker run -it \
+docker run -it --rm \
 	--user $(id -u):$(id -g) \
 	-v "$(pwd)/output:/build_output" \
 	-v "$(pwd)/keyboards:/qmk_firmware/keyboards:ro" \
diff --git a/keyboards/betalupi_ergodox/features/beta_rawhid.c b/keyboards/betalupi_ergodox/features/beta_rawhid.c
index 6e72605..649e36d 100644
--- a/keyboards/betalupi_ergodox/features/beta_rawhid.c
+++ b/keyboards/betalupi_ergodox/features/beta_rawhid.c
@@ -7,8 +7,8 @@
 
 extern uint8_t layer_layouts[];
 
-#ifdef BETA_ENABLE_SPELLCHECK
-#include "features/spellcheck.h"
+#ifdef ENABLE_HID_SPELLCHECK
+#include "features/hid_spellcheck.h"
 #endif
 
 // See features/beta_rawhid.h for prococol documentation
@@ -30,7 +30,7 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
 			break;
 		#endif
 
-		#ifdef BETA_ENABLE_SPELLCHECK
+		#ifdef ENABLE_HID_SPELLCHECK
 		case CMD_SPELLCHECK_WORD:
 			if (data[1]) {
 				ergodox_right_led_1_on();
@@ -113,7 +113,7 @@ void hid_send_special_char(uint16_t char_id) {
 }
 
 
-#ifdef BETA_ENABLE_SPELLCHECK
+#ifdef ENABLE_HID_SPELLCHECK
 void hid_send_word() {
 	uint8_t packet[RAW_EPSIZE] = {
 		CMD_SPELLCHECK_WORD,
diff --git a/keyboards/betalupi_ergodox/features/beta_rawhid.h b/keyboards/betalupi_ergodox/features/beta_rawhid.h
index 1f32b96..a4afd81 100644
--- a/keyboards/betalupi_ergodox/features/beta_rawhid.h
+++ b/keyboards/betalupi_ergodox/features/beta_rawhid.h
@@ -21,7 +21,7 @@ void _hid_send_state(_hid_send_state_args args);
 
 void hid_send_special_char(uint16_t char_utf_8);
 
-#ifdef BETA_ENABLE_SPELLCHECK
+#ifdef ENABLE_HID_SPELLCHECK
 void hid_send_word(void);
 #endif
 
diff --git a/keyboards/betalupi_ergodox/features/spellcheck.c b/keyboards/betalupi_ergodox/features/hid_spellcheck.c
similarity index 98%
rename from keyboards/betalupi_ergodox/features/spellcheck.c
rename to keyboards/betalupi_ergodox/features/hid_spellcheck.c
index ce50bc5..5764a5b 100644
--- a/keyboards/betalupi_ergodox/features/spellcheck.c
+++ b/keyboards/betalupi_ergodox/features/hid_spellcheck.c
@@ -1,9 +1,9 @@
-#ifdef BETA_ENABLE_SPELLCHECK
+#ifdef ENABLE_HID_SPELLCHECK
 
 #include "keymap_russian.h"
 #include "keymap_us_international.h"
 
-#include "features/spellcheck.h"
+#include "features/hid_spellcheck.h"
 #include "features/beta_rawhid.h"
 #include "extra_mappings.h"
 
diff --git a/keyboards/betalupi_ergodox/features/spellcheck.h b/keyboards/betalupi_ergodox/features/hid_spellcheck.h
similarity index 92%
rename from keyboards/betalupi_ergodox/features/spellcheck.h
rename to keyboards/betalupi_ergodox/features/hid_spellcheck.h
index 9feb2ad..8043677 100644
--- a/keyboards/betalupi_ergodox/features/spellcheck.h
+++ b/keyboards/betalupi_ergodox/features/hid_spellcheck.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef BETA_ENABLE_SPELLCHECK
+#ifdef ENABLE_HID_SPELLCHECK
 
 #include "quantum.h"
 
diff --git a/keyboards/betalupi_ergodox/keymaps/default/config.h b/keyboards/betalupi_ergodox/keymaps/default/config.h
index db26b09..b767653 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/config.h
+++ b/keyboards/betalupi_ergodox/keymaps/default/config.h
@@ -8,7 +8,7 @@
 
 
 // Enable spellcheck over HID
-#define BETA_ENABLE_SPELLCHECK
+#define ENABLE_HID_SPELLCHECK
 
 // RGBLight effects
 // Static color is always enabled.
diff --git a/keyboards/betalupi_ergodox/keymaps/default/keymap.c b/keyboards/betalupi_ergodox/keymaps/default/keymap.c
index 93930a6..cc4e60a 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/keymap.c
+++ b/keyboards/betalupi_ergodox/keymaps/default/keymap.c
@@ -1,8 +1,8 @@
 #include "keymap.h"
 #include "layers/layers.h"
 
-#ifdef BETA_ENABLE_SPELLCHECK
-#include "features/spellcheck.h"
+#ifdef ENABLE_HID_SPELLCHECK
+#include "features/hid_spellcheck.h"
 #endif
 
 #include "features/beta_rawhid.h"
@@ -63,7 +63,7 @@ void matrix_scan_user(void) {
 // Return TRUE to allow QMK to handle keypress.
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
-	#ifdef BETA_ENABLE_SPELLCHECK
+	#ifdef ENABLE_HID_SPELLCHECK
 	if (!process_spellcheck(keycode, record)) { return false; }
 	#endif
 
diff --git a/keyboards/betalupi_ergodox/rules.mk b/keyboards/betalupi_ergodox/rules.mk
index 2bb9dfa..6f28404 100644
--- a/keyboards/betalupi_ergodox/rules.mk
+++ b/keyboards/betalupi_ergodox/rules.mk
@@ -39,7 +39,8 @@ SRC += \
 	matrix.c \
 	led_i2c.c \
 	features/beta_rawhid.c \
-	features/spellcheck.c \
+	features/hid_spellcheck.c \
+	features/autocorrect/autocorrect.c \
 	extra_mappings.c
 
 QUANTUM_LIB_SRC += i2c_master.c