diff --git a/include/mbedtls/md2.h b/include/mbedtls/md2.h
index 23145de..0df6b36 100644
--- a/include/mbedtls/md2.h
+++ b/include/mbedtls/md2.h
@@ -86,7 +86,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_md2_starts_ext( mbedtls_md2_context *ctx );
+int mbedtls_md2_starts_ret( mbedtls_md2_context *ctx );
 
 /**
  * \brief          MD2 process buffer
@@ -97,7 +97,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_md2_update_ext( mbedtls_md2_context *ctx,
+int mbedtls_md2_update_ret( mbedtls_md2_context *ctx,
                             const unsigned char *input,
                             size_t ilen );
 
@@ -109,7 +109,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_md2_finish_ext( mbedtls_md2_context *ctx,
+int mbedtls_md2_finish_ret( mbedtls_md2_context *ctx,
                             unsigned char output[16] );
 
 /**
@@ -130,20 +130,20 @@
 /**
  * \brief          MD2 context setup
  *
- * \deprecated     Superseded by mbedtls_md2_starts_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_md2_starts_ret() in 2.5.0
  *
  * \param ctx      context to be initialized
  */
 MBEDTLS_DEPRECATED static inline void mbedtls_md2_starts(
                                                     mbedtls_md2_context *ctx )
 {
-    mbedtls_md2_starts_ext( ctx );
+    mbedtls_md2_starts_ret( ctx );
 }
 
 /**
  * \brief          MD2 process buffer
  *
- * \deprecated     Superseded by mbedtls_md2_update_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_md2_update_ret() in 2.5.0
  *
  * \param ctx      MD2 context
  * \param input    buffer holding the data
@@ -154,13 +154,13 @@
                                                 const unsigned char *input,
                                                 size_t ilen )
 {
-    mbedtls_md2_update_ext( ctx, input, ilen );
+    mbedtls_md2_update_ret( ctx, input, ilen );
 }
 
 /**
  * \brief          MD2 final digest
  *
- * \deprecated     Superseded by mbedtls_md2_finish_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_md2_finish_ret() in 2.5.0
  *
  * \param ctx      MD2 context
  * \param output   MD2 checksum result
@@ -169,7 +169,7 @@
                                                     mbedtls_md2_context *ctx,
                                                     unsigned char output[16] )
 {
-    mbedtls_md2_finish_ext( ctx, output );
+    mbedtls_md2_finish_ret( ctx, output );
 }
 
 /**
@@ -207,7 +207,7 @@
  * \param ilen     length of the input data
  * \param output   MD2 checksum result
  */
