diff --git a/library/ccm.c b/library/ccm.c
index 109927e..75de8cb 100644
--- a/library/ccm.c
+++ b/library/ccm.c
@@ -81,7 +81,7 @@
     if( cipher_info->block_size != 16 )
         return( MBEDTLS_ERR_CCM_BAD_INPUT );
 
-    if( ( ret = mbedtls_cipher_init_ctx( &ctx->cipher_ctx, cipher_info ) ) != 0 )
+    if( ( ret = mbedtls_cipher_setup( &ctx->cipher_ctx, cipher_info ) ) != 0 )
         return( ret );
 
     if( ( ret = mbedtls_cipher_setkey( &ctx->cipher_ctx, key, keysize,
diff --git a/library/cipher.c b/library/cipher.c
index d16893b..a558575 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -139,7 +139,7 @@
     mbedtls_zeroize( ctx, sizeof(mbedtls_cipher_context_t) );
 }
 
-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 )
 {
     if( NULL == cipher_info || NULL == ctx )
         return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
diff --git a/library/gcm.c b/library/gcm.c
index 39648b4..79d433a 100644
--- a/library/gcm.c
+++ b/library/gcm.c
@@ -174,7 +174,7 @@
     if( cipher_info->block_size != 16 )
         return( MBEDTLS_ERR_GCM_BAD_INPUT );
 
-    if( ( ret = mbedtls_cipher_init_ctx( &ctx->cipher_ctx, cipher_info ) ) != 0 )
+    if( ( ret = mbedtls_cipher_setup( &ctx->cipher_ctx, cipher_info ) ) != 0 )
         return( ret );
 
     if( ( ret = mbedtls_cipher_setkey( &ctx->cipher_ctx, key, keysize,
diff --git a/library/pkcs12.c b/library/pkcs12.c
index e3ca995..1baa95c 100644
--- a/library/pkcs12.c
+++ b/library/pkcs12.c
@@ -195,7 +195,7 @@
 
     mbedtls_cipher_init( &cipher_ctx );
 
-    if( ( ret = mbedtls_cipher_init_ctx( &cipher_ctx, cipher_info ) ) != 0 )
+    if( ( ret = mbedtls_cipher_setup( &cipher_ctx, cipher_info ) ) != 0 )
         goto exit;
 
     if( ( ret = mbedtls_cipher_setkey( &cipher_ctx, key, 8 * keylen, (mbedtls_operation_t) mode ) ) != 0 )
diff --git a/library/pkcs5.c b/library/pkcs5.c
index 6163e9a..7564733 100644
--- a/library/pkcs5.c
+++ b/library/pkcs5.c
@@ -198,7 +198,7 @@
         goto exit;
     }
 
-    if( ( ret = mbedtls_cipher_init_ctx( &cipher_ctx, cipher_info ) ) != 0 )
+    if( ( ret = mbedtls_cipher_setup( &cipher_ctx, cipher_info ) ) != 0 )
         goto exit;
 
     if( ( ret = mbedtls_cipher_setkey( &cipher_ctx, key, 8 * keylen, (mbedtls_operation_t) mode ) ) != 0 )
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 19d359a..6cf9b74 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -867,17 +867,17 @@
     }
 #endif /* MBEDTLS_SSL_HW_RECORD_ACCEL */
 
-    if( ( ret = mbedtls_cipher_init_ctx( &transform->cipher_ctx_enc,
+    if( ( ret = mbedtls_cipher_setup( &transform->cipher_ctx_enc,
                                  cipher_info ) ) != 0 )
     {
-        MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_cipher_init_ctx", ret );
+        MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_cipher_setup", ret );
         return( ret );
     }
 
-    if( ( ret = mbedtls_cipher_init_ctx( &transform->cipher_ctx_dec,
+    if( ( ret = mbedtls_cipher_setup( &transform->cipher_ctx_dec,
                                  cipher_info ) ) != 0 )
     {
-        MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_cipher_init_ctx", ret );
+        MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_cipher_setup", ret );
         return( ret );
     }