diff --git a/include/polarssl/ssl_cookie.h b/include/polarssl/ssl_cookie.h
index 9a714438d..65adc78c4 100644
--- a/include/polarssl/ssl_cookie.h
+++ b/include/polarssl/ssl_cookie.h
@@ -5,10 +5,7 @@
  *
  *  Copyright (C) 2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
+ *  This file is part of mbed TLS (https://www.polarssl.org)
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/library/ssl_cookie.c b/library/ssl_cookie.c
index c090b32b2..dd86f581f 100644
--- a/library/ssl_cookie.c
+++ b/library/ssl_cookie.c
@@ -3,10 +3,7 @@
  *
  *  Copyright (C) 2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
+ *  This file is part of mbed TLS (https://www.polarssl.org)
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/programs/ssl/dtls_client.c b/programs/ssl/dtls_client.c
index 7c95c4417..06d204dd2 100644
--- a/programs/ssl/dtls_client.c
+++ b/programs/ssl/dtls_client.c
@@ -3,10 +3,7 @@
  *
  *  Copyright (C) 2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
+ *  This file is part of mbed TLS (https://www.polarssl.org)
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/programs/ssl/dtls_server.c b/programs/ssl/dtls_server.c
index 2f1f2c45f..b9abf2320 100644
--- a/programs/ssl/dtls_server.c
+++ b/programs/ssl/dtls_server.c
@@ -3,10 +3,7 @@
  *
  *  Copyright (C) 2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
+ *  This file is part of mbed TLS (https://www.polarssl.org)
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/programs/test/udp_proxy.c b/programs/test/udp_proxy.c
index c95b7f34a..1836428d9 100644
--- a/programs/test/udp_proxy.c
+++ b/programs/test/udp_proxy.c
@@ -3,10 +3,7 @@
  *
  *  Copyright (C) 2006-2014, Brainspark B.V.
  *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
+ *  This file is part of mbed TLS (https://www.polarssl.org)
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/tests/compat.sh b/tests/compat.sh
index 32b07c930..319116663 100755
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -199,7 +199,7 @@ filter_ciphersuites()
         esac
     fi
 
-    # For GnuTLS client -> PolarSSL server,
+    # For GnuTLS client -> mbed TLS server,
     # we need to force IPv4 by connecting to 127.0.0.1 but then auth fails
     if [ "X$VERIFY" = "XYES" ] && is_dtls "$MODE"; then
         G_CIPHERS=""