diff --git a/include/polarssl/aes.h b/include/polarssl/aes.h
index 2e9092f..9191159 100644
--- a/include/polarssl/aes.h
+++ b/include/polarssl/aes.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/aesni.h b/include/polarssl/aesni.h
index 92b23cd..12095df 100644
--- a/include/polarssl/aesni.h
+++ b/include/polarssl/aesni.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/arc4.h b/include/polarssl/arc4.h
index 555f54f..1326287 100644
--- a/include/polarssl/arc4.h
+++ b/include/polarssl/arc4.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/asn1.h b/include/polarssl/asn1.h
index eacdd08..df0a357 100644
--- a/include/polarssl/asn1.h
+++ b/include/polarssl/asn1.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/asn1write.h b/include/polarssl/asn1write.h
index 7a7fbf7..648d69e 100644
--- a/include/polarssl/asn1write.h
+++ b/include/polarssl/asn1write.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/base64.h b/include/polarssl/base64.h
index d041493..a06a4cc 100644
--- a/include/polarssl/base64.h
+++ b/include/polarssl/base64.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/bignum.h b/include/polarssl/bignum.h
index 992ed8e..b37ee44 100644
--- a/include/polarssl/bignum.h
+++ b/include/polarssl/bignum.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/blowfish.h b/include/polarssl/blowfish.h
index c652b46..606dbd3 100644
--- a/include/polarssl/blowfish.h
+++ b/include/polarssl/blowfish.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2012-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/bn_mul.h b/include/polarssl/bn_mul.h
index a8f0d22..e39d79b 100644
--- a/include/polarssl/bn_mul.h
+++ b/include/polarssl/bn_mul.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2010, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/camellia.h b/include/polarssl/camellia.h
index 8488d1d..8fd3f24 100644
--- a/include/polarssl/camellia.h
+++ b/include/polarssl/camellia.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/ccm.h b/include/polarssl/ccm.h
index 439152f..df4cbdb 100644
--- a/include/polarssl/ccm.h
+++ b/include/polarssl/ccm.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/certs.h b/include/polarssl/certs.h
index ba7c028..d911736 100644
--- a/include/polarssl/certs.h
+++ b/include/polarssl/certs.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2010, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/check_config.h b/include/polarssl/check_config.h
index cce7b2b..2471aaa 100644
--- a/include/polarssl/check_config.h
+++ b/include/polarssl/check_config.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/cipher.h b/include/polarssl/cipher.h
index 087e590..d827124 100644
--- a/include/polarssl/cipher.h
+++ b/include/polarssl/cipher.h
@@ -7,7 +7,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/cipher_wrap.h b/include/polarssl/cipher_wrap.h
index 46bc757..5892864 100644
--- a/include/polarssl/cipher_wrap.h
+++ b/include/polarssl/cipher_wrap.h
@@ -7,7 +7,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/compat-1.2.h b/include/polarssl/compat-1.2.h
index 15b5aa1..bdc506a 100644
--- a/include/polarssl/compat-1.2.h
+++ b/include/polarssl/compat-1.2.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index 04a5b26..0ecf363 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/ctr_drbg.h b/include/polarssl/ctr_drbg.h
index de696dc..8f82157 100644
--- a/include/polarssl/ctr_drbg.h
+++ b/include/polarssl/ctr_drbg.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/debug.h b/include/polarssl/debug.h
index 0dd79d5..9acffae 100644
--- a/include/polarssl/debug.h
+++ b/include/polarssl/debug.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/des.h b/include/polarssl/des.h
index 89bb394..ab5a3c6 100644
--- a/include/polarssl/des.h
+++ b/include/polarssl/des.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/dhm.h b/include/polarssl/dhm.h
index 064472f..803185b 100644
--- a/include/polarssl/dhm.h
+++ b/include/polarssl/dhm.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/ecdh.h b/include/polarssl/ecdh.h
index 525cade..830e8e7 100644
--- a/include/polarssl/ecdh.h
+++ b/include/polarssl/ecdh.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/ecdsa.h b/include/polarssl/ecdsa.h
index d99a17a..6f1a45b 100644
--- a/include/polarssl/ecdsa.h
+++ b/include/polarssl/ecdsa.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/ecp.h b/include/polarssl/ecp.h
index 6dec5bd..9574b3b 100644
--- a/include/polarssl/ecp.h
+++ b/include/polarssl/ecp.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/entropy.h b/include/polarssl/entropy.h
index f5fa928..85800aa 100644
--- a/include/polarssl/entropy.h
+++ b/include/polarssl/entropy.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/entropy_poll.h b/include/polarssl/entropy_poll.h
index 92efa00..c2fb7ac 100644
--- a/include/polarssl/entropy_poll.h
+++ b/include/polarssl/entropy_poll.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/error.h b/include/polarssl/error.h
index 6a1143f..e032cda 100644
--- a/include/polarssl/error.h
+++ b/include/polarssl/error.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/gcm.h b/include/polarssl/gcm.h
index c2829a0..f5c06d5 100644
--- a/include/polarssl/gcm.h
+++ b/include/polarssl/gcm.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/havege.h b/include/polarssl/havege.h
index 536eb08..accc4a0 100644
--- a/include/polarssl/havege.h
+++ b/include/polarssl/havege.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/hmac_drbg.h b/include/polarssl/hmac_drbg.h
index 2d765d5..495b9d9 100644
--- a/include/polarssl/hmac_drbg.h
+++ b/include/polarssl/hmac_drbg.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/md.h b/include/polarssl/md.h
index 81d8a2e..cd1fc02 100644
--- a/include/polarssl/md.h
+++ b/include/polarssl/md.h
@@ -7,7 +7,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/md2.h b/include/polarssl/md2.h
index 952b0bf..716b24e 100644
--- a/include/polarssl/md2.h
+++ b/include/polarssl/md2.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/md4.h b/include/polarssl/md4.h
index fc5a5cd..617f153 100644
--- a/include/polarssl/md4.h
+++ b/include/polarssl/md4.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/md5.h b/include/polarssl/md5.h
index 2f378f6..77386ac 100644
--- a/include/polarssl/md5.h
+++ b/include/polarssl/md5.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/md_wrap.h b/include/polarssl/md_wrap.h
index eb1db0f..f5781a2 100644
--- a/include/polarssl/md_wrap.h
+++ b/include/polarssl/md_wrap.h
@@ -7,7 +7,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/memory.h b/include/polarssl/memory.h
index 3af3951..de10020 100644
--- a/include/polarssl/memory.h
+++ b/include/polarssl/memory.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/memory_buffer_alloc.h b/include/polarssl/memory_buffer_alloc.h
index a1b4937..2d4babe 100644
--- a/include/polarssl/memory_buffer_alloc.h
+++ b/include/polarssl/memory_buffer_alloc.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/net.h b/include/polarssl/net.h
index 22698b4..3b80144 100644
--- a/include/polarssl/net.h
+++ b/include/polarssl/net.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/oid.h b/include/polarssl/oid.h
index c4d5c3f..e207802 100644
--- a/include/polarssl/oid.h
+++ b/include/polarssl/oid.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/openssl.h b/include/polarssl/openssl.h
index b77e7da..3034d39 100644
--- a/include/polarssl/openssl.h
+++ b/include/polarssl/openssl.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2010, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/padlock.h b/include/polarssl/padlock.h
index 3c5f725..6943d75 100644
--- a/include/polarssl/padlock.h
+++ b/include/polarssl/padlock.h
@@ -6,7 +6,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/pbkdf2.h b/include/polarssl/pbkdf2.h
index 5ccb2fa..417f988 100644
--- a/include/polarssl/pbkdf2.h
+++ b/include/polarssl/pbkdf2.h
@@ -8,7 +8,7 @@
  *
  *  Copyright (C) 2006-2012, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/pem.h b/include/polarssl/pem.h
