diff --git a/programs/aes/aescrypt2.c b/programs/aes/aescrypt2.c
index e9207ef..457b85e 100644
--- a/programs/aes/aescrypt2.c
+++ b/programs/aes/aescrypt2.c
@@ -45,7 +45,7 @@
 #include "polarssl/config.h"
 
 #include "polarssl/aes.h"
-#include "polarssl/sha2.h"
+#include "polarssl/sha256.h"
 
 #define MODE_ENCRYPT    0
 #define MODE_DECRYPT    1
diff --git a/programs/hash/sha2sum.c b/programs/hash/sha2sum.c
index 81a8058..446d60b 100644
--- a/programs/hash/sha2sum.c
+++ b/programs/hash/sha2sum.c
@@ -1,7 +1,7 @@
 /*
  *  sha256sum demonstration program
  *
- *  Copyright (C) 2006-2011, Brainspark B.V.
+ *  Copyright (C) 2006-2013, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -32,7 +32,7 @@
 
 #include "polarssl/config.h"
 
-#include "polarssl/sha2.h"
+#include "polarssl/sha256.h"
 
 #if !defined(POLARSSL_SHA256_C) || !defined(POLARSSL_FS_IO)
 int main( int argc, char *argv[] )
diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c
index acccd01..7c73e61 100644
--- a/programs/test/benchmark.c
+++ b/programs/test/benchmark.c
@@ -1,7 +1,7 @@
 /*
  *  Benchmark demonstration program
  *
- *  Copyright (C) 2006-2011, Brainspark B.V.
+ *  Copyright (C) 2006-2013, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -36,8 +36,8 @@
 #include "polarssl/md4.h"
 #include "polarssl/md5.h"
 #include "polarssl/sha1.h"
-#include "polarssl/sha2.h"
-#include "polarssl/sha4.h"
+#include "polarssl/sha256.h"
+#include "polarssl/sha512.h"
 #include "polarssl/arc4.h"
 #include "polarssl/des.h"
 #include "polarssl/aes.h"
diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 0068793..909111e 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -1,7 +1,7 @@
 /*
  *  Self-test demonstration program
  *
- *  Copyright (C) 2006-2011, Brainspark B.V.
+ *  Copyright (C) 2006-2013, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -38,8 +38,8 @@
 #include "polarssl/md4.h"
 #include "polarssl/md5.h"
 #include "polarssl/sha1.h"
-#include "polarssl/sha2.h"
-#include "polarssl/sha4.h"
+#include "polarssl/sha256.h"
+#include "polarssl/sha512.h"
 #include "polarssl/arc4.h"
 #include "polarssl/des.h"
 #include "polarssl/aes.h"