diff --git a/configs/config-suite-b.h b/configs/config-suite-b.h
index 78b89e5eb..438d17925 100644
--- a/configs/config-suite-b.h
+++ b/configs/config-suite-b.h
@@ -71,7 +71,7 @@
 
 /*
  * You should adjust this to the exact number of sources you're using: default
- * is the "platform_entropy_poll" source, but you may want to add other ones.
+ * is the "mbedtls_platform_entropy_poll" source, but you may want to add other ones.
  * Minimum is 2 for the entropy test suite.
  */
 #define MBEDTLS_ENTROPY_MAX_SOURCES 2
diff --git a/doxygen/input/doc_encdec.h b/doxygen/input/doc_encdec.h
index 7d37d9333..87ed5ec86 100644
--- a/doxygen/input/doc_encdec.h
+++ b/doxygen/input/doc_encdec.h
@@ -18,31 +18,31 @@
  * specific algorithms.
  *
  * All symmetric encryption algorithms are accessible via the generic cipher layer
- * (see \c cipher_init_ctx()).
+ * (see \c mbedtls_cipher_setup()).
  *
  * The asymmetric encryptrion algorithms are accessible via the generic public
- * key layer (see \c pk_init()).
+ * key layer (see \c mbedtls_pk_init()).
  *
  * The following algorithms are provided:
  * - Symmetric:
- *   - AES (see \c aes_crypt_ecb(), \c aes_crypt_cbc(), \c aes_crypt_cfb128() and
- *     \c aes_crypt_ctr()).
- *   - ARCFOUR (see \c arc4_crypt()).
- *   - Blowfish / BF (see \c blowfish_crypt_ecb(), \c blowfish_crypt_cbc(),
- *     \c blowfish_crypt_cfb64() and \c blowfish_crypt_ctr())
- *   - Camellia (see \c camellia_crypt_ecb(), \c camellia_crypt_cbc(),
- *     \c camellia_crypt_cfb128() and \c camellia_crypt_ctr()).
- *   - DES/3DES (see \c des_crypt_ecb(), \c des_crypt_cbc(), \c des3_crypt_ecb()
- *     and \c des3_crypt_cbc()).
- *   - GCM (AES-GCM and CAMELLIA-GCM) (see \c gcm_init())
- *   - XTEA (see \c xtea_crypt_ecb()).
+ *   - AES (see \c mbedtls_aes_crypt_ecb(), \c mbedtls_aes_crypt_cbc(), \c mbedtls_aes_crypt_cfb128() and
+ *     \c mbedtls_aes_crypt_ctr()).
+ *   - ARCFOUR (see \c mbedtls_arc4_crypt()).
+ *   - Blowfish / BF (see \c mbedtls_blowfish_crypt_ecb(), \c mbedtls_blowfish_crypt_cbc(),
+ *     \c mbedtls_blowfish_crypt_cfb64() and \c mbedtls_blowfish_crypt_ctr())
+ *   - Camellia (see \c mbedtls_camellia_crypt_ecb(), \c mbedtls_camellia_crypt_cbc(),
+ *     \c mbedtls_camellia_crypt_cfb128() and \c mbedtls_camellia_crypt_ctr()).
+ *   - DES/3DES (see \c mbedtls_des_crypt_ecb(), \c mbedtls_des_crypt_cbc(), \c mbedtls_des3_crypt_ecb()
+ *     and \c mbedtls_des3_crypt_cbc()).
+ *   - GCM (AES-GCM and CAMELLIA-GCM) (see \c mbedtls_gcm_init())
+ *   - XTEA (see \c mbedtls_xtea_crypt_ecb()).
  * - Asymmetric:
- *   - Diffie-Hellman-Merkle (see \c dhm_read_public(), \c dhm_make_public()
- *     and \c dhm_calc_secret()).
- *   - RSA (see \c rsa_public() and \c rsa_private()).
- *   - Elliptic Curves over GF(p) (see \c ecp_point_init()).
- *   - Elliptic Curve Digital Signature Algorithm (ECDSA) (see \c ecdsa_init()).
- *   - Elliptic Curve Diffie Hellman (ECDH) (see \c ecdh_init()).
+ *   - Diffie-Hellman-Merkle (see \c mbedtls_dhm_read_public(), \c mbedtls_dhm_make_public()
+ *     and \c mbedtls_dhm_calc_secret()).
+ *   - RSA (see \c mbedtls_rsa_public() and \c mbedtls_rsa_private()).
+ *   - Elliptic Curves over GF(p) (see \c mbedtls_ecp_point_init()).
+ *   - Elliptic Curve Digital Signature Algorithm (ECDSA) (see \c mbedtls_ecdsa_init()).
+ *   - Elliptic Curve Diffie Hellman (ECDH) (see \c mbedtls_ecdh_init()).
  *
  * This module provides encryption/decryption which can be used to provide
  * secrecy.
diff --git a/doxygen/input/doc_rng.h b/doxygen/input/doc_rng.h
index 8b482f167..82edd2535 100644
--- a/doxygen/input/doc_rng.h
+++ b/doxygen/input/doc_rng.h
@@ -11,7 +11,7 @@
  *
  * The block-cipher counter-mode based deterministic random
  * bit generator (CTR_DBRG) as specified in NIST SP800-90. It needs an external
- * source of entropy. For these purposes \c entropy_func() can be used. This is
+ * source of entropy. For these purposes \c mbedtls_entropy_func() can be used. This is
  * an implementation based on a simple entropy accumulator design.
  *
  * The other number generator that is included is less strong and uses the HAVEGE
