diff --git a/programs/pkey/dh_client.c b/programs/pkey/dh_client.c
index 3ccfa6d..66fc471 100644
--- a/programs/pkey/dh_client.c
+++ b/programs/pkey/dh_client.c
@@ -281,7 +281,7 @@
 
 exit:
 
-    mbedtls_net_close( &server_fd );
+    mbedtls_net_free( &server_fd );
 
     mbedtls_aes_free( &aes );
     mbedtls_rsa_free( &rsa );
diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c
index 71fa737..7219c09 100644
--- a/programs/pkey/dh_server.c
+++ b/programs/pkey/dh_server.c
@@ -283,8 +283,8 @@
 
 exit:
 
-    mbedtls_net_close( &client_fd );
-    mbedtls_net_close( &listen_fd );
+    mbedtls_net_free( &client_fd );
+    mbedtls_net_free( &listen_fd );
 
     mbedtls_aes_free( &aes );
     mbedtls_rsa_free( &rsa );
diff --git a/programs/ssl/dtls_client.c b/programs/ssl/dtls_client.c
index b3cfb31..df68dbd 100644
--- a/programs/ssl/dtls_client.c
+++ b/programs/ssl/dtls_client.c
@@ -326,7 +326,7 @@
     }
 #endif
 
-    mbedtls_net_close( &server_fd );
+    mbedtls_net_free( &server_fd );
 
     mbedtls_x509_crt_free( &cacert );
     mbedtls_ssl_free( &ssl );
diff --git a/programs/ssl/dtls_server.c b/programs/ssl/dtls_server.c
index e1da0f7..a3839c6 100644
--- a/programs/ssl/dtls_server.c
+++ b/programs/ssl/dtls_server.c
@@ -256,7 +256,7 @@
     }
 #endif
 
-    mbedtls_net_close( &client_fd );
+    mbedtls_net_free( &client_fd );
 
     mbedtls_ssl_session_reset( &ssl );
 
@@ -401,8 +401,8 @@
     }
 #endif
 
-    mbedtls_net_close( &client_fd );
-    mbedtls_net_close( &listen_fd );
+    mbedtls_net_free( &client_fd );
+    mbedtls_net_free( &listen_fd );
 
     mbedtls_x509_crt_free( &srvcert );
     mbedtls_pk_free( &pkey );
diff --git a/programs/ssl/mini_client.c b/programs/ssl/mini_client.c
index 95b0f92..4a53340 100644
--- a/programs/ssl/mini_client.c
+++ b/programs/ssl/mini_client.c
@@ -280,7 +280,7 @@
     mbedtls_ssl_close_notify( &ssl );
 
 exit:
-    mbedtls_net_close( &server_fd );
+    mbedtls_net_free( &server_fd );
 
     mbedtls_ssl_free( &ssl );
     mbedtls_ssl_config_free( &conf );
diff --git a/programs/ssl/ssl_client1.c b/programs/ssl/ssl_client1.c
index 61ead50..4b99a15 100644
--- a/programs/ssl/ssl_client1.c
+++ b/programs/ssl/ssl_client1.c
@@ -290,7 +290,7 @@
     }
 #endif
 
-    mbedtls_net_close( &server_fd );
+    mbedtls_net_free( &server_fd );
 
     mbedtls_x509_crt_free( &cacert );
     mbedtls_ssl_free( &ssl );
diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index 27bd8bf..773bca6 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -1503,7 +1503,7 @@
     {
         --opt.reconnect;
 
-        mbedtls_net_close( &server_fd );
+        mbedtls_net_free( &server_fd );
 
 #if defined(MBEDTLS_TIMING_C)
         if( opt.reco_delay > 0 )
@@ -1572,7 +1572,7 @@
     }
 #endif
 
-    mbedtls_net_close( &server_fd );
+    mbedtls_net_free( &server_fd );
 
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
     mbedtls_x509_crt_free( &clicert );
diff --git a/programs/ssl/ssl_fork_server.c b/programs/ssl/ssl_fork_server.c
index 9aab975..235b4e9 100644
--- a/programs/ssl/ssl_fork_server.c
+++ b/programs/ssl/ssl_fork_server.c
@@ -259,11 +259,11 @@
                 goto exit;
             }
 
-            mbedtls_net_close( &client_fd );
+            mbedtls_net_free( &client_fd );
             continue;
         }
 
