diff --git a/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/cc3xx_config.h b/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/cc3xx_config.h
deleted file mode 100644
index 899844a..0000000
--- a/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/cc3xx_config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- */
-
-#ifndef CC3XX_CONFIG_H
-#define CC3XX_CONFIG_H
-
-/** \file cc3xx_config.h
- *
- * This file includes the configuration items specific to the CC3XX driver which
- * are not covered by the configuration mechanisms available in the PSA config
- * file. A description of the options is available in \ref cc3xx.h
- */
-
-//#define CC3XX_CONFIG_ENABLE_CC_TO_PSA_TYPE_CONVERSION
-#define CC3XX_CONFIG_ENABLE_AEAD_ONE_SHOT_USE_MULTIPART
-//#define CC3XX_CONFIG_ENABLE_AEAD_AES_CACHED_MODE
-
-#endif /* CC3XX_CONFIG_H */
diff --git a/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/cc3xx_psa_api_config.h b/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/cc3xx_psa_api_config.h
new file mode 100644
index 0000000..f80c300
--- /dev/null
+++ b/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/cc3xx_psa_api_config.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2022-2023, Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ */
+
+#ifndef CC3XX_PSA_API_CONFIG_H
+#define CC3XX_PSA_API_CONFIG_H
+
+/** \file cc3xx_psa_api_config.h
+ *
+ * This file includes the configuration items specific to the CC3XX driver which
+ * are not covered by the configuration mechanisms available in the PSA config
+ * file, but are still relative to the CC3XX PSA Driver API interface layer only
+ * A description of the options is available in \ref cc3xx.h
+ *
+ */
+
+//#define CC3XX_CONFIG_ENABLE_CC_TO_PSA_TYPE_CONVERSION
+#define CC3XX_CONFIG_ENABLE_AEAD_ONE_SHOT_USE_MULTIPART
+//#define CC3XX_CONFIG_ENABLE_AEAD_AES_CACHED_MODE
+
+#endif /* CC3XX_PSA_API_CONFIG_H */
diff --git a/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/include/cc3xx_crypto_primitives_private.h b/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/include/cc3xx_crypto_primitives_private.h
index 1f21c42..156ef9f 100644
--- a/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/include/cc3xx_crypto_primitives_private.h
+++ b/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/include/cc3xx_crypto_primitives_private.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2021-2023, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -19,7 +19,7 @@
 
 /* Include the public header first as it contains the typedefs */
 #include "cc3xx_crypto_primitives.h"
-#include "cc3xx_config.h"
+#include "cc3xx_psa_api_config.h"
 #include "psa/crypto.h"
 
 #include "hash_driver.h"
diff --git a/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/src/cc3xx_internal_ecc_util.c b/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/src/cc3xx_internal_ecc_util.c
index a5a656e..05062f6 100644
--- a/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/src/cc3xx_internal_ecc_util.c
+++ b/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/src/cc3xx_internal_ecc_util.c
@@ -8,7 +8,7 @@
 #include "cc3xx_internal_ecc_util.h"
 #include "psa/crypto.h"
 
-#include "cc3xx_config.h"
+#include "cc3xx_psa_api_config.h"
 
 #include "cc_ecpki_error.h"
 #include "cc_pal_abort.h"
diff --git a/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/src/cc3xx_internal_rsa_util.c b/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/src/cc3xx_internal_rsa_util.c
index 28de04f..df12edc 100644
--- a/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/src/cc3xx_internal_rsa_util.c
+++ b/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/src/cc3xx_internal_rsa_util.c
@@ -15,7 +15,7 @@
 #include "cc3xx_internal_rsa_util.h"
 #include "cc3xx_internal_asn1_util.h"
 
-#include "cc3xx_config.h"
+#include "cc3xx_psa_api_config.h"
 
 #include "cc_common.h"
 #include "cc_rnd_error.h"
diff --git a/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/src/cc3xx_psa_aead.c b/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/src/cc3xx_psa_aead.c
index eb6be1a..8194ef7 100644
--- a/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/src/cc3xx_psa_aead.c
+++ b/lib/ext/cryptocell-312-runtime/codesafe/src/psa_driver_api/src/cc3xx_psa_aead.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2021-2023, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -18,7 +18,7 @@
 #include "cc_pal_mem.h"
 #include "cc_pal_types.h"
 
-#include "cc3xx_config.h"
+#include "cc3xx_psa_api_config.h"
 
 #include "cc3xx_psa_aead.h"
 #include "cc3xx_internal_ccm.h"