diff --git a/tests/suites/test_suite_ssl.data b/tests/suites/test_suite_ssl.data
index 8b26ed2..aca26a9 100644
--- a/tests/suites/test_suite_ssl.data
+++ b/tests/suites/test_suite_ssl.data
@@ -8714,94 +8714,94 @@
 depends_on:MBEDTLS_CIPHER_NULL_CIPHER:MBEDTLS_SSL_PROTO_SSL3:MBEDTLS_MD5_C:MBEDTLS_SSL_ENCRYPT_THEN_MAC
 ssl_crypt_record_small:MBEDTLS_CIPHER_NULL:MBEDTLS_MD_MD5:1:1:MBEDTLS_SSL_MINOR_VERSION_0:0:0
 
-Session serialisation, save-load: no ticket, no cert
-ssl_serialise_session_save_load:0:""
+Session serialization, save-load: no ticket, no cert
+ssl_serialize_session_save_load:0:""
 
-Session serialisation, save-load: small ticket, no cert
+Session serialization, save-load: small ticket, no cert
 depends_on:MBEDTLS_SSL_SESSION_TICKETS:MBEDTLS_SSL_CLI_C
-ssl_serialise_session_save_load:42:""
+ssl_serialize_session_save_load:42:""
 
-Session serialisation, save-load: large ticket, no cert
+Session serialization, save-load: large ticket, no cert
 depends_on:MBEDTLS_SSL_SESSION_TICKETS:MBEDTLS_SSL_CLI_C
-ssl_serialise_session_save_load:1023:""
+ssl_serialize_session_save_load:1023:""
 
-Session serialisation, save-load: no ticket, cert
+Session serialization, save-load: no ticket, cert
 depends_on:MBEDTLS_X509_USE_C:MBEDTLS_PEM_PARSE_C:MBEDTLS_ECDSA_C:MBEDTLS_ECP_DP_SECP256R1_ENABLED:MBEDTLS_SHA256_C:MBEDTLS_FS_IO
-ssl_serialise_session_save_load:0:"data_files/server5.crt"
+ssl_serialize_session_save_load:0:"data_files/server5.crt"
 
-Session serialisation, save-load: small ticket, cert
+Session serialization, save-load: small ticket, cert
 depends_on:MBEDTLS_SSL_SESSION_TICKETS:MBEDTLS_SSL_CLI_C:MBEDTLS_X509_USE_C:MBEDTLS_PEM_PARSE_C:MBEDTLS_ECDSA_C:MBEDTLS_ECP_DP_SECP256R1_ENABLED:MBEDTLS_SHA256_C:MBEDTLS_FS_IO
-ssl_serialise_session_save_load:42:"data_files/server5.crt"
+ssl_serialize_session_save_load:42:"data_files/server5.crt"
 
-Session serialisation, save-load: large ticket, cert
+Session serialization, save-load: large ticket, cert
 depends_on:MBEDTLS_SSL_SESSION_TICKETS:MBEDTLS_SSL_CLI_C:MBEDTLS_X509_USE_C:MBEDTLS_PEM_PARSE_C:MBEDTLS_ECDSA_C:MBEDTLS_ECP_DP_SECP256R1_ENABLED:MBEDTLS_SHA256_C:MBEDTLS_FS_IO
-ssl_serialise_session_save_load:1023:"data_files/server5.crt"
+ssl_serialize_session_save_load:1023:"data_files/server5.crt"
 
-Session serialisation, load-save: no ticket, no cert
-ssl_serialise_session_load_save:0:""
+Session serialization, load-save: no ticket, no cert
+ssl_serialize_session_load_save:0:""
 
-Session serialisation, load-save: small ticket, no cert
+Session serialization, load-save: small ticket, no cert
 depends_on:MBEDTLS_SSL_SESSION_TICKETS:MBEDTLS_SSL_CLI_C
-ssl_serialise_session_load_save:42:""
+ssl_serialize_session_load_save:42:""
 
-Session serialisation, load-save: large ticket, no cert
+Session serialization, load-save: large ticket, no cert
 depends_on:MBEDTLS_SSL_SESSION_TICKETS:MBEDTLS_SSL_CLI_C
-ssl_serialise_session_load_save:1023:""
+ssl_serialize_session_load_save:1023:""
 
