diff --git a/IDE/AURIX/user_settings.h b/IDE/AURIX/user_settings.h
index 33094529a5c..ac32fb2b0f4 100644
--- a/IDE/AURIX/user_settings.h
+++ b/IDE/AURIX/user_settings.h
@@ -259,7 +259,7 @@ extern unsigned int my_rng_seed_gen(void);
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 1
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/IDE/CRYPTOCELL/user_settings.h b/IDE/CRYPTOCELL/user_settings.h
index 46ba2bb3cab..9b065670837 100644
--- a/IDE/CRYPTOCELL/user_settings.h
+++ b/IDE/CRYPTOCELL/user_settings.h
@@ -285,7 +285,7 @@ extern "C" {
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 1
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/IDE/ECLIPSE/DEOS/user_settings.h b/IDE/ECLIPSE/DEOS/user_settings.h
index 3355724b6f5..9baa0038eef 100644
--- a/IDE/ECLIPSE/DEOS/user_settings.h
+++ b/IDE/ECLIPSE/DEOS/user_settings.h
@@ -106,7 +106,7 @@ You can get the current time from https://www.unixtimestamp.com/ */
 #if 1
     #define HAVE_CURVE25519
     #define HAVE_ED25519
-    #define CURVED25519_SMALL
+    #define CURVE25519_SMALL
 #endif
 
 #undef NO_SHA
diff --git a/IDE/Espressif/ESP-IDF/examples/wolfssl_test_idf/main/main_wip.c.ex b/IDE/Espressif/ESP-IDF/examples/wolfssl_test_idf/main/main_wip.c.ex
index d6e6dda94ad..100c4311eac 100644
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_test_idf/main/main_wip.c.ex
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_test_idf/main/main_wip.c.ex
@@ -175,10 +175,10 @@ void app_main(void)
     ESP_LOGI(TAG, "Missing CURVE25519_SMALL");
 #endif
 
-#if defined(CURVED25519_SMALL)
-    ESP_LOGI(TAG, "Found CURVED25519_SMALL");
+#if defined(CURVE25519_SMALL)
+    ESP_LOGI(TAG, "Found CURVE25519_SMALL");
 #else
-    ESP_LOGI(TAG, "Missing CURVED25519_SMALL");
+    ESP_LOGI(TAG, "Missing CURVE25519_SMALL");
 #endif
 
 #if defined(HAVE_ED25519)
diff --git a/IDE/GCC-ARM/Header/user_settings.h b/IDE/GCC-ARM/Header/user_settings.h
index a3a1561b0e3..b1c60686802 100644
--- a/IDE/GCC-ARM/Header/user_settings.h
+++ b/IDE/GCC-ARM/Header/user_settings.h
@@ -303,7 +303,7 @@ extern "C" {
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 1
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/IDE/GCC-ARM/README.md b/IDE/GCC-ARM/README.md
index 40b2bdfd1da..8ce99ab83ce 100644
--- a/IDE/GCC-ARM/README.md
+++ b/IDE/GCC-ARM/README.md
@@ -114,7 +114,7 @@ These settings are located in `Header/user_settings.h`.
 * `ECC_SHAMIR`: Doubles heap usage, but slightly faster
 * `RSA_LOW_MEM`: Half as much memory but twice as slow. Uses Non-CRT method for private key.
 * AES GCM: `GCM_SMALL`, `GCM_WORD32` or `GCM_TABLE`: Tunes performance and flash/memory usage.
-* `CURVED25519_SMALL`: Enables small versions of Ed/Curve (FE/GE math).
+* `CURVE25519_SMALL`: Enables small versions of Ed/Curve (FE/GE math).
 * `USE_SLOW_SHA`: Enables smaller/slower version of SHA.
 * `USE_SLOW_SHA256`: About 2k smaller and about 25% slower
 * `USE_SLOW_SHA512`: Over twice as small, but 50% slower
diff --git a/IDE/INTIME-RTOS/user_settings.h b/IDE/INTIME-RTOS/user_settings.h
index 83be2eec754..c50a22d714e 100644
--- a/IDE/INTIME-RTOS/user_settings.h
+++ b/IDE/INTIME-RTOS/user_settings.h
@@ -210,7 +210,7 @@ extern "C" {
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 0
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/IDE/LPCXPRESSO/lib_wolfssl/user_settings.h b/IDE/LPCXPRESSO/lib_wolfssl/user_settings.h
index 464b261581f..070646c325d 100644
--- a/IDE/LPCXPRESSO/lib_wolfssl/user_settings.h
+++ b/IDE/LPCXPRESSO/lib_wolfssl/user_settings.h
@@ -27,7 +27,7 @@
 #define ALT_ECC_SIZE
 #define USE_FAST_MATH
 #define SMALL_SESSION_CACHE
-#define CURVED25519_SMALL
+#define CURVE25519_SMALL
 #define RSA_LOW_MEM
 #define GCM_SMALL
 #define ECC_SHAMIR
diff --git a/IDE/MDK5-ARM/Conf/user_settings.h b/IDE/MDK5-ARM/Conf/user_settings.h
index cffe0d548d5..c9763711d64 100644
--- a/IDE/MDK5-ARM/Conf/user_settings.h
+++ b/IDE/MDK5-ARM/Conf/user_settings.h
@@ -331,13 +331,13 @@
 #define MDK_CONF_CURVE25519 1
 #if MDK_CONF_CURVE25519 == 1
 #define HAVE_CURVE25519
-#define CURVED25519_SMALL
+#define CURVE25519_SMALL
 #endif
 //  </e>
 //      <e>CURVE25519 SMALL
 #define MDK_CONF_CURVE25519_SMALL 0
 #if MDK_CONF_CURVE25519_SMALL == 1
-#define CURVED25519_SMALL
+#define CURVE25519_SMALL
 #endif
 //  </e>
 //      <e>ED25519
diff --git a/IDE/MPLABX16/user_settings.h b/IDE/MPLABX16/user_settings.h
index 174551e95e0..9fe7b27d37f 100644
--- a/IDE/MPLABX16/user_settings.h
+++ b/IDE/MPLABX16/user_settings.h
@@ -200,7 +200,7 @@ extern "C" {
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 0
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/IDE/NETOS/user_settings.h-cert3389 b/IDE/NETOS/user_settings.h-cert3389
index 7f43f250c90..e53179253e0 100755
--- a/IDE/NETOS/user_settings.h-cert3389
+++ b/IDE/NETOS/user_settings.h-cert3389
@@ -291,7 +291,7 @@ extern "C" {
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 1
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/IDE/RISCV/SIFIVE-HIFIVE1/user_settings.h b/IDE/RISCV/SIFIVE-HIFIVE1/user_settings.h
index 89521e9791a..995c5ed5e0c 100644
--- a/IDE/RISCV/SIFIVE-HIFIVE1/user_settings.h
+++ b/IDE/RISCV/SIFIVE-HIFIVE1/user_settings.h
@@ -220,7 +220,7 @@ extern "C" {
     /* Optionally use small math (less flash usage, but much slower) */
     #if 1
         /* Curve and Ed 25519 small */
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h b/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h
index 6e7c8a6d20b..6f76e6095de 100644
--- a/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h
+++ b/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h
@@ -188,7 +188,7 @@ extern "C" {
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 0
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/IDE/STARCORE/user_settings.h b/IDE/STARCORE/user_settings.h
index f41e24e0b37..ce17d49c86a 100644
--- a/IDE/STARCORE/user_settings.h
+++ b/IDE/STARCORE/user_settings.h
@@ -298,7 +298,7 @@ extern "C" {
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 1
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/IDE/STM32Cube/STM32_Benchmarks.md b/IDE/STM32Cube/STM32_Benchmarks.md
index 9737e0b95e5..b8a8e0fbd6c 100644
--- a/IDE/STM32Cube/STM32_Benchmarks.md
+++ b/IDE/STM32Cube/STM32_Benchmarks.md
@@ -854,7 +854,7 @@ Benchmark Test: Return code 0
 #define WOLFSSL_SP_SMALL
 #define WOLFSSL_NO_ASM
 #define WOLFSSL_SP_NO_MALLOC
-#define CURVED25519_SMALL
+#define CURVE25519_SMALL
 ```
 
 ```
diff --git a/IDE/STM32Cube/default_conf.ftl b/IDE/STM32Cube/default_conf.ftl
index 951e319baf9..0dc30eeff68 100644
--- a/IDE/STM32Cube/default_conf.ftl
+++ b/IDE/STM32Cube/default_conf.ftl
@@ -587,7 +587,7 @@ extern ${variable.value} ${variable.name};
     #define HAVE_ED25519
 
     /* Optionally use small math (less flash usage, but much slower) */
-    #define CURVED25519_SMALL
+    #define CURVE25519_SMALL
 #endif
 
 
diff --git a/IDE/SimplicityStudio/user_settings.h b/IDE/SimplicityStudio/user_settings.h
index 70f560357c4..89b7a89e6cd 100644
--- a/IDE/SimplicityStudio/user_settings.h
+++ b/IDE/SimplicityStudio/user_settings.h
@@ -229,7 +229,7 @@ extern "C" {
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 1
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/IDE/VisualDSP/user_settings.h b/IDE/VisualDSP/user_settings.h
index 4fd60dd7e76..f6c31b000b9 100644
--- a/IDE/VisualDSP/user_settings.h
+++ b/IDE/VisualDSP/user_settings.h
@@ -299,7 +299,7 @@ extern "C" {
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 1
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/IDE/WICED-STUDIO/user_settings.h b/IDE/WICED-STUDIO/user_settings.h
index 686dacefee9..8ed63225c10 100644
--- a/IDE/WICED-STUDIO/user_settings.h
+++ b/IDE/WICED-STUDIO/user_settings.h
@@ -290,7 +290,7 @@ extern "C" {
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 1
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/IDE/WINCE/user_settings.h b/IDE/WINCE/user_settings.h
index f8a69633c22..a7f7de73c0a 100644
--- a/IDE/WINCE/user_settings.h
+++ b/IDE/WINCE/user_settings.h
@@ -420,7 +420,7 @@ C149F3285397DFBD0C6720E14818475C3A50B10880EF9619463173A6D5ED15E7
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 1
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/IDE/XCODE-FIPSv2/macOS-C++/Intel/user_settings.h b/IDE/XCODE-FIPSv2/macOS-C++/Intel/user_settings.h
index 03b8bb81b64..e4776cc01aa 100644
--- a/IDE/XCODE-FIPSv2/macOS-C++/Intel/user_settings.h
+++ b/IDE/XCODE-FIPSv2/macOS-C++/Intel/user_settings.h
@@ -292,7 +292,7 @@ extern "C" {
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 1
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/IDE/XCODE-FIPSv2/macOS-C++/M1/user_settings.h b/IDE/XCODE-FIPSv2/macOS-C++/M1/user_settings.h
index d4880d52ac6..324709c5b43 100644
--- a/IDE/XCODE-FIPSv2/macOS-C++/M1/user_settings.h
+++ b/IDE/XCODE-FIPSv2/macOS-C++/M1/user_settings.h
@@ -303,7 +303,7 @@ extern "C" {
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 1
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/IDE/XCODE-FIPSv2/user_settings.h b/IDE/XCODE-FIPSv2/user_settings.h
index 14dc7ed4ac6..830f80b765e 100644
--- a/IDE/XCODE-FIPSv2/user_settings.h
+++ b/IDE/XCODE-FIPSv2/user_settings.h
@@ -303,7 +303,7 @@ extern "C" {
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 1
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/IDE/XCODE-FIPSv5/user_settings.h b/IDE/XCODE-FIPSv5/user_settings.h
index 18e21608ec7..4c3f9e0b1ea 100644
--- a/IDE/XCODE-FIPSv5/user_settings.h
+++ b/IDE/XCODE-FIPSv5/user_settings.h
@@ -379,7 +379,7 @@ extern "C" {
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 1
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/IDE/XCODE-FIPSv6/user_settings.h b/IDE/XCODE-FIPSv6/user_settings.h
index fb4aaddd0f4..0332f39409e 100644
--- a/IDE/XCODE-FIPSv6/user_settings.h
+++ b/IDE/XCODE-FIPSv6/user_settings.h
@@ -417,7 +417,7 @@ extern "C" {
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 0
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/examples/configs/user_settings_stm32.h b/examples/configs/user_settings_stm32.h
index 1084c9d180b..4d3da4b6a64 100644
--- a/examples/configs/user_settings_stm32.h
+++ b/examples/configs/user_settings_stm32.h
@@ -599,7 +599,7 @@ extern "C" {
     #define HAVE_ED25519
 
     /* Optionally use small math (less flash usage, but much slower) */
-    //#define CURVED25519_SMALL
+    //#define CURVE25519_SMALL
 #endif
 
 /* ------------------------------------------------------------------------- */
diff --git a/examples/configs/user_settings_template.h b/examples/configs/user_settings_template.h
index 011b51a649a..7de2e75d7c5 100644
--- a/examples/configs/user_settings_template.h
+++ b/examples/configs/user_settings_template.h
@@ -241,7 +241,7 @@ extern "C" {
 
     /* Optionally use small math (less flash, slower) */
     #if 1 /* Small Curve25519 */
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/mcapi/user_settings.h b/mcapi/user_settings.h
index 79a99ce410e..8c7fdbac105 100644
--- a/mcapi/user_settings.h
+++ b/mcapi/user_settings.h
@@ -182,7 +182,7 @@ extern "C" {
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 0
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/mplabx/user_settings.h b/mplabx/user_settings.h
index 79a99ce410e..8c7fdbac105 100644
--- a/mplabx/user_settings.h
+++ b/mplabx/user_settings.h
@@ -182,7 +182,7 @@ extern "C" {
 
     /* Optionally use small math (less flash usage, but much slower) */
     #if 0
-        #define CURVED25519_SMALL
+        #define CURVE25519_SMALL
     #endif
 #endif
 
diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
index 503fade1d97..49d2f621396 100644
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -4059,7 +4059,7 @@ extern void uITRON4_free(void *p) ;
 #endif
 
 /* both CURVE and ED small math should be enabled */
-#ifdef CURVED25519_SMALL
+#ifdef CURVE25519_SMALL
     #define CURVE25519_SMALL
     #define ED25519_SMALL
 #endif
diff --git a/wrapper/Ada/user_settings.h b/wrapper/Ada/user_settings.h
index d871e772721..c56299ff4c3 100644
--- a/wrapper/Ada/user_settings.h
+++ b/wrapper/Ada/user_settings.h
@@ -225,7 +225,7 @@ extern "C" {
 #define HAVE_CURVE25519
 #define HAVE_ED25519
 #define WOLFSSL_ED25519_STREAMING_VERIFY
-#define CURVED25519_SMALL
+#define CURVE25519_SMALL
 #define HAVE_ED448
 #define WOLFSSL_ED448_STREAMING_VERIFY
 #define HAVE_CURVE448
diff --git a/zephyr/user_settings.h b/zephyr/user_settings.h
index 6f2606bdbf3..e4d1beccea6 100644
--- a/zephyr/user_settings.h
+++ b/zephyr/user_settings.h
@@ -246,7 +246,7 @@ extern "C" {
     #define HAVE_ED25519 /* ED25519 Requires SHA512 */
 
     /* Optionally use small math (less flash usage, but much slower) */
-    //#define CURVED25519_SMALL
+    //#define CURVE25519_SMALL
 #endif
 
 /* SHA-1 */