diff --git a/programs/pkey/key_app.c b/programs/pkey/key_app.c
index 051ceb511..2f906c4ec 100644
--- a/programs/pkey/key_app.c
+++ b/programs/pkey/key_app.c
@@ -169,7 +169,7 @@ int main( int argc, char *argv[] )
         if( ret != 0 )
         {
 #ifdef POLARSSL_ERROR_C
-            error_strerror( ret, buf, 1024 );
+            polarssl_strerror( ret, buf, 1024 );
 #endif
             printf( " failed\n  !  x509parse_key returned %d - %s\n\n", ret, buf );
             rsa_free( &rsa );
@@ -204,7 +204,7 @@ int main( int argc, char *argv[] )
         if( ret != 0 )
         {
 #ifdef POLARSSL_ERROR_C
-            error_strerror( ret, buf, 1024 );
+            polarssl_strerror( ret, buf, 1024 );
 #endif
             printf( " failed\n  !  x509parse_public_key returned %d - %s\n\n", ret, buf );
             rsa_free( &rsa );
diff --git a/programs/pkey/key_app_writer.c b/programs/pkey/key_app_writer.c
index 7d3a77c5a..feb2ecc53 100644
--- a/programs/pkey/key_app_writer.c
+++ b/programs/pkey/key_app_writer.c
@@ -243,7 +243,7 @@ int main( int argc, char *argv[] )
         if( ret != 0 )
         {
 #ifdef POLARSSL_ERROR_C
-            error_strerror( ret, buf, 1024 );
+            polarssl_strerror( ret, buf, 1024 );
 #endif
             printf( " failed\n  !  x509parse_key returned %d - %s\n\n", ret, buf );
             rsa_free( &rsa );
@@ -279,7 +279,7 @@ int main( int argc, char *argv[] )
         if( ret != 0 )
         {
 #ifdef POLARSSL_ERROR_C
-            error_strerror( ret, buf, 1024 );
+            polarssl_strerror( ret, buf, 1024 );
 #endif
             printf( " failed\n  !  x509parse_public_key returned %d - %s\n\n", ret, buf );
             rsa_free( &rsa );
diff --git a/programs/ssl/ssl_client1.c b/programs/ssl/ssl_client1.c
index 184aac1f5..f4f3cca4b 100644
--- a/programs/ssl/ssl_client1.c
+++ b/programs/ssl/ssl_client1.c
@@ -272,7 +272,7 @@ exit:
     if( ret != 0 )
     {
         char error_buf[100];
-        error_strerror( ret, error_buf, 100 );
+        polarssl_strerror( ret, error_buf, 100 );
         printf("Last error was: %d - %s\n\n", ret, error_buf );
     }
 #endif
diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index 9802c56fc..1ddb86d9f 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -737,7 +737,7 @@ exit:
     if( ret != 0 )
     {
         char error_buf[100];
-        error_strerror( ret, error_buf, 100 );
+        polarssl_strerror( ret, error_buf, 100 );
         printf("Last error was: -0x%X - %s\n\n", -ret, error_buf );
     }
 #endif
diff --git a/programs/ssl/ssl_mail_client.c b/programs/ssl/ssl_mail_client.c
index 107f52603..4b5d177a5 100644
--- a/programs/ssl/ssl_mail_client.c
+++ b/programs/ssl/ssl_mail_client.c
@@ -135,7 +135,7 @@ static int do_handshake( ssl_context *ssl, struct options *opt )
         if( ret != POLARSSL_ERR_NET_WANT_READ && ret != POLARSSL_ERR_NET_WANT_WRITE )
         {
 #if defined(POLARSSL_ERROR_C)
-            error_strerror( ret, (char *) buf, 1024 );
+            polarssl_strerror( ret, (char *) buf, 1024 );
 #endif
             printf( " failed\n  ! ssl_handshake returned %d: %s\n\n", ret, buf );
             return( -1 );
diff --git a/programs/ssl/ssl_server.c b/programs/ssl/ssl_server.c
index bd6c38407..3059236ec 100644
--- a/programs/ssl/ssl_server.c
+++ b/programs/ssl/ssl_server.c
@@ -210,7 +210,7 @@ reset:
     if( ret != 0 )
     {
         char error_buf[100];
-        error_strerror( ret, error_buf, 100 );
+        polarssl_strerror( ret, error_buf, 100 );
         printf("Last error was: %d - %s\n\n", ret, error_buf );
     }
 #endif
@@ -357,7 +357,7 @@ exit:
     if( ret != 0 )
     {
         char error_buf[100];
-        error_strerror( ret, error_buf, 100 );
+        polarssl_strerror( ret, error_buf, 100 );
         printf("Last error was: %d - %s\n\n", ret, error_buf );
     }
 #endif
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 5693f0a5c..6197cda4a 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -596,7 +596,7 @@ reset:
     if( ret != 0 )
     {
         char error_buf[100];
-        error_strerror( ret, error_buf, 100 );
+        polarssl_strerror( ret, error_buf, 100 );
         printf("Last error was: %d - %s\n\n", ret, error_buf );
     }
 #endif
@@ -780,7 +780,7 @@ exit:
     if( ret != 0 )
     {
         char error_buf[100];
-        error_strerror( ret, error_buf, 100 );
+        polarssl_strerror( ret, error_buf, 100 );
         printf("Last error was: -0x%X - %s\n\n", -ret, error_buf );
     }
 #endif
diff --git a/programs/util/strerror.c b/programs/util/strerror.c
index e248201b9..b8e69dbc8 100644
--- a/programs/util/strerror.c
+++ b/programs/util/strerror.c
@@ -65,7 +65,7 @@ int main( int argc, char *argv[] )
     if( ret != 0 )
     {
         char error_buf[200];
-        error_strerror( ret, error_buf, 200 );
+        polarssl_strerror( ret, error_buf, 200 );
         printf("Last error was: %d - %s\n\n", ret, error_buf );
     }