-Session serialisation, load-save: no ticket, cert
+Session serialization, load-save: no ticket, cert
 depends_on:MBEDTLS_X509_USE_C:MBEDTLS_PEM_PARSE_C:MBEDTLS_ECDSA_C:MBEDTLS_ECP_DP_SECP256R1_ENABLED:MBEDTLS_SHA256_C:MBEDTLS_FS_IO
-ssl_serialise_session_load_save:0:"data_files/server5.crt"
+ssl_serialize_session_load_save:0:"data_files/server5.crt"
 
-Session serialisation, load-save: small ticket, cert
+Session serialization, load-save: small ticket, cert
 depends_on:MBEDTLS_SSL_SESSION_TICKETS:MBEDTLS_SSL_CLI_C:MBEDTLS_X509_USE_C:MBEDTLS_PEM_PARSE_C:MBEDTLS_ECDSA_C:MBEDTLS_ECP_DP_SECP256R1_ENABLED:MBEDTLS_SHA256_C:MBEDTLS_FS_IO
-ssl_serialise_session_load_save:42:"data_files/server5.crt"
+ssl_serialize_session_load_save:42:"data_files/server5.crt"
 
-Session serialisation, load-save: large ticket, cert
+Session serialization, load-save: large ticket, cert
 depends_on:MBEDTLS_SSL_SESSION_TICKETS:MBEDTLS_SSL_CLI_C:MBEDTLS_X509_USE_C:MBEDTLS_PEM_PARSE_C:MBEDTLS_ECDSA_C:MBEDTLS_ECP_DP_SECP256R1_ENABLED:MBEDTLS_SHA256_C:MBEDTLS_FS_IO
-ssl_serialise_session_load_save:1023:"data_files/server5.crt"
+ssl_serialize_session_load_save:1023:"data_files/server5.crt"
 
-Session serialisation, save buffer size: no ticket, no cert
-ssl_serialise_session_save_buf_size:0:""
+Session serialization, save buffer size: no ticket, no cert
+ssl_serialize_session_save_buf_size:0:""
 
-Session serialisation, save buffer size: small ticket, no cert
+Session serialization, save buffer size: small ticket, no cert
 depends_on:MBEDTLS_SSL_SESSION_TICKETS:MBEDTLS_SSL_CLI_C
-ssl_serialise_session_save_buf_size:42:""
+ssl_serialize_session_save_buf_size:42:""
 
-Session serialisation, save buffer size: large ticket, no cert
+Session serialization, save buffer size: large ticket, no cert
 depends_on:MBEDTLS_SSL_SESSION_TICKETS:MBEDTLS_SSL_CLI_C
-ssl_serialise_session_save_buf_size:1023:""
+ssl_serialize_session_save_buf_size:1023:""
 
-Session serialisation, save buffer size: no ticket, cert
+Session serialization, save buffer size: no ticket, cert
 depends_on:MBEDTLS_X509_USE_C:MBEDTLS_PEM_PARSE_C:MBEDTLS_ECDSA_C:MBEDTLS_ECP_DP_SECP256R1_ENABLED:MBEDTLS_SHA256_C:MBEDTLS_FS_IO
-ssl_serialise_session_save_buf_size:0:"data_files/server5.crt"
+ssl_serialize_session_save_buf_size:0:"data_files/server5.crt"
 
-Session serialisation, save buffer size: small ticket, cert
+Session serialization, save buffer size: small ticket, cert
 depends_on:MBEDTLS_SSL_SESSION_TICKETS:MBEDTLS_SSL_CLI_C:MBEDTLS_X509_USE_C:MBEDTLS_PEM_PARSE_C:MBEDTLS_ECDSA_C:MBEDTLS_ECP_DP_SECP256R1_ENABLED:MBEDTLS_SHA256_C:MBEDTLS_FS_IO
-ssl_serialise_session_save_buf_size:42:"data_files/server5.crt"
+ssl_serialize_session_save_buf_size:42:"data_files/server5.crt"
 
