diff --git a/include/mbedtls/cipher.h b/include/mbedtls/cipher.h
index 084175d..58c974b 100644
--- a/include/mbedtls/cipher.h
+++ b/include/mbedtls/cipher.h
@@ -320,7 +320,7 @@
  *                      MBEDTLS_ERR_CIPHER_ALLOC_FAILED if allocation of the
  *                      cipher-specific context failed.
  */
-int mbedtls_cipher_init_ctx( mbedtls_cipher_context_t *ctx, const mbedtls_cipher_info_t *cipher_info );
+int mbedtls_cipher_setup( mbedtls_cipher_context_t *ctx, const mbedtls_cipher_info_t *cipher_info );
 
 /**
  * \brief               Returns the block size of the given cipher.
diff --git a/include/mbedtls/compat-1.3.h b/include/mbedtls/compat-1.3.h
index ae3e14e..9276eae 100644
--- a/include/mbedtls/compat-1.3.h
+++ b/include/mbedtls/compat-1.3.h
@@ -1871,7 +1871,7 @@
 #define cipher_info_from_values mbedtls_cipher_info_from_values
 #define cipher_info_t mbedtls_cipher_info_t
 #define cipher_init mbedtls_cipher_init
-#define cipher_init_ctx mbedtls_cipher_init_ctx
+#define cipher_init_ctx mbedtls_cipher_setup
 #define cipher_list mbedtls_cipher_list
 #define cipher_mode_t mbedtls_cipher_mode_t
 #define cipher_padding_t mbedtls_cipher_padding_t