diff --git a/include/mbedtls/entropy_poll.h b/include/mbedtls/entropy_poll.h
index d7aa88c5b..430e8651c 100644
--- a/include/mbedtls/entropy_poll.h
+++ b/include/mbedtls/entropy_poll.h
@@ -47,7 +47,7 @@ extern "C" {
  * \brief           Entropy poll callback that provides 0 entropy.
  */
 #if defined(MBEDTLS_TEST_NULL_ENTROPY)
-    int mbedtls_zero_entropy_poll( void *data,
+    int mbedtls_null_entropy_poll( void *data,
                                 unsigned char *output, size_t len, size_t *olen );
 #endif
 
diff --git a/library/entropy.c b/library/entropy.c
index 49710de90..282640f2d 100644
--- a/library/entropy.c
+++ b/library/entropy.c
@@ -80,7 +80,7 @@ void mbedtls_entropy_init( mbedtls_entropy_context *ctx )
 #endif
 
 #if defined(MBEDTLS_TEST_NULL_ENTROPY)
-    mbedtls_entropy_add_source( ctx, mbedtls_zero_entropy_poll, NULL,
+    mbedtls_entropy_add_source( ctx, mbedtls_null_entropy_poll, NULL,
                                 1, MBEDTLS_ENTROPY_SOURCE_STRONG );
 #endif
 
diff --git a/library/entropy_poll.c b/library/entropy_poll.c
index ed80babe1..a116e605d 100644
--- a/library/entropy_poll.c
+++ b/library/entropy_poll.c
@@ -192,7 +192,7 @@ int mbedtls_platform_entropy_poll( void *data,
 #endif /* !MBEDTLS_NO_PLATFORM_ENTROPY */
 
 #if defined(MBEDTLS_TEST_NULL_ENTROPY)
-int mbedtls_zero_entropy_poll( void *data,
+int mbedtls_null_entropy_poll( void *data,
                     unsigned char *output, size_t len, size_t *olen )
 {
     ((void) data);