Renamed sha2.{c,h} to sha256.{c,h} and sha4.{c,h} to sha512.{c,h}
diff --git a/include/polarssl/entropy.h b/include/polarssl/entropy.h
index 539e5cb..69d5b3b 100644
--- a/include/polarssl/entropy.h
+++ b/include/polarssl/entropy.h
@@ -31,7 +31,7 @@
 
 #include "config.h"
 
-#include "sha4.h"
+#include "sha512.h"
 #if defined(POLARSSL_HAVEGE_C)
 #include "havege.h"
 #endif
diff --git a/include/polarssl/sha2.h b/include/polarssl/sha256.h
similarity index 97%
rename from include/polarssl/sha2.h
rename to include/polarssl/sha256.h
index 09ba87c..7d964b8 100644
--- a/include/polarssl/sha2.h
+++ b/include/polarssl/sha256.h
@@ -1,5 +1,5 @@
 /**
- * \file sha2.h
+ * \file sha256.h
  *
  * \brief SHA-224 and SHA-256 cryptographic hash function
  *
@@ -24,8 +24,8 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef POLARSSL_SHA2_H
-#define POLARSSL_SHA2_H
+#ifndef POLARSSL_SHA256_H
+#define POLARSSL_SHA256_H
 
 #include "config.h"
 
@@ -96,7 +96,7 @@
 #endif
 
 #else  /* POLARSSL_SHA256_ALT */
-#include "sha2_alt.h"
+#include "sha256_alt.h"
 #endif /* POLARSSL_SHA256_ALT */
 
 #ifdef __cplusplus
@@ -185,4 +185,4 @@
 }
 #endif
 
-#endif /* sha2.h */
+#endif /* sha256.h */
diff --git a/include/polarssl/sha4.h b/include/polarssl/sha512.h
similarity index 97%
rename from include/polarssl/sha4.h
rename to include/polarssl/sha512.h
index 711353a..2c61637 100644
--- a/include/polarssl/sha4.h
+++ b/include/polarssl/sha512.h
@@ -1,5 +1,5 @@
 /**
- * \file sha4.h
+ * \file sha512.h
  *
  * \brief SHA-384 and SHA-512 cryptographic hash function
  *
@@ -24,8 +24,8 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef POLARSSL_SHA4_H
-#define POLARSSL_SHA4_H
+#ifndef POLARSSL_SHA512_H
+#define POLARSSL_SHA512_H
 
 #include "config.h"
 
@@ -94,7 +94,7 @@
 #endif
 
 #else  /* POLARSSL_SHA512_ALT */
-#include "sha4_alt.h"
+#include "sha512_alt.h"
 #endif /* POLARSSL_SHA512_ALT */
 
 #ifdef __cplusplus
@@ -186,4 +186,4 @@
 }
 #endif
 
-#endif /* sha4.h */
+#endif /* sha512.h */
diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h
index 01d8839..4bc0fad 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -35,8 +35,8 @@
 
 #include "md5.h"
 #include "sha1.h"
-#include "sha2.h"
-#include "sha4.h"
+#include "sha256.h"
+#include "sha512.h"
 
 #include "ssl_ciphersuites.h"