diff --git a/examples/c-wrapper-riot/Makefile b/examples/c-wrapper-riot/Makefile
index a692efea..e4f6a241 100644
--- a/examples/c-wrapper-riot/Makefile
+++ b/examples/c-wrapper-riot/Makefile
@@ -7,13 +7,13 @@ BOARD ?= nrf52840dk
 INCLUDES += -I$(CURDIR)/../../target/include
 ARCHIVES += $(CURDIR)/../../target/thumbv7em-none-eabihf/release/libedhoc_rs.a
 
-ifeq ($(EDHOC_CRYPTO), CB_PSA)
+ifeq ($(EDHOC_CRYPTO), CRYPTO_PSA)
 	CFLAGS += -D$(EDHOC_CRYPTO)
 else
-	CFLAGS += -DCB_CRYPTOCELL310
+	CFLAGS += -DCRYPTO_CRYPTOCELL310
 endif
 
-# This is actually only needed in the CB_CRYPTOCELL310 configuration
+# This is actually only needed in the CRYPTO_CRYPTOCELL310 configuration
 CFLAGS += -DTHREAD_STACKSIZE_DEFAULT=16384 -DISR_STACKSIZE=16384
 
 USEMODULE += od
diff --git a/examples/c-wrapper-riot/README.md b/examples/c-wrapper-riot/README.md
index 9fc5ac7f..da5bf9c5 100644
--- a/examples/c-wrapper-riot/README.md
+++ b/examples/c-wrapper-riot/README.md
@@ -22,7 +22,7 @@ make flash term
 With `crypto-psa-baremetal`:
 
 ```bash
-make flash term EDHOC_CRYPTO=CB_PSA
+make flash term EDHOC_CRYPTO=CRYPTO_PSA
 ```
 
 # Requirements
diff --git a/examples/c-wrapper-riot/main.c b/examples/c-wrapper-riot/main.c
index 2ee187d0..2b479f6a 100644
--- a/examples/c-wrapper-riot/main.c
+++ b/examples/c-wrapper-riot/main.c
@@ -3,7 +3,7 @@
 #include "od.h"
 #include "edhoc_rs.h"
 
-#ifdef CB_PSA
+#ifdef CRYPTO_PSA
 extern void mbedtls_memory_buffer_alloc_init(uint8_t *buf, size_t len);
 #endif
 
@@ -20,7 +20,7 @@ int main(void)
  {
     puts("Calling edhoc-rs from C!");
 
-#ifdef CB_PSA
+#ifdef CRYPTO_PSA
     // Memory buffer for mbedtls
     uint8_t buffer[4096 * 2] = {0};
     mbedtls_memory_buffer_alloc_init(buffer, 4096 * 2);