diff --git a/doxygen/input/doc_ssltls.h b/doxygen/input/doc_ssltls.h
index 13b56a20a..66445c23f 100644
--- a/doxygen/input/doc_ssltls.h
+++ b/doxygen/input/doc_ssltls.h
@@ -10,10 +10,10 @@
  * communication channel.
  *
  * The basic provisions are:
- * - initialise an SSL/TLS context (see \c ssl_init()).
- * - perform an SSL/TLS handshake (see \c ssl_handshake()).
- * - read/write (see \c ssl_read() and \c ssl_write()).
- * - notify a peer that connection is being closed (see \c ssl_close_notify()).
+ * - initialise an SSL/TLS context (see \c mbedtls_ssl_init()).
+ * - perform an SSL/TLS handshake (see \c mbedtls_ssl_handshake()).
+ * - read/write (see \c mbedtls_ssl_read() and \c mbedtls_ssl_write()).
+ * - notify a peer that connection is being closed (see \c mbedtls_ssl_close_notify()).
  *
  * Many aspects of such a channel are set through parameters and callback
  * functions:
diff --git a/doxygen/input/doc_tcpip.h b/doxygen/input/doc_tcpip.h
index c9309a770..7b893f043 100644
--- a/doxygen/input/doc_tcpip.h
+++ b/doxygen/input/doc_tcpip.h
@@ -13,10 +13,10 @@
  * (or Host-to-host) layer.
  * SSL/TLS resides on top of that, in the Application layer, and makes use of
  * its basic provisions:
- * - listening on a port (see \c net_bind()).
- * - accepting a connection (through \c net_accept()).
- * - read/write (through \c net_recv()/\c net_send()).
- * - close a connection (through \c net_close()).
+ * - listening on a port (see \c mbedtls_net_bind()).
+ * - accepting a connection (through \c mbedtls_net_accept()).
+ * - read/write (through \c mbedtls_net_recv()/\c mbedtls_net_send()).
+ * - close a connection (through \c mbedtls_net_close()).
  *
  * This way you have the means to, for example, implement and use an UDP or
  * IPSec communication solution as a basis.
diff --git a/doxygen/input/doc_x509.h b/doxygen/input/doc_x509.h
index 379881468..e242dc387 100644
--- a/doxygen/input/doc_x509.h
+++ b/doxygen/input/doc_x509.h
@@ -15,7 +15,7 @@
  *   \c x509parse_keyfile()).
  * - X.509 certificate signature verification (see \c x509parse_verify())
  * - X.509 certificate writing and certificate request writing (see
- *   \c x509write_crt_der() and \c x509write_csr_der()).
+ *   \c mbedtls_x509write_crt_der() and \c mbedtls_x509write_csr_der()).
  *
  * This module can be used to build a certificate authority (CA) chain and
  * verify its signature. It is also used to generate Certificate Signing
diff --git a/include/mbedtls/ecp.h b/include/mbedtls/ecp.h
index a69ba17a2..b682b9c22 100644
--- a/include/mbedtls/ecp.h
+++ b/include/mbedtls/ecp.h
@@ -516,7 +516,7 @@ int mbedtls_ecp_mul( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
  *                  R = m * P + n * Q
  *                  (Not thread-safe to use same group in multiple threads)
  *
- * \note            In contrast to ecp_mul(), this function does not guarantee
+ * \note            In contrast to mbedtls_ecp_mul(), this function does not guarantee
  *                  a constant execution flow and timing.
  *
  * \param grp       ECP group
diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index f0b7b5404..965101433 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -1154,7 +1154,7 @@ void mbedtls_ssl_init( mbedtls_ssl_context *ssl );
  * \brief          Set up an SSL context for use
  *
  * \note           No copy of the configuration context is made, it can be
- *                 shared by many ssl_context structures.
+ *                 shared by many mbedtls_ssl_context structures.
  *
  * \warning        Modifying the conf structure after is has been used in this
  *                 function is unsupported!
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 6cf9b7471..7adaaff35 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -6402,7 +6402,7 @@ int mbedtls_ssl_write( mbedtls_ssl_context *ssl, const unsigned char *buf, size_
     {
         if( ( ret = mbedtls_ssl_handshake( ssl ) ) != 0 )
         {
-            MBEDTLS_SSL_DEBUG_RET( 1, "ssl_handshake", ret );
+            MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ssl_handshake", ret );
             return( ret );
         }
     }
diff --git a/programs/ssl/dtls_server.c b/programs/ssl/dtls_server.c
index a44ae0b7f..ba74ebd6c 100644
--- a/programs/ssl/dtls_server.c
+++ b/programs/ssl/dtls_server.c
@@ -281,7 +281,7 @@ reset:
                                            sizeof( client_ip ) ) ) != 0 )
     {
         printf( " failed\n  ! "
-                "ssl_set_client_transport_id() returned -0x%x\n\n", -ret );
+                "mbedtls_ssl_set_client_transport_id() returned -0x%x\n\n", -ret );
         goto exit;
     }
 
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index d0260ecce..1d2132e02 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -1826,7 +1826,7 @@ reset:
                                                sizeof( client_ip ) ) ) != 0 )
         {
             mbedtls_printf( " failed\n  ! "
-                    "ssl_set_client_transport_id() returned -0x%x\n\n", -ret );
+                    "mbedtls_ssl_set_client_transport_id() returned -0x%x\n\n", -ret );
             goto exit;
         }
     }