-        mbedtls_net_close( &listen_fd );
+        mbedtls_net_free( &listen_fd );
 
         /*
          * 4. Setup stuff
@@ -385,8 +385,8 @@
     }
 
 exit:
-    mbedtls_net_close( &client_fd );
-    mbedtls_net_close( &listen_fd );
+    mbedtls_net_free( &client_fd );
+    mbedtls_net_free( &listen_fd );
 
     mbedtls_x509_crt_free( &srvcert );
     mbedtls_pk_free( &pkey );
diff --git a/programs/ssl/ssl_mail_client.c b/programs/ssl/ssl_mail_client.c
index 4ea5d4c..27e7d5a 100644
--- a/programs/ssl/ssl_mail_client.c
+++ b/programs/ssl/ssl_mail_client.c
@@ -819,7 +819,7 @@
 
 exit:
 
-    mbedtls_net_close( &server_fd );
+    mbedtls_net_free( &server_fd );
     mbedtls_x509_crt_free( &clicert );
     mbedtls_x509_crt_free( &cacert );
     mbedtls_pk_free( &pkey );
diff --git a/programs/ssl/ssl_pthread_server.c b/programs/ssl/ssl_pthread_server.c
index 4bd3671..1fe0980 100644
--- a/programs/ssl/ssl_pthread_server.c
+++ b/programs/ssl/ssl_pthread_server.c
@@ -265,7 +265,7 @@
     }
 #endif
 
-    mbedtls_net_close( client_fd );
+    mbedtls_net_free( client_fd );
     mbedtls_ssl_free( &ssl );
 
     thread_info->thread_complete = 1;
@@ -491,7 +491,7 @@
     if( ( ret = thread_create( &client_fd ) ) != 0 )
     {
         mbedtls_printf( "  [ main ]  failed: thread_create returned %d\n", ret );
-        mbedtls_net_close( &client_fd );
+        mbedtls_net_free( &client_fd );
         goto reset;
     }
 
diff --git a/programs/ssl/ssl_server.c b/programs/ssl/ssl_server.c
index 786ae5c..d556d43 100644
--- a/programs/ssl/ssl_server.c
+++ b/programs/ssl/ssl_server.c
@@ -237,7 +237,7 @@
     }
 #endif
 
-    mbedtls_net_close( &client_fd );
+    mbedtls_net_free( &client_fd );
 
     mbedtls_ssl_session_reset( &ssl );
 
@@ -373,8 +373,8 @@
     }
 #endif
 
-    mbedtls_net_close( &client_fd );
-    mbedtls_net_close( &listen_fd );
+    mbedtls_net_free( &client_fd );
+    mbedtls_net_free( &listen_fd );
 
     mbedtls_x509_crt_free( &srvcert );
     mbedtls_pk_free( &pkey );
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 3b2c802..99d43c9 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -755,8 +755,8 @@
 {
     ((void) sig);
     received_sigterm = 1;
-    mbedtls_net_close( &listen_fd ); /* causes mbedtls_net_accept() to abort */
-    mbedtls_net_close( &client_fd ); /* causes net_read() to abort */
+    mbedtls_net_free( &listen_fd ); /* causes mbedtls_net_accept() to abort */
+    mbedtls_net_free( &client_fd ); /* causes net_read() to abort */
 }
 #endif
 
@@ -1843,7 +1843,7 @@
     }
 #endif
 
-    mbedtls_net_close( &client_fd );
+    mbedtls_net_free( &client_fd );
 
     mbedtls_ssl_session_reset( &ssl );
 
@@ -2252,8 +2252,8 @@
     mbedtls_printf( "  . Cleaning up..." );
     fflush( stdout );
 
-    mbedtls_net_close( &client_fd );
-    mbedtls_net_close( &listen_fd );
+    mbedtls_net_free( &client_fd );
+    mbedtls_net_free( &listen_fd );
 
 #if defined(MBEDTLS_DHM_C) && defined(MBEDTLS_FS_IO)
     mbedtls_dhm_free( &dhm );
diff --git a/programs/test/udp_proxy.c b/programs/test/udp_proxy.c
index 9962445..7360d8a 100644
--- a/programs/test/udp_proxy.c
+++ b/programs/test/udp_proxy.c
@@ -615,9 +615,9 @@
     }
 #endif
 
-    mbedtls_net_close( &client_fd );
-    mbedtls_net_close( &server_fd );
-    mbedtls_net_close( &listen_fd );
+    mbedtls_net_free( &client_fd );
+    mbedtls_net_free( &server_fd );
+    mbedtls_net_free( &listen_fd );
 
 #if defined(_WIN32)
     mbedtls_printf( "  Press Enter to exit this program.\n" );
diff --git a/programs/x509/cert_app.c b/programs/x509/cert_app.c
index dd5c508..e555bdb 100644
--- a/programs/x509/cert_app.c
+++ b/programs/x509/cert_app.c
@@ -475,7 +475,7 @@
 
 exit:
 
-    mbedtls_net_close( &server_fd );
+    mbedtls_net_free( &server_fd );
     mbedtls_x509_crt_free( &cacert );
     mbedtls_x509_crt_free( &clicert );
 #if defined(MBEDTLS_X509_CRL_PARSE_C)