diff --git a/library/x509_oid.c b/library/x509_oid.c
index d05a36d5bc..1637c1cff7 100644
--- a/library/x509_oid.c
+++ b/library/x509_oid.c
@@ -1,5 +1,5 @@
 /**
- * \file oid.c
+ * \file x509_oid.c
  *
  * \brief Object Identifier (OID) database
  *
diff --git a/library/x509_oid.h b/library/x509_oid.h
index d4bbd09ff3..5f51367053 100644
--- a/library/x509_oid.h
+++ b/library/x509_oid.h
@@ -1,5 +1,5 @@
 /**
- * \file oid.h
+ * \file x509_oid.h
  *
  * \brief Object Identifier (OID) database
  */
@@ -7,8 +7,8 @@
  *  Copyright The Mbed TLS Contributors
  *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
  */
-#ifndef MBEDTLS_OID_H
-#define MBEDTLS_OID_H
+#ifndef MBEDTLS_X509_OID_H
+#define MBEDTLS_X509_OID_H
 #include "mbedtls/private_access.h"
 
 #include "tf-psa-crypto/build_info.h"
@@ -692,4 +692,4 @@ int mbedtls_oid_get_pkcs12_pbe_alg(const mbedtls_asn1_buf *oid, mbedtls_md_type_
 }
 #endif
 
-#endif /* oid.h */
+#endif /* x509_oid.h */