diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 288e071..79b0633 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -40,7 +40,7 @@
  * stored keys. */
 #include "psa_crypto_storage.h"
 
-#include "psa_crypto_random.h"
+#include "psa_crypto_random_impl.h"
 
 #include <assert.h>
 #include <stdlib.h>
@@ -6415,7 +6415,7 @@
 
 /* Wrapper function allowing the classic API to use the PSA RNG.
  * In the non-external case, mbedtls_psa_get_random is defined
- * as a constant function pointer in psa_crypto_random.h.
+ * as a constant function pointer in psa_crypto_random_impl.h.
  */
 #if defined (MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG)
 int mbedtls_psa_get_random( void *p_rng,
diff --git a/library/psa_crypto_random.h b/library/psa_crypto_random_impl.h
similarity index 96%
rename from library/psa_crypto_random.h
rename to library/psa_crypto_random_impl.h
index 2482d6b..6b445c6 100644
--- a/library/psa_crypto_random.h
+++ b/library/psa_crypto_random_impl.h
@@ -1,6 +1,6 @@
-/** \file psa_crypto_random.h
+/** \file psa_crypto_random_impl.h
  *
- * \brief PSA crypto random generator abstraction.
+ * \brief PSA crypto random generator implementation abstraction.
  */
 /*
  *  Copyright The Mbed TLS Contributors
@@ -19,8 +19,8 @@
  *  limitations under the License.
  */
 
-#ifndef PSA_CRYPTO_RANDOM_H
-#define PSA_CRYPTO_RANDOM_H
+#ifndef PSA_CRYPTO_RANDOM_IMPL_H
+#define PSA_CRYPTO_RANDOM_IMPL_H
 
 #if defined(MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG)
 
@@ -205,4 +205,4 @@
 
 #endif /* MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG */
 
-#endif /* PSA_CRYPTO_RANDOM_H */
+#endif /* PSA_CRYPTO_RANDOM_IMPL_H */
diff --git a/tests/suites/test_suite_psa_crypto_init.function b/tests/suites/test_suite_psa_crypto_init.function
index 16e44c7..e6097bb 100644
--- a/tests/suites/test_suite_psa_crypto_init.function
+++ b/tests/suites/test_suite_psa_crypto_init.function
@@ -11,7 +11,7 @@
 #define ENTROPY_MIN_NV_SEED_SIZE                                        \
     MAX(MBEDTLS_ENTROPY_MIN_PLATFORM, MBEDTLS_ENTROPY_BLOCK_SIZE)
 
-#include "psa_crypto_random.h"
+#include "psa_crypto_random_impl.h"
 #if defined(MBEDTLS_PSA_HMAC_DRBG_MD_TYPE)
 /* PSA crypto uses the HMAC_DRBG module. It reads from the entropy source twice:
  * once for the initial entropy and once for a nonce. The nonce length is
diff --git a/visualc/VS2010/mbedTLS.vcxproj b/visualc/VS2010/mbedTLS.vcxproj
index 98b8d66..ee6d28d 100644
--- a/visualc/VS2010/mbedTLS.vcxproj
+++ b/visualc/VS2010/mbedTLS.vcxproj
@@ -251,7 +251,7 @@
     <ClInclude Include="..\..\library\psa_crypto_driver_wrappers.h" />
     <ClInclude Include="..\..\library\psa_crypto_invasive.h" />
     <ClInclude Include="..\..\library\psa_crypto_its.h" />
-    <ClInclude Include="..\..\library\psa_crypto_random.h" />
+    <ClInclude Include="..\..\library\psa_crypto_random_impl.h" />
     <ClInclude Include="..\..\library\psa_crypto_se.h" />
     <ClInclude Include="..\..\library\psa_crypto_service_integration.h" />
     <ClInclude Include="..\..\library\psa_crypto_slot_management.h" />