diff --git a/include/mbedtls/md_wrap.h b/include/mbedtls/md_wrap.h
index 94d9145..219d0fa 100644
--- a/include/mbedtls/md_wrap.h
+++ b/include/mbedtls/md_wrap.h
@@ -25,13 +25,13 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef POLARSSL_MD_WRAP_H
-#define POLARSSL_MD_WRAP_H
+#ifndef MBEDTLS_MD_WRAP_H
+#define MBEDTLS_MD_WRAP_H
 
-#if !defined(POLARSSL_CONFIG_FILE)
+#if !defined(MBEDTLS_CONFIG_FILE)
 #include "config.h"
 #else
-#include POLARSSL_CONFIG_FILE
+#include MBEDTLS_CONFIG_FILE
 #endif
 
 #include "md.h"
@@ -44,10 +44,10 @@
  * Message digest information.
  * Allows message digest functions to be called in a generic way.
  */
-struct _md_info_t
+struct mbedtls_md_info_t
 {
     /** Digest identifier */
-    md_type_t type;
+    mbedtls_md_type_t type;
 
     /** Name of the message digest */
     const char * name;
@@ -84,32 +84,32 @@
     void (*process_func)( void *ctx, const unsigned char *input );
 };
 
-#if defined(POLARSSL_MD2_C)
-extern const md_info_t md2_info;
+#if defined(MBEDTLS_MD2_C)
+extern const mbedtls_md_info_t mbedtls_md2_info;
 #endif
-#if defined(POLARSSL_MD4_C)
-extern const md_info_t md4_info;
+#if defined(MBEDTLS_MD4_C)
+extern const mbedtls_md_info_t mbedtls_md4_info;
 #endif
-#if defined(POLARSSL_MD5_C)
-extern const md_info_t md5_info;
+#if defined(MBEDTLS_MD5_C)
+extern const mbedtls_md_info_t mbedtls_md5_info;
 #endif
-#if defined(POLARSSL_RIPEMD160_C)
-extern const md_info_t ripemd160_info;
+#if defined(MBEDTLS_RIPEMD160_C)
+extern const mbedtls_md_info_t mbedtls_ripemd160_info;
 #endif
-#if defined(POLARSSL_SHA1_C)
-extern const md_info_t sha1_info;
+#if defined(MBEDTLS_SHA1_C)
+extern const mbedtls_md_info_t mbedtls_sha1_info;
 #endif
-#if defined(POLARSSL_SHA256_C)
-extern const md_info_t sha224_info;
-extern const md_info_t sha256_info;
+#if defined(MBEDTLS_SHA256_C)
+extern const mbedtls_md_info_t mbedtls_sha224_info;
+extern const mbedtls_md_info_t mbedtls_sha256_info;
 #endif
-#if defined(POLARSSL_SHA512_C)
-extern const md_info_t sha384_info;
-extern const md_info_t sha512_info;
+#if defined(MBEDTLS_SHA512_C)
+extern const mbedtls_md_info_t mbedtls_sha384_info;
+extern const mbedtls_md_info_t mbedtls_sha512_info;
 #endif
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* POLARSSL_MD_WRAP_H */
+#endif /* MBEDTLS_MD_WRAP_H */