diff --git a/include/mbedtls/md_internal.h b/include/mbedtls/md_internal.h
index 96ff53429..e7bf16ba1 100644
--- a/include/mbedtls/md_internal.h
+++ b/include/mbedtls/md_internal.h
@@ -46,17 +46,17 @@ extern "C" {
  */
 struct mbedtls_md_info_t
 {
-    /** Digest identifier */
-    mbedtls_md_type_t type;
-
     /** Name of the message digest */
     const char * name;
 
+    /** Digest identifier */
+    mbedtls_md_type_t type;
+
     /** Output length of the digest function in bytes */
-    int size;
+    unsigned char size;
 
     /** Block length of the digest function in bytes */
-    int block_size;
+    unsigned char block_size;
 };
 
 #if defined(MBEDTLS_MD2_C)
diff --git a/library/md.c b/library/md.c
index 2ef50f67f..e1b5183b6 100644
--- a/library/md.c
+++ b/library/md.c
@@ -59,8 +59,8 @@
 
 #if defined(MBEDTLS_MD2_C)
 const mbedtls_md_info_t mbedtls_md2_info = {
-    MBEDTLS_MD_MD2,
     "MD2",
+    MBEDTLS_MD_MD2,
     16,
     16,
 };
@@ -68,8 +68,8 @@ const mbedtls_md_info_t mbedtls_md2_info = {
 
 #if defined(MBEDTLS_MD4_C)
 const mbedtls_md_info_t mbedtls_md4_info = {
-    MBEDTLS_MD_MD4,
     "MD4",
+    MBEDTLS_MD_MD4,
     16,
     64,
 };
@@ -77,8 +77,8 @@ const mbedtls_md_info_t mbedtls_md4_info = {
 
 #if defined(MBEDTLS_MD5_C)
 const mbedtls_md_info_t mbedtls_md5_info = {
-    MBEDTLS_MD_MD5,
     "MD5",
+    MBEDTLS_MD_MD5,
     16,
     64,
 };
@@ -86,8 +86,8 @@ const mbedtls_md_info_t mbedtls_md5_info = {
 
 #if defined(MBEDTLS_RIPEMD160_C)
 const mbedtls_md_info_t mbedtls_ripemd160_info = {
-    MBEDTLS_MD_RIPEMD160,
     "RIPEMD160",
+    MBEDTLS_MD_RIPEMD160,
     20,
     64,
 };
@@ -95,8 +95,8 @@ const mbedtls_md_info_t mbedtls_ripemd160_info = {
 
 #if defined(MBEDTLS_SHA1_C)
 const mbedtls_md_info_t mbedtls_sha1_info = {
-    MBEDTLS_MD_SHA1,
     "SHA1",
+    MBEDTLS_MD_SHA1,
     20,
     64,
 };
@@ -104,15 +104,15 @@ const mbedtls_md_info_t mbedtls_sha1_info = {
 
 #if defined(MBEDTLS_SHA256_C)
 const mbedtls_md_info_t mbedtls_sha224_info = {
-    MBEDTLS_MD_SHA224,
     "SHA224",
+    MBEDTLS_MD_SHA224,
     28,
     64,
 };
 
 const mbedtls_md_info_t mbedtls_sha256_info = {
-    MBEDTLS_MD_SHA256,
     "SHA256",
+    MBEDTLS_MD_SHA256,
     32,
     64,
 };
@@ -120,15 +120,15 @@ const mbedtls_md_info_t mbedtls_sha256_info = {
 
 #if defined(MBEDTLS_SHA512_C)
 const mbedtls_md_info_t mbedtls_sha384_info = {
-    MBEDTLS_MD_SHA384,
     "SHA384",
+    MBEDTLS_MD_SHA384,
     48,
     128,
 };
 
 const mbedtls_md_info_t mbedtls_sha512_info = {
-    MBEDTLS_MD_SHA512,
     "SHA512",
+    MBEDTLS_MD_SHA512,
     64,
     128,
 };