-int mbedtls_md2_ext( const unsigned char *input,
+int mbedtls_md2_ret( const unsigned char *input,
                      size_t ilen,
                      unsigned char output[16] );
 
@@ -220,7 +220,7 @@
 /**
  * \brief          Output = MD2( input buffer )
  *
- * \deprecated     Superseded by mbedtls_md2_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_md2_ret() in 2.5.0
  *
  * \param input    buffer holding the data
  * \param ilen     length of the input data
@@ -230,7 +230,7 @@
                                                    size_t ilen,
                                                    unsigned char output[16] )
 {
-    mbedtls_md2_ext( input, ilen, output );
+    mbedtls_md2_ret( input, ilen, output );
 }
 
 #undef MBEDTLS_DEPRECATED
diff --git a/include/mbedtls/md4.h b/include/mbedtls/md4.h
index f5d335d..acd09bd 100644
--- a/include/mbedtls/md4.h
+++ b/include/mbedtls/md4.h
@@ -86,7 +86,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_md4_starts_ext( mbedtls_md4_context *ctx );
+int mbedtls_md4_starts_ret( mbedtls_md4_context *ctx );
 
 /**
  * \brief          MD4 process buffer
@@ -97,7 +97,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_md4_update_ext( mbedtls_md4_context *ctx,
+int mbedtls_md4_update_ret( mbedtls_md4_context *ctx,
                             const unsigned char *input,
                             size_t ilen );
 
@@ -109,7 +109,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_md4_finish_ext( mbedtls_md4_context *ctx,
+int mbedtls_md4_finish_ret( mbedtls_md4_context *ctx,
                             unsigned char output[16] );
 
 /**
@@ -132,20 +132,20 @@
 /**
  * \brief          MD4 context setup
  *
- * \deprecated     Superseded by mbedtls_md4_starts_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_md4_starts_ret() in 2.5.0
  *
  * \param ctx      context to be initialized
  */
 MBEDTLS_DEPRECATED static inline void mbedtls_md4_starts(
                                                     mbedtls_md4_context *ctx )
 {
-    mbedtls_md4_starts_ext( ctx );
+    mbedtls_md4_starts_ret( ctx );
 }
 
 /**
  * \brief          MD4 process buffer
  *
- * \deprecated     Superseded by mbedtls_md4_update_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_md4_update_ret() in 2.5.0
  *
  * \param ctx      MD4 context
  * \param input    buffer holding the data
@@ -156,13 +156,13 @@
                                                     const unsigned char *input,
                                                     size_t ilen )
 {
-    mbedtls_md4_update_ext( ctx, input, ilen );
+    mbedtls_md4_update_ret( ctx, input, ilen );
 }
 
 /**
  * \brief          MD4 final digest
  *
- * \deprecated     Superseded by mbedtls_md4_finish_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_md4_finish_ret() in 2.5.0
  *
  * \param ctx      MD4 context
  * \param output   MD4 checksum result
@@ -171,7 +171,7 @@
                                                     mbedtls_md4_context *ctx,
                                                     unsigned char output[16] )
 {
-    mbedtls_md4_finish_ext( ctx, output );
+    mbedtls_md4_finish_ret( ctx, output );
 }
 
 /**
@@ -213,7 +213,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_md4_ext( const unsigned char *input,
+int mbedtls_md4_ret( const unsigned char *input,
                      size_t ilen,
                      unsigned char output[16] );
 
@@ -226,7 +226,7 @@
 /**
  * \brief          Output = MD4( input buffer )
  *
- * \deprecated     Superseded by mbedtls_md4_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_md4_ret() in 2.5.0
  *
  * \param input    buffer holding the data
  * \param ilen     length of the input data
@@ -236,7 +236,7 @@
                                                    size_t ilen,
                                                    unsigned char output[16] )
 {
-    mbedtls_md4_ext( input, ilen, output );
+    mbedtls_md4_ret( input, ilen, output );
 }
 
 #undef MBEDTLS_DEPRECATED
diff --git a/include/mbedtls/md5.h b/include/mbedtls/md5.h
index 5a7a00a..18db8b7 100644
--- a/include/mbedtls/md5.h
+++ b/include/mbedtls/md5.h
@@ -81,7 +81,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_md5_starts_ext( mbedtls_md5_context *ctx );
+int mbedtls_md5_starts_ret( mbedtls_md5_context *ctx );
 
 /**
  * \brief          MD5 process buffer
@@ -92,7 +92,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_md5_update_ext( mbedtls_md5_context *ctx,
+int mbedtls_md5_update_ret( mbedtls_md5_context *ctx,
                             const unsigned char *input,
                             size_t ilen );
 
@@ -104,7 +104,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_md5_finish_ext( mbedtls_md5_context *ctx,
+int mbedtls_md5_finish_ret( mbedtls_md5_context *ctx,
                             unsigned char output[16] );
 
 /**
@@ -127,20 +127,20 @@
 /**
  * \brief          MD5 context setup
  *
- * \deprecated     Superseded by mbedtls_md5_starts_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_md5_starts_ret() in 2.5.0
  *
  * \param ctx      context to be initialized
  */
 MBEDTLS_DEPRECATED static inline void mbedtls_md5_starts(
                                                     mbedtls_md5_context *ctx )
 {
-    mbedtls_md5_starts_ext( ctx );
+    mbedtls_md5_starts_ret( ctx );
 }
 
 /**
  * \brief          MD5 process buffer
  *
- * \deprecated     Superseded by mbedtls_md5_update_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_md5_update_ret() in 2.5.0
  *
  * \param ctx      MD5 context
  * \param input    buffer holding the data
@@ -151,13 +151,13 @@
                                                     const unsigned char *input,
                                                     size_t ilen )
 {
-    mbedtls_md5_update_ext( ctx, input, ilen );
+    mbedtls_md5_update_ret( ctx, input, ilen );
 }
 
 /**
  * \brief          MD5 final digest
  *
- * \deprecated     Superseded by mbedtls_md5_finish_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_md5_finish_ret() in 2.5.0
  *
  * \param ctx      MD5 context
  * \param output   MD5 checksum result
@@ -166,7 +166,7 @@
                                                     mbedtls_md5_context *ctx,
                                                     unsigned char output[16] )
 {
-    mbedtls_md5_finish_ext( ctx, output );
+    mbedtls_md5_finish_ret( ctx, output );
 }
 
 /**
@@ -208,7 +208,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_md5_ext( const unsigned char *input,
+int mbedtls_md5_ret( const unsigned char *input,
                      size_t ilen,
                      unsigned char output[16] );
 
@@ -221,7 +221,7 @@
 /**
  * \brief          Output = MD5( input buffer )
  *
- * \deprecated     Superseded by mbedtls_md5_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_md5_ret() in 2.5.0
  *
  * \param input    buffer holding the data
  * \param ilen     length of the input data
@@ -231,7 +231,7 @@
                                                    size_t ilen,
                                                    unsigned char output[16] )
 {
-    mbedtls_md5_ext( input, ilen, output );
+    mbedtls_md5_ret( input, ilen, output );
 }
 
 #undef MBEDTLS_DEPRECATED
diff --git a/include/mbedtls/ripemd160.h b/include/mbedtls/ripemd160.h
index 3186359..ea67981 100644
--- a/include/mbedtls/ripemd160.h
+++ b/include/mbedtls/ripemd160.h
@@ -86,7 +86,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_ripemd160_starts_ext( mbedtls_ripemd160_context *ctx );
+int mbedtls_ripemd160_starts_ret( mbedtls_ripemd160_context *ctx );
 
 /**
  * \brief          RIPEMD-160 process buffer
@@ -97,7 +97,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_ripemd160_update_ext( mbedtls_ripemd160_context *ctx,
+int mbedtls_ripemd160_update_ret( mbedtls_ripemd160_context *ctx,
                                   const unsigned char *input,
                                   size_t ilen );
 
@@ -109,7 +109,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_ripemd160_finish_ext( mbedtls_ripemd160_context *ctx,
+int mbedtls_ripemd160_finish_ret( mbedtls_ripemd160_context *ctx,
                                   unsigned char output[20] );
 
 /**
@@ -132,20 +132,20 @@
 /**
  * \brief          RIPEMD-160 context setup
  *
- * \deprecated     Superseded by mbedtls_ripemd160_starts_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_ripemd160_starts_ret() in 2.5.0
  *
  * \param ctx      context to be initialized
  */
 MBEDTLS_DEPRECATED static inline void mbedtls_ripemd160_starts(
                                             mbedtls_ripemd160_context *ctx )
 {
-    mbedtls_ripemd160_starts_ext( ctx );
+    mbedtls_ripemd160_starts_ret( ctx );
 }
 
 /**
  * \brief          RIPEMD-160 process buffer
  *
- * \deprecated     Superseded by mbedtls_ripemd160_update_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_ripemd160_update_ret() in 2.5.0
  *
  * \param ctx      RIPEMD-160 context
  * \param input    buffer holding the data
@@ -156,13 +156,13 @@
                                                 const unsigned char *input,
                                                 size_t ilen )
 {
-    mbedtls_ripemd160_update_ext( ctx, input, ilen );
+    mbedtls_ripemd160_update_ret( ctx, input, ilen );
 }
 
 /**
  * \brief          RIPEMD-160 final digest
  *
- * \deprecated     Superseded by mbedtls_ripemd160_finish_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_ripemd160_finish_ret() in 2.5.0
  *
  * \param ctx      RIPEMD-160 context
  * \param output   RIPEMD-160 checksum result
@@ -171,7 +171,7 @@
                                                 mbedtls_ripemd160_context *ctx,
                                                 unsigned char output[20] )
 {
-    mbedtls_ripemd160_finish_ext( ctx, output );
+    mbedtls_ripemd160_finish_ret( ctx, output );
 }
 
 /**
@@ -213,7 +213,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_ripemd160_ext( const unsigned char *input,
+int mbedtls_ripemd160_ret( const unsigned char *input,
                            size_t ilen,
                            unsigned char output[20] );
 
@@ -226,7 +226,7 @@
 /**
  * \brief          Output = RIPEMD-160( input buffer )
  *
- * \deprecated     Superseded by mbedtls_ripemd160_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_ripemd160_ret() in 2.5.0
  *
  * \param input    buffer holding the data
  * \param ilen     length of the input data
@@ -237,7 +237,7 @@
                                                     size_t ilen,
                                                     unsigned char output[20] )
 {
-    mbedtls_ripemd160_ext( input, ilen, output );
+    mbedtls_ripemd160_ret( input, ilen, output );
 }
 
 #undef MBEDTLS_DEPRECATED
diff --git a/include/mbedtls/sha1.h b/include/mbedtls/sha1.h
index e18e6ac..57bfea4 100644
--- a/include/mbedtls/sha1.h
+++ b/include/mbedtls/sha1.h
@@ -86,7 +86,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_sha1_starts_ext( mbedtls_sha1_context *ctx );
+int mbedtls_sha1_starts_ret( mbedtls_sha1_context *ctx );
 
 /**
  * \brief          SHA-1 process buffer
@@ -97,7 +97,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_sha1_update_ext( mbedtls_sha1_context *ctx,
+int mbedtls_sha1_update_ret( mbedtls_sha1_context *ctx,
                              const unsigned char *input,
                              size_t ilen );
 
@@ -109,7 +109,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_sha1_finish_ext( mbedtls_sha1_context *ctx,
+int mbedtls_sha1_finish_ret( mbedtls_sha1_context *ctx,
                              unsigned char output[20] );
 
 /**
@@ -132,20 +132,20 @@
 /**
  * \brief          SHA-1 context setup
  *
- * \deprecated     Superseded by mbedtls_sha1_starts_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_sha1_starts_ret() in 2.5.0
  *
  * \param ctx      context to be initialized
  */
 MBEDTLS_DEPRECATED static inline void mbedtls_sha1_starts(
                                                 mbedtls_sha1_context *ctx )
 {
-    mbedtls_sha1_starts_ext( ctx );
+    mbedtls_sha1_starts_ret( ctx );
 }
 
 /**
  * \brief          SHA-1 process buffer
  *
- * \deprecated     Superseded by mbedtls_sha1_update_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_sha1_update_ret() in 2.5.0
  *
  * \param ctx      SHA-1 context
  * \param input    buffer holding the data
@@ -156,13 +156,13 @@
                                                 const unsigned char *input,
                                                 size_t ilen )
 {
-    mbedtls_sha1_update_ext( ctx, input, ilen );
+    mbedtls_sha1_update_ret( ctx, input, ilen );
 }
 
 /**
  * \brief          SHA-1 final digest
  *
- * \deprecated     Superseded by mbedtls_sha1_finish_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_sha1_finish_ret() in 2.5.0
  *
  * \param ctx      SHA-1 context
  * \param output   SHA-1 checksum result
@@ -171,7 +171,7 @@
                                                 mbedtls_sha1_context *ctx,
                                                 unsigned char output[20] )
 {
-    mbedtls_sha1_finish_ext( ctx, output );
+    mbedtls_sha1_finish_ret( ctx, output );
 }
 
 /**
@@ -213,7 +213,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_sha1_ext( const unsigned char *input,
+int mbedtls_sha1_ret( const unsigned char *input,
                       size_t ilen,
                       unsigned char output[20] );
 
@@ -226,7 +226,7 @@
 /**
  * \brief          Output = SHA-1( input buffer )
  *
- * \deprecated     Superseded by mbedtls_sha1_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_sha1_ret() in 2.5.0
  *
  * \param input    buffer holding the data
  * \param ilen     length of the input data
@@ -236,7 +236,7 @@
                                                     size_t ilen,
                                                     unsigned char output[20] )
 {
-    mbedtls_sha1_ext( input, ilen, output );
+    mbedtls_sha1_ret( input, ilen, output );
 }
 
 #undef MBEDTLS_DEPRECATED
diff --git a/include/mbedtls/sha256.h b/include/mbedtls/sha256.h
index 5fce7ee..be5ef79 100644
--- a/include/mbedtls/sha256.h
+++ b/include/mbedtls/sha256.h
@@ -88,7 +88,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_sha256_starts_ext( mbedtls_sha256_context *ctx, int is224 );
+int mbedtls_sha256_starts_ret( mbedtls_sha256_context *ctx, int is224 );
 
 /**
  * \brief          SHA-256 process buffer
@@ -99,7 +99,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_sha256_update_ext( mbedtls_sha256_context *ctx,
+int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx,
                                const unsigned char *input,
                                size_t ilen );
 
@@ -111,7 +111,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_sha256_finish_ext( mbedtls_sha256_context *ctx,
+int mbedtls_sha256_finish_ret( mbedtls_sha256_context *ctx,
                                unsigned char output[32] );
 
 /**
@@ -134,7 +134,7 @@
 /**
  * \brief          SHA-256 context setup
  *
- * \deprecated     Superseded by mbedtls_sha256_starts_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_sha256_starts_ret() in 2.5.0
  *
  * \param ctx      context to be initialized
  * \param is224    0 = use SHA256, 1 = use SHA224
@@ -143,13 +143,13 @@
                                                 mbedtls_sha256_context *ctx,
                                                 int is224 )
 {
-    mbedtls_sha256_starts_ext( ctx, is224 );
+    mbedtls_sha256_starts_ret( ctx, is224 );
 }
 
 /**
  * \brief          SHA-256 process buffer
  *
- * \deprecated     Superseded by mbedtls_sha256_update_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_sha256_update_ret() in 2.5.0
  *
  * \param ctx      SHA-256 context
  * \param input    buffer holding the data
@@ -160,13 +160,13 @@
                                                 const unsigned char *input,
                                                 size_t ilen )
 {
-    mbedtls_sha256_update_ext( ctx, input, ilen );
+    mbedtls_sha256_update_ret( ctx, input, ilen );
 }
 
 /**
  * \brief          SHA-256 final digest
  *
- * \deprecated     Superseded by mbedtls_sha256_finish_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_sha256_finish_ret() in 2.5.0
  *
  * \param ctx      SHA-256 context
  * \param output   SHA-224/256 checksum result
@@ -175,7 +175,7 @@
                                                 mbedtls_sha256_context *ctx,
                                                 unsigned char output[32] )
 {
-    mbedtls_sha256_finish_ext( ctx, output );
+    mbedtls_sha256_finish_ret( ctx, output );
 }
 
 /**
@@ -218,7 +218,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_sha256_ext( const unsigned char *input,
+int mbedtls_sha256_ret( const unsigned char *input,
                         size_t ilen,
                         unsigned char output[32],
                         int is224 );
@@ -232,7 +232,7 @@
 /**
  * \brief          Output = SHA-256( input buffer )
  *
- * \deprecated     Superseded by mbedtls_sha256_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_sha256_ret() in 2.5.0
  *
  * \param input    buffer holding the data
  * \param ilen     length of the input data
@@ -245,7 +245,7 @@
                                                     unsigned char output[32],
                                                     int is224 )
 {
-    mbedtls_sha256_ext( input, ilen, output, is224 );
+    mbedtls_sha256_ret( input, ilen, output, is224 );
 }
 
 #undef MBEDTLS_DEPRECATED
diff --git a/include/mbedtls/sha512.h b/include/mbedtls/sha512.h
index 7cba3f6..0fadb4c 100644
--- a/include/mbedtls/sha512.h
+++ b/include/mbedtls/sha512.h
@@ -88,7 +88,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_sha512_starts_ext( mbedtls_sha512_context *ctx, int is384 );
+int mbedtls_sha512_starts_ret( mbedtls_sha512_context *ctx, int is384 );
 
 /**
  * \brief          SHA-512 process buffer
@@ -99,7 +99,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_sha512_update_ext( mbedtls_sha512_context *ctx,
+int mbedtls_sha512_update_ret( mbedtls_sha512_context *ctx,
                                const unsigned char *input,
                                size_t ilen );
 
@@ -111,7 +111,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_sha512_finish_ext( mbedtls_sha512_context *ctx,
+int mbedtls_sha512_finish_ret( mbedtls_sha512_context *ctx,
                                unsigned char output[64] );
 
 /**
@@ -134,7 +134,7 @@
 /**
  * \brief          SHA-512 context setup
  *
- * \deprecated     Superseded by mbedtls_sha512_starts_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_sha512_starts_ret() in 2.5.0
  *
  * \param ctx      context to be initialized
  * \param is384    0 = use SHA512, 1 = use SHA384
@@ -143,13 +143,13 @@
                                                 mbedtls_sha512_context *ctx,
                                                 int is384 )
 {
-    mbedtls_sha512_starts_ext( ctx, is384 );
+    mbedtls_sha512_starts_ret( ctx, is384 );
 }
 
 /**
  * \brief          SHA-512 process buffer
  *
- * \deprecated     Superseded by mbedtls_sha512_update_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_sha512_update_ret() in 2.5.0
  *
  * \param ctx      SHA-512 context
  * \param input    buffer holding the data
@@ -160,13 +160,13 @@
                                                 const unsigned char *input,
                                                 size_t ilen )
 {
-    mbedtls_sha512_update_ext( ctx, input, ilen );
+    mbedtls_sha512_update_ret( ctx, input, ilen );
 }
 
 /**
  * \brief          SHA-512 final digest
  *
- * \deprecated     Superseded by mbedtls_sha512_finish_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_sha512_finish_ret() in 2.5.0
  *
  * \param ctx      SHA-512 context
  * \param output   SHA-384/512 checksum result
@@ -175,7 +175,7 @@
                                                 mbedtls_sha512_context *ctx,
                                                 unsigned char output[64] )
 {
-    mbedtls_sha512_finish_ext( ctx, output );
+    mbedtls_sha512_finish_ret( ctx, output );
 }
 
 /**
@@ -218,7 +218,7 @@
  *
  * \return         0 if successful
  */
-int mbedtls_sha512_ext( const unsigned char *input,
+int mbedtls_sha512_ret( const unsigned char *input,
                         size_t ilen,
                         unsigned char output[64],
                         int is384 );
@@ -232,7 +232,7 @@
 /**
  * \brief          Output = SHA-512( input buffer )
  *
- * \deprecated     Superseded by mbedtls_sha512_ext() in 2.5.0
+ * \deprecated     Superseded by mbedtls_sha512_ret() in 2.5.0
  *
  * \param input    buffer holding the data
  * \param ilen     length of the input data
@@ -245,7 +245,7 @@
                                                     unsigned char output[64],
                                                     int is384 )
 {
-    mbedtls_sha512_ext( input, ilen, output, is384 );
+    mbedtls_sha512_ret( input, ilen, output, is384 );
 }
 
 #undef MBEDTLS_DEPRECATED