-Session serialisation, save buffer size: large ticket, cert
+Session serialization, save buffer size: large ticket, cert
 depends_on:MBEDTLS_SSL_SESSION_TICKETS:MBEDTLS_SSL_CLI_C:MBEDTLS_X509_USE_C:MBEDTLS_PEM_PARSE_C:MBEDTLS_ECDSA_C:MBEDTLS_ECP_DP_SECP256R1_ENABLED:MBEDTLS_SHA256_C:MBEDTLS_FS_IO
-ssl_serialise_session_save_buf_size:1023:"data_files/server5.crt"
+ssl_serialize_session_save_buf_size:1023:"data_files/server5.crt"
 
-Session serialisation, load buffer size: no ticket, no cert
-ssl_serialise_session_load_buf_size:0:""
+Session serialization, load buffer size: no ticket, no cert
+ssl_serialize_session_load_buf_size:0:""
 
-Session serialisation, load buffer size: small ticket, no cert
+Session serialization, load buffer size: small ticket, no cert
 depends_on:MBEDTLS_SSL_SESSION_TICKETS:MBEDTLS_SSL_CLI_C
-ssl_serialise_session_load_buf_size:42:""
+ssl_serialize_session_load_buf_size:42:""
 
-Session serialisation, load buffer size: large ticket, no cert
+Session serialization, load buffer size: large ticket, no cert
 depends_on:MBEDTLS_SSL_SESSION_TICKETS:MBEDTLS_SSL_CLI_C
-ssl_serialise_session_load_buf_size:1023:""
+ssl_serialize_session_load_buf_size:1023:""
 
-Session serialisation, load buffer size: no ticket, cert
+Session serialization, load buffer size: no ticket, cert
 depends_on:MBEDTLS_X509_USE_C:MBEDTLS_PEM_PARSE_C:MBEDTLS_ECDSA_C:MBEDTLS_ECP_DP_SECP256R1_ENABLED:MBEDTLS_SHA256_C:MBEDTLS_FS_IO
-ssl_serialise_session_load_buf_size:0:"data_files/server5.crt"
+ssl_serialize_session_load_buf_size:0:"data_files/server5.crt"
 
-Session serialisation, load buffer size: small ticket, cert
+Session serialization, load buffer size: small ticket, cert
 depends_on:MBEDTLS_SSL_SESSION_TICKETS:MBEDTLS_SSL_CLI_C:MBEDTLS_X509_USE_C:MBEDTLS_PEM_PARSE_C:MBEDTLS_ECDSA_C:MBEDTLS_ECP_DP_SECP256R1_ENABLED:MBEDTLS_SHA256_C:MBEDTLS_FS_IO
-ssl_serialise_session_load_buf_size:42:"data_files/server5.crt"
+ssl_serialize_session_load_buf_size:42:"data_files/server5.crt"
 
-Session serialisation, load buffer size: large ticket, cert
+Session serialization, load buffer size: large ticket, cert
 depends_on:MBEDTLS_SSL_SESSION_TICKETS:MBEDTLS_SSL_CLI_C:MBEDTLS_X509_USE_C:MBEDTLS_PEM_PARSE_C:MBEDTLS_ECDSA_C:MBEDTLS_ECP_DP_SECP256R1_ENABLED:MBEDTLS_SHA256_C:MBEDTLS_FS_IO
