Fix some additional renaming issues
diff --git a/include/mbedtls/x509_crt.h b/include/mbedtls/x509_crt.h
index bb6d376..5241db1 100644
--- a/include/mbedtls/x509_crt.h
+++ b/include/mbedtls/x509_crt.h
@@ -223,12 +223,12 @@
* \param buf Buffer to write to
* \param size Maximum size of buffer
* \param prefix A line prefix
- * \param flags Verification flags created by x509_crt_verify()
+ * \param flags Verification flags created by mbedtls_x509_crt_verify()
*
* \return The amount of data written to the buffer, or -1 in
* case of an error.
*/
-int x509_crt_verify_info( char *buf, size_t size, const char *prefix,
+int mbedtls_x509_crt_verify_info( char *buf, size_t size, const char *prefix,
int flags );
/**
diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 90d2ef9..3a6a3fe 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -3290,7 +3290,7 @@
diff |= peer_pms[0] ^ ssl->handshake->max_major_ver;
diff |= peer_pms[1] ^ ssl->handshake->max_minor_ver;
-#if defined(POLARSSL_SSL_DEBUG_ALL)
+#if defined(MBEDTLS_SSL_DEBUG_ALL)
if( diff != 0 )
MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad client key exchange message" ) );
#endif
diff --git a/scripts/data_files/rename-1.3-2.0.txt b/scripts/data_files/rename-1.3-2.0.txt
index 4bab69c..05db8d4 100644
--- a/scripts/data_files/rename-1.3-2.0.txt
+++ b/scripts/data_files/rename-1.3-2.0.txt
@@ -1263,7 +1263,6 @@
TLS_RSA_WITH_NULL_SHA256 MBEDTLS_TLS_RSA_WITH_NULL_SHA256
TLS_RSA_WITH_RC4_128_MD5 MBEDTLS_TLS_RSA_WITH_RC4_128_MD5
TLS_RSA_WITH_RC4_128_SHA MBEDTLS_TLS_RSA_WITH_RC4_128_SHA
-UL64 MBEDTLS_UL64
X509_CRT_VERSION_1 MBEDTLS_X509_CRT_VERSION_1
X509_CRT_VERSION_2 MBEDTLS_X509_CRT_VERSION_2
X509_CRT_VERSION_3 MBEDTLS_X509_CRT_VERSION_3
@@ -1544,7 +1543,6 @@
entropy_update_manual mbedtls_entropy_update_manual
entropy_update_seed_file mbedtls_entropy_update_seed_file
entropy_write_seed_file mbedtls_entropy_write_seed_file
-error_strerror mbedtls_error_strerror
f_source_ptr mbedtls_entropy_f_source_ptr
gcm_auth_decrypt mbedtls_gcm_auth_decrypt
gcm_context mbedtls_gcm_context
@@ -1737,8 +1735,6 @@
padlock_supports mbedtls_padlock_supports
padlock_xcryptcbc mbedtls_padlock_xcryptcbc
padlock_xcryptecb mbedtls_padlock_xcryptecb
-pbkdf2_hmac mbedtls_pbkdf2_hmac
-pbkdf2_self_test mbedtls_pbkdf2_self_test
pem_context mbedtls_pem_context
pem_free mbedtls_pem_free
pem_init mbedtls_pem_init