index e606cf0..edafca4 100644
--- a/include/polarssl/pem.h
+++ b/include/polarssl/pem.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/pk.h b/include/polarssl/pk.h
index b29eb74..03db010 100644
--- a/include/polarssl/pk.h
+++ b/include/polarssl/pk.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/pk_wrap.h b/include/polarssl/pk_wrap.h
index 7baafb9..0cfa0fa 100644
--- a/include/polarssl/pk_wrap.h
+++ b/include/polarssl/pk_wrap.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/pkcs11.h b/include/polarssl/pkcs11.h
index 84f862d..7e70c7d 100644
--- a/include/polarssl/pkcs11.h
+++ b/include/polarssl/pkcs11.h
@@ -7,7 +7,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/pkcs12.h b/include/polarssl/pkcs12.h
index 4bd5018..afb5975 100644
--- a/include/polarssl/pkcs12.h
+++ b/include/polarssl/pkcs12.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/pkcs5.h b/include/polarssl/pkcs5.h
index 34e824b..e85452f 100644
--- a/include/polarssl/pkcs5.h
+++ b/include/polarssl/pkcs5.h
@@ -7,7 +7,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/platform.h b/include/polarssl/platform.h
index eae887a..b381e1b 100644
--- a/include/polarssl/platform.h
+++ b/include/polarssl/platform.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/ripemd160.h b/include/polarssl/ripemd160.h
index e3b66c9..8365f4e 100644
--- a/include/polarssl/ripemd160.h
+++ b/include/polarssl/ripemd160.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2014-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/rsa.h b/include/polarssl/rsa.h
index e636c80..d0f8d00 100644
--- a/include/polarssl/rsa.h
+++ b/include/polarssl/rsa.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/sha1.h b/include/polarssl/sha1.h
index cb0c436..86598d1 100644
--- a/include/polarssl/sha1.h
+++ b/include/polarssl/sha1.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/sha256.h b/include/polarssl/sha256.h
index b143674..56b1efe 100644
--- a/include/polarssl/sha256.h
+++ b/include/polarssl/sha256.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/sha512.h b/include/polarssl/sha512.h
index dfbae4a..0082a64 100644
--- a/include/polarssl/sha512.h
+++ b/include/polarssl/sha512.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h
index 5a96e05..1ea84ed 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/ssl_cache.h b/include/polarssl/ssl_cache.h
index 918fb60..61e529c 100644
--- a/include/polarssl/ssl_cache.h
+++ b/include/polarssl/ssl_cache.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/ssl_ciphersuites.h b/include/polarssl/ssl_ciphersuites.h
index 191596f..c991e8b 100644
--- a/include/polarssl/ssl_ciphersuites.h
+++ b/include/polarssl/ssl_ciphersuites.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/threading.h b/include/polarssl/threading.h
index 1fc9f98..0157db4 100644
--- a/include/polarssl/threading.h
+++ b/include/polarssl/threading.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/timing.h b/include/polarssl/timing.h
index 383120e..cd4f125 100644
--- a/include/polarssl/timing.h
+++ b/include/polarssl/timing.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/version.h b/include/polarssl/version.h
index b00687f..7b78ae4 100644
--- a/include/polarssl/version.h
+++ b/include/polarssl/version.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/x509.h b/include/polarssl/x509.h
index 5f71881..1d0e30c 100644
--- a/include/polarssl/x509.h
+++ b/include/polarssl/x509.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/x509_crl.h b/include/polarssl/x509_crl.h
index 4ddbafc..edaef1e 100644
--- a/include/polarssl/x509_crl.h
+++ b/include/polarssl/x509_crl.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/x509_crt.h b/include/polarssl/x509_crt.h
index 4bf8e56..456f069 100644
--- a/include/polarssl/x509_crt.h
+++ b/include/polarssl/x509_crt.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/x509_csr.h b/include/polarssl/x509_csr.h
index 6591e38..b0d4f1e 100644
--- a/include/polarssl/x509_csr.h
+++ b/include/polarssl/x509_csr.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/include/polarssl/xtea.h b/include/polarssl/xtea.h
index 794c5ef..ca4ca16 100644
--- a/include/polarssl/xtea.h
+++ b/include/polarssl/xtea.h
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/aes.c b/library/aes.c
index f295747..fcc6c05 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/aesni.c b/library/aesni.c
index 97f646e..9dff355 100644
--- a/library/aesni.c
+++ b/library/aesni.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/arc4.c b/library/arc4.c
index 54e89ea..c4c9a2f 100644
--- a/library/arc4.c
+++ b/library/arc4.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/asn1parse.c b/library/asn1parse.c
index e2117bf..6179946 100644
--- a/library/asn1parse.c
+++ b/library/asn1parse.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/asn1write.c b/library/asn1write.c
index d3ece60..8032fb4 100644
--- a/library/asn1write.c
+++ b/library/asn1write.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/base64.c b/library/base64.c
index e6c3569..ffbc927 100644
--- a/library/base64.c
+++ b/library/base64.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/bignum.c b/library/bignum.c
index 448e743..3ab3857 100644
--- a/library/bignum.c
+++ b/library/bignum.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/blowfish.c b/library/blowfish.c
index 87396dc..6df7c74 100644
--- a/library/blowfish.c
+++ b/library/blowfish.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2012-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/camellia.c b/library/camellia.c
index 3956a40..61b89c0 100644
--- a/library/camellia.c
+++ b/library/camellia.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/ccm.c b/library/ccm.c
index 72d766b..27039fe 100644
--- a/library/ccm.c
+++ b/library/ccm.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/certs.c b/library/certs.c
index a782bc1..a5759ad 100644
--- a/library/certs.c
+++ b/library/certs.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/cipher.c b/library/cipher.c
index 5cd30f8..b11ecf0 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -7,7 +7,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/cipher_wrap.c b/library/cipher_wrap.c
index ab2f9bc..2a7d920 100644
--- a/library/cipher_wrap.c
+++ b/library/cipher_wrap.c
@@ -7,7 +7,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/ctr_drbg.c b/library/ctr_drbg.c
index 91e0615..62dc7b1 100644
--- a/library/ctr_drbg.c
+++ b/library/ctr_drbg.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/debug.c b/library/debug.c
index 865bd54..0790d19 100644
--- a/library/debug.c
+++ b/library/debug.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/des.c b/library/des.c
index 12fe4f4..6b5b0bb 100644
--- a/library/des.c
+++ b/library/des.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/dhm.c b/library/dhm.c
index 089c11b..858ff82 100644
--- a/library/dhm.c
+++ b/library/dhm.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/ecdh.c b/library/ecdh.c
index b93d82e..f9f2019 100644
--- a/library/ecdh.c
+++ b/library/ecdh.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/ecdsa.c b/library/ecdsa.c
index e9880ef..b55db4f 100644
--- a/library/ecdsa.c
+++ b/library/ecdsa.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/ecp.c b/library/ecp.c
index 41e25e9..ef9b916 100644
--- a/library/ecp.c
+++ b/library/ecp.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/ecp_curves.c b/library/ecp_curves.c
index 4c0018c..8ab14f0 100644
--- a/library/ecp_curves.c
+++ b/library/ecp_curves.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/entropy.c b/library/entropy.c
index bc7fb0f..1e9139f 100644
--- a/library/entropy.c
+++ b/library/entropy.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/entropy_poll.c b/library/entropy_poll.c
index 33e75bc..851fd82 100644
--- a/library/entropy_poll.c
+++ b/library/entropy_poll.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/error.c b/library/error.c
index 1a57ee9..fa4d128 100644
--- a/library/error.c
+++ b/library/error.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/gcm.c b/library/gcm.c
index d48f318..06797b9 100644
--- a/library/gcm.c
+++ b/library/gcm.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/havege.c b/library/havege.c
index 3acd5bc..29b0112 100644
--- a/library/havege.c
+++ b/library/havege.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/hmac_drbg.c b/library/hmac_drbg.c
index d691be1..aa26390 100644
--- a/library/hmac_drbg.c
+++ b/library/hmac_drbg.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/md.c b/library/md.c
index 5f3f32d..202ce58 100644
--- a/library/md.c
+++ b/library/md.c
@@ -7,7 +7,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/md2.c b/library/md2.c
index 45bce37..87fcedd 100644
--- a/library/md2.c
+++ b/library/md2.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/md4.c b/library/md4.c
index f6b71d5..f8f7d85 100644
--- a/library/md4.c
+++ b/library/md4.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/md5.c b/library/md5.c
index 89354bc..f687352 100644
--- a/library/md5.c
+++ b/library/md5.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/md_wrap.c b/library/md_wrap.c
index de701d3..fdae018 100644
--- a/library/md_wrap.c
+++ b/library/md_wrap.c
@@ -7,7 +7,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/memory_buffer_alloc.c b/library/memory_buffer_alloc.c
index 4a5be47..7aabb61 100644
--- a/library/memory_buffer_alloc.c
+++ b/library/memory_buffer_alloc.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/net.c b/library/net.c
index 2c77138..7fa979b 100644
--- a/library/net.c
+++ b/library/net.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/oid.c b/library/oid.c
index 7b54054..1180279 100644
--- a/library/oid.c
+++ b/library/oid.c
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/padlock.c b/library/padlock.c
index 5d06390..dbf874b 100644
--- a/library/padlock.c
+++ b/library/padlock.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/pbkdf2.c b/library/pbkdf2.c
index e76f066..aa97721 100644
--- a/library/pbkdf2.c
+++ b/library/pbkdf2.c
@@ -8,7 +8,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/pem.c b/library/pem.c
index 485d829..b0ec8ff 100644
--- a/library/pem.c
+++ b/library/pem.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/pk.c b/library/pk.c
index a37f58e..17144aa 100644
--- a/library/pk.c
+++ b/library/pk.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/pk_wrap.c b/library/pk_wrap.c
index 7776f01..d1b9cb9 100644
--- a/library/pk_wrap.c
+++ b/library/pk_wrap.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/pkcs11.c b/library/pkcs11.c
index 64e7ce3..a8f5f63 100644
--- a/library/pkcs11.c
+++ b/library/pkcs11.c
@@ -7,7 +7,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/pkcs12.c b/library/pkcs12.c
index 0cf2edf..65ff850 100644
--- a/library/pkcs12.c
+++ b/library/pkcs12.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/pkcs5.c b/library/pkcs5.c
index e2c4e48..3d788fc 100644
--- a/library/pkcs5.c
+++ b/library/pkcs5.c
@@ -7,7 +7,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/pkparse.c b/library/pkparse.c
index 6cfab8b..f3866f7 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/pkwrite.c b/library/pkwrite.c
index d627380..40184cd 100644
--- a/library/pkwrite.c
+++ b/library/pkwrite.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/platform.c b/library/platform.c
index d57cbc8..6ea7bb2 100644
--- a/library/platform.c
+++ b/library/platform.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/ripemd160.c b/library/ripemd160.c
index fcd7760..83b2c2c 100644
--- a/library/ripemd160.c
+++ b/library/ripemd160.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2014-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/rsa.c b/library/rsa.c
index 54babb5..890ba9b 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/sha1.c b/library/sha1.c
index 20408c7..bb24d85 100644
--- a/library/sha1.c
+++ b/library/sha1.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/sha256.c b/library/sha256.c
index 4fc6698..3a4d2a7 100644
--- a/library/sha256.c
+++ b/library/sha256.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/sha512.c b/library/sha512.c
index f1d1525..eb5396a 100644
--- a/library/sha512.c
+++ b/library/sha512.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/ssl_cache.c b/library/ssl_cache.c
index 5868e69..a47bba4 100644
--- a/library/ssl_cache.c
+++ b/library/ssl_cache.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/ssl_ciphersuites.c b/library/ssl_ciphersuites.c
index 7907980..c49eb90 100644
--- a/library/ssl_ciphersuites.c
+++ b/library/ssl_ciphersuites.c
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index c3729ee..964154a 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 138d1f9..c63d3a3 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index d0fc470..22834fc 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/threading.c b/library/threading.c
index 522c70f..de98bd6 100644
--- a/library/threading.c
+++ b/library/threading.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/timing.c b/library/timing.c
index b387bd8..ef5f058 100644
--- a/library/timing.c
+++ b/library/timing.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/version.c b/library/version.c
index c3c708a..03e1dcf 100644
--- a/library/version.c
+++ b/library/version.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/version_features.c b/library/version_features.c
index 1023198..550960c 100644
--- a/library/version_features.c
+++ b/library/version_features.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/x509.c b/library/x509.c
index 78cf02d..097f7dc 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/x509_create.c b/library/x509_create.c
index 747dc82..f03c9da 100644
--- a/library/x509_create.c
+++ b/library/x509_create.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/x509_crl.c b/library/x509_crl.c
index a0bf9f4..07e01c0 100644
--- a/library/x509_crl.c
+++ b/library/x509_crl.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/x509_crt.c b/library/x509_crt.c
index aba9c69..35c21d4 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/x509_csr.c b/library/x509_csr.c
index 5831121..b76d441 100644
--- a/library/x509_csr.c
+++ b/library/x509_csr.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/x509write_crt.c b/library/x509write_crt.c
index e298c24..51e4ff0 100644
--- a/library/x509write_crt.c
+++ b/library/x509write_crt.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/x509write_csr.c b/library/x509write_csr.c
index 53ae9c6..de519ec 100644
--- a/library/x509write_csr.c
+++ b/library/x509write_csr.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/library/xtea.c b/library/xtea.c
index 75215c5..3b15ce6 100644
--- a/library/xtea.c
+++ b/library/xtea.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/aes/aescrypt2.c b/programs/aes/aescrypt2.c
index 40b7fec..439386b 100644
--- a/programs/aes/aescrypt2.c
+++ b/programs/aes/aescrypt2.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/aes/crypt_and_hash.c b/programs/aes/crypt_and_hash.c
index f5484d4..bd3b40a 100644
--- a/programs/aes/crypt_and_hash.c
+++ b/programs/aes/crypt_and_hash.c
@@ -4,7 +4,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/hash/generic_sum.c b/programs/hash/generic_sum.c
index 4d007cf..cb5cf13 100644
--- a/programs/hash/generic_sum.c
+++ b/programs/hash/generic_sum.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/hash/hello.c b/programs/hash/hello.c
index 5bcfee9..ca168c2 100644
--- a/programs/hash/hello.c
+++ b/programs/hash/hello.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/hash/md5sum.c b/programs/hash/md5sum.c
index ba7eea4..4638a84 100644
--- a/programs/hash/md5sum.c
+++ b/programs/hash/md5sum.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/hash/sha1sum.c b/programs/hash/sha1sum.c
index 3a87b51..e50e6d9 100644
--- a/programs/hash/sha1sum.c
+++ b/programs/hash/sha1sum.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/hash/sha2sum.c b/programs/hash/sha2sum.c
index 3452054..576f21e 100644
--- a/programs/hash/sha2sum.c
+++ b/programs/hash/sha2sum.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/dh_client.c b/programs/pkey/dh_client.c
index 5315eb9..9bcc363 100644
--- a/programs/pkey/dh_client.c
+++ b/programs/pkey/dh_client.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/dh_genprime.c b/programs/pkey/dh_genprime.c
index 598940e..f52fb73 100644
--- a/programs/pkey/dh_genprime.c
+++ b/programs/pkey/dh_genprime.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2012, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c
index 976da4c..02db807 100644
--- a/programs/pkey/dh_server.c
+++ b/programs/pkey/dh_server.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/ecdsa.c b/programs/pkey/ecdsa.c
index 67fc710..c1b05c3 100644
--- a/programs/pkey/ecdsa.c
+++ b/programs/pkey/ecdsa.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/gen_key.c b/programs/pkey/gen_key.c
index 9a0d079..a680656 100644
--- a/programs/pkey/gen_key.c
+++ b/programs/pkey/gen_key.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/key_app.c b/programs/pkey/key_app.c
index 27199ba..064643a 100644
--- a/programs/pkey/key_app.c
+++ b/programs/pkey/key_app.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/key_app_writer.c b/programs/pkey/key_app_writer.c
index 983b64e..cf4b9b0 100644
--- a/programs/pkey/key_app_writer.c
+++ b/programs/pkey/key_app_writer.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/mpi_demo.c b/programs/pkey/mpi_demo.c
index 2e9bf93..53e19cc 100644
--- a/programs/pkey/mpi_demo.c
+++ b/programs/pkey/mpi_demo.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/pk_decrypt.c b/programs/pkey/pk_decrypt.c
index 2ecb1d8..338edcc 100644
--- a/programs/pkey/pk_decrypt.c
+++ b/programs/pkey/pk_decrypt.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/pk_encrypt.c b/programs/pkey/pk_encrypt.c
index 2eb139c..4e7f551 100644
--- a/programs/pkey/pk_encrypt.c
+++ b/programs/pkey/pk_encrypt.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/pk_sign.c b/programs/pkey/pk_sign.c
index d80cbd7..7593844 100644
--- a/programs/pkey/pk_sign.c
+++ b/programs/pkey/pk_sign.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/pk_verify.c b/programs/pkey/pk_verify.c
index e970520..845ae84 100644
--- a/programs/pkey/pk_verify.c
+++ b/programs/pkey/pk_verify.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/rsa_decrypt.c b/programs/pkey/rsa_decrypt.c
index c79f1e4..c53da32 100644
--- a/programs/pkey/rsa_decrypt.c
+++ b/programs/pkey/rsa_decrypt.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/rsa_encrypt.c b/programs/pkey/rsa_encrypt.c
index 677ce76..68664e0 100644
--- a/programs/pkey/rsa_encrypt.c
+++ b/programs/pkey/rsa_encrypt.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/rsa_genkey.c b/programs/pkey/rsa_genkey.c
index 48d8c5e..c8f1684 100644
--- a/programs/pkey/rsa_genkey.c
+++ b/programs/pkey/rsa_genkey.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/rsa_sign.c b/programs/pkey/rsa_sign.c
index 0689557..91ad1fe 100644
--- a/programs/pkey/rsa_sign.c
+++ b/programs/pkey/rsa_sign.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/rsa_sign_pss.c b/programs/pkey/rsa_sign_pss.c
index e3e56c6..bf0b01a 100644
--- a/programs/pkey/rsa_sign_pss.c
+++ b/programs/pkey/rsa_sign_pss.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/rsa_verify.c b/programs/pkey/rsa_verify.c
index 9c7c5ee..fc26b60 100644
--- a/programs/pkey/rsa_verify.c
+++ b/programs/pkey/rsa_verify.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/pkey/rsa_verify_pss.c b/programs/pkey/rsa_verify_pss.c
index 84945c3..8dcddd5 100644
--- a/programs/pkey/rsa_verify_pss.c
+++ b/programs/pkey/rsa_verify_pss.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/random/gen_entropy.c b/programs/random/gen_entropy.c
index 67679c8..2701053 100644
--- a/programs/random/gen_entropy.c
+++ b/programs/random/gen_entropy.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/random/gen_random_ctr_drbg.c b/programs/random/gen_random_ctr_drbg.c
index 94e200d..74e38cf 100644
--- a/programs/random/gen_random_ctr_drbg.c
+++ b/programs/random/gen_random_ctr_drbg.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/random/gen_random_havege.c b/programs/random/gen_random_havege.c
index e9152fa..4a9a218 100644
--- a/programs/random/gen_random_havege.c
+++ b/programs/random/gen_random_havege.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/ssl/ssl_client1.c b/programs/ssl/ssl_client1.c
index 5a0571c..68ec8b6 100644
--- a/programs/ssl/ssl_client1.c
+++ b/programs/ssl/ssl_client1.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index 6572029..600fae5 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/ssl/ssl_fork_server.c b/programs/ssl/ssl_fork_server.c
index 07c1cd6..66505a9 100644
--- a/programs/ssl/ssl_fork_server.c
+++ b/programs/ssl/ssl_fork_server.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/ssl/ssl_mail_client.c b/programs/ssl/ssl_mail_client.c
index 8d6441d..2105a2b 100644
--- a/programs/ssl/ssl_mail_client.c
+++ b/programs/ssl/ssl_mail_client.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2012, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/ssl/ssl_pthread_server.c b/programs/ssl/ssl_pthread_server.c
index 1912929..c61c595 100644
--- a/programs/ssl/ssl_pthread_server.c
+++ b/programs/ssl/ssl_pthread_server.c
@@ -4,7 +4,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/ssl/ssl_server.c b/programs/ssl/ssl_server.c
index a841159..a518c95 100644
--- a/programs/ssl/ssl_server.c
+++ b/programs/ssl/ssl_server.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 5b4a6bd..8538fcb 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c
index 4462357..77c00e7 100644
--- a/programs/test/benchmark.c
+++ b/programs/test/benchmark.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/test/o_p_test.c b/programs/test/o_p_test.c
index e5047e5..358cd90 100644
--- a/programs/test/o_p_test.c
+++ b/programs/test/o_p_test.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2011-2012 Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 3e68e36..ad8d0cb 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/test/ssl_cert_test.c b/programs/test/ssl_cert_test.c
index 2553dba..09f6c87 100644
--- a/programs/test/ssl_cert_test.c
+++ b/programs/test/ssl_cert_test.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/test/ssl_test.c b/programs/test/ssl_test.c
index b436d17..2154b42 100644
--- a/programs/test/ssl_test.c
+++ b/programs/test/ssl_test.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/util/pem2der.c b/programs/util/pem2der.c
index dfd7a49..03eb4ec 100644
--- a/programs/util/pem2der.c
+++ b/programs/util/pem2der.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/util/strerror.c b/programs/util/strerror.c
index b56eaae..5b7f125 100644
--- a/programs/util/strerror.c
+++ b/programs/util/strerror.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2012, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/wince_main.c b/programs/wince_main.c
index 946569e..98569ae 100644
--- a/programs/wince_main.c
+++ b/programs/wince_main.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/x509/cert_app.c b/programs/x509/cert_app.c
index 1ab7cc7..a616932 100644
--- a/programs/x509/cert_app.c
+++ b/programs/x509/cert_app.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/x509/cert_req.c b/programs/x509/cert_req.c
index f229e0b..19173c1 100644
--- a/programs/x509/cert_req.c
+++ b/programs/x509/cert_req.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2011, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/x509/cert_write.c b/programs/x509/cert_write.c
index 8f0616c..2ec0738 100644
--- a/programs/x509/cert_write.c
+++ b/programs/x509/cert_write.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/x509/crl_app.c b/programs/x509/crl_app.c
index b1f0a02..3cd0314 100644
--- a/programs/x509/crl_app.c
+++ b/programs/x509/crl_app.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/programs/x509/req_app.c b/programs/x509/req_app.c
index 91bb2dc..8395054 100644
--- a/programs/x509/req_app.c
+++ b/programs/x509/req_app.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2013, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/scripts/data_files/error.fmt b/scripts/data_files/error.fmt
index b698427..aeb80dc 100644
--- a/scripts/data_files/error.fmt
+++ b/scripts/data_files/error.fmt
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.
diff --git a/scripts/data_files/version_features.fmt b/scripts/data_files/version_features.fmt
index f1d90cf..a829c80 100644
--- a/scripts/data_files/version_features.fmt
+++ b/scripts/data_files/version_features.fmt
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
+ *  This file is part of mbed TLS (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
  *
  *  All rights reserved.