-ssl_serialise_session_load_buf_size:1023:"data_files/server5.crt"
+ssl_serialize_session_load_buf_size:1023:"data_files/server5.crt"
diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index b3f217d..b13f882 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -267,7 +267,7 @@
 }
 
 /*
- * Populate a session structure for serialisation tests.
+ * Populate a session structure for serialization tests.
  * Choose dummy values, mostly non-0 to distinguish from the init default.
  */
 static int ssl_populate_session( mbedtls_ssl_session *session,
@@ -639,7 +639,7 @@
 /* END_CASE */
 
 /* BEGIN_CASE */
-void ssl_serialise_session_save_load( int ticket_len, char *crt_file )
+void ssl_serialize_session_save_load( int ticket_len, char *crt_file )
 {
     mbedtls_ssl_session original, restored;
     unsigned char *buf = NULL;
@@ -655,14 +655,14 @@
     /* Prepare a dummy session to work on */
     TEST_ASSERT( ssl_populate_session( &original, ticket_len, crt_file ) == 0 );
 
-    /* Serialise it */
+    /* Serialize it */
     TEST_ASSERT( mbedtls_ssl_session_save( &original, NULL, 0, &len )
                  == MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL );
     TEST_ASSERT( ( buf = mbedtls_calloc( 1, len ) ) != NULL );
     TEST_ASSERT( mbedtls_ssl_session_save( &original, buf, len, &len )
                  == 0 );
 
-    /* Restore session from serialised data */
+    /* Restore session from serialized data */
     TEST_ASSERT( mbedtls_ssl_session_load( &restored, buf, len) == 0 );
 
     /*
@@ -725,7 +725,7 @@
 /* END_CASE */
 
 /* BEGIN_CASE depends_on:MBEDTLS_SEE_FUTURE_PR */
-void ssl_serialise_session_load_save( int ticket_len, char *crt_file )
+void ssl_serialize_session_load_save( int ticket_len, char *crt_file )
 {
     mbedtls_ssl_session session;
     unsigned char *buf1 = NULL, *buf2 = NULL;
@@ -740,7 +740,7 @@
     /* Prepare a dummy session to work on */
     TEST_ASSERT( ssl_populate_session( &session, ticket_len, crt_file ) == 0 );
 
-    /* Get desired buffer size for serialising */
+    /* Get desired buffer size for serializing */
     TEST_ASSERT( mbedtls_ssl_session_save( &session, NULL, 0, &len0 )
                  == MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL );
 
@@ -748,22 +748,22 @@
     buf1 = mbedtls_calloc( 1, len0 );
     TEST_ASSERT( buf1 != NULL );
 
-    /* Serialise to buffer and free live session */
+    /* Serialize to buffer and free live session */
     TEST_ASSERT( mbedtls_ssl_session_save( &session, buf1, len0, &len1 )
                  == 0 );
     TEST_ASSERT( len0 == len1 );
     mbedtls_ssl_session_free( &session );
 
-    /* Restore session from serialised data */
+    /* Restore session from serialized data */
     TEST_ASSERT( mbedtls_ssl_session_load( &session, buf1, len1 ) == 0 );
 
-    /* Allocate second buffer and serialise to it */
+    /* Allocate second buffer and serialize to it */
     buf2 = mbedtls_calloc( 1, len0 );
     TEST_ASSERT( buf2 != NULL );
     TEST_ASSERT( mbedtls_ssl_session_save( &session, buf2, len0, &len2 )
                  == 0 );
 
-    /* Make sure both serialised versions are identical */
+    /* Make sure both serialized versions are identical */
     TEST_ASSERT( len1 == len2 );
     TEST_ASSERT( memcmp( buf1, buf2, len1 ) == 0 );
 
@@ -775,7 +775,7 @@
 /* END_CASE */
 
 /* BEGIN_CASE */
-void ssl_serialise_session_save_buf_size( int ticket_len, char *crt_file )
+void ssl_serialize_session_save_buf_size( int ticket_len, char *crt_file )
 {
     mbedtls_ssl_session session;
     unsigned char *buf = NULL;
@@ -787,7 +787,7 @@
 
     mbedtls_ssl_session_init( &session );
 
-    /* Prepare dummy session and get serialised size */
+    /* Prepare dummy session and get serialized size */
     TEST_ASSERT( ssl_populate_session( &session, ticket_len, crt_file ) == 0 );
     TEST_ASSERT( mbedtls_ssl_session_save( &session, NULL, 0, &good_len )
                  == MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL );
@@ -811,7 +811,7 @@
 /* END_CASE */
 
 /* BEGIN_CASE */
-void ssl_serialise_session_load_buf_size( int ticket_len, char *crt_file )
+void ssl_serialize_session_load_buf_size( int ticket_len, char *crt_file )
 {
     mbedtls_ssl_session session;
     unsigned char *good_buf = NULL, *bad_buf = NULL;
@@ -823,7 +823,7 @@
 
     mbedtls_ssl_session_init( &session );
 
-    /* Prepare serialised session data */
+    /* Prepare serialized session data */
     TEST_ASSERT( ssl_populate_session( &session, ticket_len, crt_file ) == 0 );
     TEST_ASSERT( mbedtls_ssl_session_save( &session, NULL, 0, &good_len )
                  == MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL );