diff --git a/Makefile-test.am b/Makefile-test.am
index 8fa1026cc..bdcc2e6c4 100644
--- a/Makefile-test.am
+++ b/Makefile-test.am
@@ -19,7 +19,7 @@ endif
 
 check_LTLIBRARIES =
 # test harness configuration
-TEST_EXTENSIONS = .int .int
+TEST_EXTENSIONS = .int
 AM_TESTS_ENVIRONMENT = TPM20TEST_TCTI='$(INTEGRATION_TCTI)'
 EXTRA_DIST += $(srcdir)/script/ekca/create_ca.sh \
               $(srcdir)/script/ekca/init_ca.sh \
@@ -340,101 +340,101 @@ endif #ESYS
 if FAPI
 TESTS_LDADD += $(JSONC_LIBS)
 FAPI_TESTS_INTEGRATION = \
-    test/integration/dlopen-fapi-get-random.fint \
-    test/integration/fapi-check-wrong-paths.fint \
-    test/integration/fapi-data-crypt.fint \
-    test/integration/fapi-data-crypt-persistent.fint \
-    test/integration/fapi-data-crypt-rsa.fint \
-    test/integration/fapi-data-crypt-rsa-persistent.fint \
-    test/integration/fapi-duplicate.fint \
-    test/integration/fapi-export-policy.fint \
-    test/integration/fapi-ext-public-key.fint \
-    test/integration/fapi-get-esys-blobs.fint \
-    test/integration/fapi-get-random.fint \
-    test/integration/fapi-platform-certificates.fint \
-	test/integration/fapi-import-ossl-key-ecc.fint \
-	test/integration/fapi-import-ossl-key-rsa.fint \
-    test/integration/fapi-key-create-sign.fint \
-    test/integration/fapi-key-create-he-sign.fint \
-    test/integration/fapi-key-create-primary-sign.fint \
-    test/integration/fapi-key-create2-sign.fint \
-    test/integration/fapi-key-create-null-key-sign.fint \
-    test/integration/fapi-key-create-sign-persistent-key.fint \
-    test/integration/fapi-key-create-sign-password-provision.fint \
-    test/integration/fapi-key-create-sign-rsa.fint \
-    test/integration/fapi-key-create-policy-authorize-sign.fint \
-    test/integration/fapi-key-create-policy-authorize-rsa-pem-sign.fint \
-    test/integration/fapi-key-create-policy-authorize-ecc-pem-sign.fint \
-    test/integration/fapi-key-create-policy-authorize-sign-rsa.fint \
-    test/integration/fapi-key-create-policy-authorize-nv-sign.fint \
-    test/integration/fapi-key-create-policy-authorize-nv-tpms-sign.fint \
-    test/integration/fapi-key-create-policy-authorize-nv-complex-tpm2b-sign.fint \
-    test/integration/fapi-key-create-policy-secret-nv-sign.fint \
-    test/integration/fapi-key-create-policy-secret-key-sign.fint \
-    test/integration/fapi-key-create-policy-pcr-sign.fint \
-    test/integration/fapi-key-create-policy-signed.fint \
-    test/integration/fapi-key-create-policy-signed-ecc.fint \
-    test/integration/fapi-key-create-policy-signed-keyedhash.fint \
-    test/integration/fapi-key-create-policy-nv-sign.fint \
-    test/integration/fapi-key-create-policy-nv-counter-sign.fint \
-    test/integration/fapi-key-create-policy-or-sign.fint \
-    test/integration/fapi-key-create-policy-password-sign.fint \
-    test/integration/fapi-key-create-policy-countertimer-sign.fint \
-    test/integration/fapi-key-create-policy-physical-presence-sign.fint \
-    test/integration/fapi-key-create-policy-locality-sign.fint \
-    test/integration/fapi-key-create-policy-command-code-sign.fint \
-    test/integration/fapi-key-create-policy-auth-value-sign.fint \
-    test/integration/fapi-key-create-ckda-sign.fint \
-    test/integration/fapi-key-change-auth.fint \
-    test/integration/fapi-key-create-sign-persistent.fint \
-    test/integration/fapi-key-create-sign-password.fint \
-    test/integration/fapi-key-create-ckda-sign-password.fint \
-    test/integration/fapi-key-create-sign-password-da.fint \
-    test/integration/fapi-key-create-ckda-sign-password-da.fint \
-    test/integration/fapi-nv-authorizenv-cphash.fint \
-    test/integration/fapi-nv-ordinary.fint \
-    test/integration/fapi-nv-written-policy.fint \
-    test/integration/fapi-nv-extend.fint \
-    test/integration/fapi-nv-increment.fint \
-    test/integration/fapi-nv-set-bits.fint \
-    test/integration/fapi-pcr-test.fint \
-    test/integration/fapi-quote.fint \
-    test/integration/fapi-quote-with-primary.fint \
-    test/integration/fapi-quote-rsa.fint \
-    test/integration/fapi-policy-or-nv-read-write.fint \
-    test/integration/fapi-second-provisioning.fint \
-    test/integration/fapi-provisioning-error.fint \
-    test/integration/fapi-info.fint \
-    test/integration/fapi-unseal.fint \
-    test/integration/fapi-unseal-persistent.fint
+    test/integration/dlopen-fapi-get-random.int \
+    test/integration/fapi-check-wrong-paths.int \
+    test/integration/fapi-data-crypt.int \
+    test/integration/fapi-data-crypt-persistent.int \
+    test/integration/fapi-data-crypt-rsa.int \
+    test/integration/fapi-data-crypt-rsa-persistent.int \
+    test/integration/fapi-duplicate.int \
+    test/integration/fapi-export-policy.int \
+    test/integration/fapi-ext-public-key.int \
+    test/integration/fapi-get-esys-blobs.int \
+    test/integration/fapi-get-random.int \
+    test/integration/fapi-platform-certificates.int \
+	test/integration/fapi-import-ossl-key-ecc.int \
+	test/integration/fapi-import-ossl-key-rsa.int \
+    test/integration/fapi-key-create-sign.int \
+    test/integration/fapi-key-create-he-sign.int \
+    test/integration/fapi-key-create-primary-sign.int \
+    test/integration/fapi-key-create2-sign.int \
+    test/integration/fapi-key-create-null-key-sign.int \
+    test/integration/fapi-key-create-sign-persistent-key.int \
+    test/integration/fapi-key-create-sign-password-provision.int \
+    test/integration/fapi-key-create-sign-rsa.int \
+    test/integration/fapi-key-create-policy-authorize-sign.int \
+    test/integration/fapi-key-create-policy-authorize-rsa-pem-sign.int \
+    test/integration/fapi-key-create-policy-authorize-ecc-pem-sign.int \
+    test/integration/fapi-key-create-policy-authorize-sign-rsa.int \
+    test/integration/fapi-key-create-policy-authorize-nv-sign.int \
+    test/integration/fapi-key-create-policy-authorize-nv-tpms-sign.int \
+    test/integration/fapi-key-create-policy-authorize-nv-complex-tpm2b-sign.int \
+    test/integration/fapi-key-create-policy-secret-nv-sign.int \
+    test/integration/fapi-key-create-policy-secret-key-sign.int \
+    test/integration/fapi-key-create-policy-pcr-sign.int \
+    test/integration/fapi-key-create-policy-signed.int \
+    test/integration/fapi-key-create-policy-signed-ecc.int \
+    test/integration/fapi-key-create-policy-signed-keyedhash.int \
+    test/integration/fapi-key-create-policy-nv-sign.int \
+    test/integration/fapi-key-create-policy-nv-counter-sign.int \
+    test/integration/fapi-key-create-policy-or-sign.int \
+    test/integration/fapi-key-create-policy-password-sign.int \
+    test/integration/fapi-key-create-policy-countertimer-sign.int \
+    test/integration/fapi-key-create-policy-physical-presence-sign.int \
+    test/integration/fapi-key-create-policy-locality-sign.int \
+    test/integration/fapi-key-create-policy-command-code-sign.int \
+    test/integration/fapi-key-create-policy-auth-value-sign.int \
+    test/integration/fapi-key-create-ckda-sign.int \
+    test/integration/fapi-key-change-auth.int \
+    test/integration/fapi-key-create-sign-persistent.int \
+    test/integration/fapi-key-create-sign-password.int \
+    test/integration/fapi-key-create-ckda-sign-password.int \
+    test/integration/fapi-key-create-sign-password-da.int \
+    test/integration/fapi-key-create-ckda-sign-password-da.int \
+    test/integration/fapi-nv-authorizenv-cphash.int \
+    test/integration/fapi-nv-ordinary.int \
+    test/integration/fapi-nv-written-policy.int \
+    test/integration/fapi-nv-extend.int \
+    test/integration/fapi-nv-increment.int \
+    test/integration/fapi-nv-set-bits.int \
+    test/integration/fapi-pcr-test.int \
+    test/integration/fapi-quote.int \
+    test/integration/fapi-quote-with-primary.int \
+    test/integration/fapi-quote-rsa.int \
+    test/integration/fapi-policy-or-nv-read-write.int \
+    test/integration/fapi-second-provisioning.int \
+    test/integration/fapi-provisioning-error.int \
+    test/integration/fapi-info.int \
+    test/integration/fapi-unseal.int \
+    test/integration/fapi-unseal-persistent.int
 
 if TESTDEVICE
 if DEVICEDESTRUCTIVE
 FAPI_TESTS_INTEGRATION += \
-    test/integration/fapi-key-create-sign-policy-provision.fint \
-    test/integration/fapi-quote-destructive.fint \
-    test/integration/fapi-quote-destructive-eventlog-null.fint \
-    test/integration/fapi-quote-destructive-eventlog-not.fint \
-    test/integration/fapi-quote-destructive-eventlog.fint \
-    test/integration/fapi-quote-destructive-eventlog-pc-client.fint
+    test/integration/fapi-key-create-sign-policy-provision.int \
+    test/integration/fapi-quote-destructive.int \
+    test/integration/fapi-quote-destructive-eventlog-null.int \
+    test/integration/fapi-quote-destructive-eventlog-not.int \
+    test/integration/fapi-quote-destructive-eventlog.int \
+    test/integration/fapi-quote-destructive-eventlog-pc-client.int
 endif #PTPMDESTRUCTIVE
 endif TESTDEVICE
 
 if !TESTDEVICE
 FAPI_TESTS_INTEGRATION += \
-    test/integration/fapi-key-create-sign-policy-provision.fint \
-    test/integration/fapi-provision-fingerprint.fint \
-    test/integration/fapi-provision-certificate.fint \
-    test/integration/fapi-provision-fingerprint_ecc.fint \
-    test/integration/fapi-provision-certificate_ecc.fint \
-    test/integration/fapi-quote-destructive.fint \
-    test/integration/fapi-key-create-policy-nv-tpm-idx-sign.fint \
-    test/integration/fapi-quote-destructive-eventlog-null.fint \
-    test/integration/fapi-quote-destructive-eventlog.fint \
-    test/integration/fapi-quote-destructive-eventlog-pc-client.fint \
-	test/integration/fapi-provisioning-with-template.fint \
-	test/integration/fapi-provisioning-with-template-rsa.fint \
-    test/integration/fapi-provisioning-cert-error.fint
+    test/integration/fapi-key-create-sign-policy-provision.int \
+    test/integration/fapi-provision-fingerprint.int \
+    test/integration/fapi-provision-certificate.int \
+    test/integration/fapi-provision-fingerprint_ecc.int \
+    test/integration/fapi-provision-certificate_ecc.int \
+    test/integration/fapi-quote-destructive.int \
+    test/integration/fapi-key-create-policy-nv-tpm-idx-sign.int \
+    test/integration/fapi-quote-destructive-eventlog-null.int \
+    test/integration/fapi-quote-destructive-eventlog.int \
+    test/integration/fapi-quote-destructive-eventlog-pc-client.int \
+	test/integration/fapi-provisioning-with-template.int \
+	test/integration/fapi-provisioning-with-template-rsa.int \
+    test/integration/fapi-provisioning-cert-error.int
 
 endif #!TESTDEVICE
 
@@ -447,12 +447,11 @@ endif #ENABLE_INTEGRATION
 CLEANFILES += \
     test/integration/*.crt \
     test/integration/*.crl \
-    test/integration/*.fint_state* \
-    test/integration/*.fint.* \
     test/integration/*.int_state* \
+    test/integration/*.int.* \
     test/integration/*.log \
-    test/integration/*.fint_ek* \
-    test/integration/*.fint_*-ca.pem \
+    test/integration/*.int_ek* \
+    test/integration/*.int_*-ca.pem \
     test/tpmclient/*.int_state* \
     test/tpmclient/*.log \
     test/unit/*.log \
@@ -2058,11 +2057,11 @@ test_integration_sys_policy_authorizeNV_int_SOURCES = test/integration/main-sys.
     test/integration/sys-policy-authorizeNV.int.c
 
 if FAPI
-test_integration_dlopen_fapi_get_random_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_dlopen_fapi_get_random_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
     -DENABLE_WARN=1 -DDLOPEN=1
-test_integration_dlopen_fapi_get_random_fint_LDADD   = $(TESTS_LDADD) $(LIBADD_DL)
-test_integration_dlopen_fapi_get_random_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_dlopen_fapi_get_random_fint_SOURCES = \
+test_integration_dlopen_fapi_get_random_int_LDADD   = $(TESTS_LDADD) $(LIBADD_DL)
+test_integration_dlopen_fapi_get_random_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_dlopen_fapi_get_random_int_SOURCES = \
     test/integration/fapi-get-random.int.c \
     tss2-dlopen/tss2-dlopen-fapi.c \
     tss2-dlopen/tss2-dlopen-esys.c \
@@ -2070,622 +2069,622 @@ test_integration_dlopen_fapi_get_random_fint_SOURCES = \
     tss2-dlopen/tss2-dlopen-tctildr.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_check_wrong_paths_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_check_wrong_paths_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_check_wrong_paths_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_check_wrong_paths_fint_SOURCES = \
+test_integration_fapi_check_wrong_paths_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_check_wrong_paths_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_check_wrong_paths_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_check_wrong_paths_int_SOURCES = \
     test/integration/fapi-check-wrong-paths.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_get_esys_blobs_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_get_esys_blobs_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_get_esys_blobs_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_get_esys_blobs_fint_SOURCES = \
+test_integration_fapi_get_esys_blobs_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_get_esys_blobs_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_get_esys_blobs_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_get_esys_blobs_int_SOURCES = \
     test/integration/fapi-get-esys-blobs.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_get_random_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_get_random_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_get_random_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_get_random_fint_SOURCES = \
+test_integration_fapi_get_random_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_get_random_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_get_random_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_get_random_int_SOURCES = \
     test/integration/fapi-get-random.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_platform_certificates_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_platform_certificates_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_platform_certificates_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_platform_certificates_fint_SOURCES = \
+test_integration_fapi_platform_certificates_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_platform_certificates_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_platform_certificates_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_platform_certificates_int_SOURCES = \
     test/integration/fapi-platform-certificates.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_key_create_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_sign_fint_SOURCES = \
+test_integration_fapi_key_create_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_key_create_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_sign_int_SOURCES = \
     test/integration/fapi-key-create-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_he_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_key_create_he_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_he_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_he_sign_fint_SOURCES = \
+test_integration_fapi_key_create_he_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_key_create_he_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_he_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_he_sign_int_SOURCES = \
     test/integration/fapi-key-create-he-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_primary_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_key_create_primary_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_primary_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_primary_sign_fint_SOURCES = \
+test_integration_fapi_key_create_primary_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_key_create_primary_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_primary_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_primary_sign_int_SOURCES = \
     test/integration/fapi-key-create-primary-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
 
-test_integration_fapi_key_create2_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_key_create2_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create2_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create2_sign_fint_SOURCES = \
+test_integration_fapi_key_create2_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_key_create2_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create2_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create2_sign_int_SOURCES = \
     test/integration/fapi-key-create2-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_null_key_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_key_create_null_key_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_null_key_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_null_key_sign_fint_SOURCES = \
+test_integration_fapi_key_create_null_key_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_key_create_null_key_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_null_key_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_null_key_sign_int_SOURCES = \
     test/integration/fapi-key-create-null-key-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_sign_persistent_key_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_sign_persistent_key_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
 -DPERSISTENT
-test_integration_fapi_key_create_sign_persistent_key_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_sign_persistent_key_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_sign_persistent_key_fint_SOURCES = \
+test_integration_fapi_key_create_sign_persistent_key_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_sign_persistent_key_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_sign_persistent_key_int_SOURCES = \
     test/integration/fapi-key-create-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
 
-test_integration_fapi_key_create_sign_password_provision_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_key_create_sign_password_provision_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_sign_password_provision_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_sign_password_provision_fint_SOURCES = \
+test_integration_fapi_key_create_sign_password_provision_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_key_create_sign_password_provision_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_sign_password_provision_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_sign_password_provision_int_SOURCES = \
     test/integration/fapi-key-create-sign-password-provision.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_sign_policy_provision_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_sign_policy_provision_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DFAPI_PROFILE=\"P_RSA_sh_policy\" -DFAPI_TEST_EK_CERT_LESS
-test_integration_fapi_key_create_sign_policy_provision_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_sign_policy_provision_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_sign_policy_provision_fint_SOURCES = \
+test_integration_fapi_key_create_sign_policy_provision_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_sign_policy_provision_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_sign_policy_provision_int_SOURCES = \
     test/integration/fapi-key-create-sign-policy-provision.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_sign_rsa_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_sign_rsa_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DFAPI_PROFILE=\"P_RSA\"
-test_integration_fapi_key_create_sign_rsa_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_sign_rsa_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_sign_rsa_fint_SOURCES = \
+test_integration_fapi_key_create_sign_rsa_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_sign_rsa_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_sign_rsa_int_SOURCES = \
     test/integration/fapi-key-create-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_sign_password_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_sign_password_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DFAPI_PASSWORD
-test_integration_fapi_key_create_sign_password_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_sign_password_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_sign_password_fint_SOURCES = \
+test_integration_fapi_key_create_sign_password_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_sign_password_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_sign_password_int_SOURCES = \
     test/integration/fapi-key-create-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_sign_password_da_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_sign_password_da_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DFAPI_PASSWORD -DFAPI_DA
-test_integration_fapi_key_create_sign_password_da_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_sign_password_da_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_sign_password_da_fint_SOURCES = \
+test_integration_fapi_key_create_sign_password_da_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_sign_password_da_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_sign_password_da_int_SOURCES = \
     test/integration/fapi-key-create-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_sign_persistent_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_sign_persistent_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
    -DFAPI_PROFILE=\"P_RSA_EK_persistent\" -DFAPI_TEST_EK_CERT_LESS
-test_integration_fapi_key_create_sign_persistent_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_sign_persistent_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_sign_persistent_fint_SOURCES = \
+test_integration_fapi_key_create_sign_persistent_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_sign_persistent_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_sign_persistent_int_SOURCES = \
     test/integration/fapi-key-create-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_authorize_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) -DFAPI_PROFILE=\"P_RSA\"
-test_integration_fapi_key_create_policy_authorize_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_authorize_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_authorize_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_authorize_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) -DFAPI_PROFILE=\"P_RSA\"
+test_integration_fapi_key_create_policy_authorize_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_authorize_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_authorize_sign_int_SOURCES = \
     test/integration/fapi-key-create-policy-authorize-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_authorize_rsa_pem_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) -DFAPI_PROFILE=\"P_RSA\"
-test_integration_fapi_key_create_policy_authorize_rsa_pem_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_authorize_rsa_pem_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_authorize_rsa_pem_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_authorize_rsa_pem_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) -DFAPI_PROFILE=\"P_RSA\"
+test_integration_fapi_key_create_policy_authorize_rsa_pem_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_authorize_rsa_pem_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_authorize_rsa_pem_sign_int_SOURCES = \
     test/integration/fapi-key-create-policy-authorize-pem-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_authorize_ecc_pem_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) -DTEST_ECC
-test_integration_fapi_key_create_policy_authorize_ecc_pem_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_authorize_ecc_pem_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_authorize_ecc_pem_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_authorize_ecc_pem_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) -DTEST_ECC
+test_integration_fapi_key_create_policy_authorize_ecc_pem_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_authorize_ecc_pem_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_authorize_ecc_pem_sign_int_SOURCES = \
     test/integration/fapi-key-create-policy-authorize-pem-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
 
-test_integration_fapi_key_create_policy_authorize_sign_rsa_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_policy_authorize_sign_rsa_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
     -DFAPI_PROFILE=\"P_RSA256\" -DFAPI_TEST_EK_CERT_LESS
-test_integration_fapi_key_create_policy_authorize_sign_rsa_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_authorize_sign_rsa_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_authorize_sign_rsa_fint_SOURCES = \
+test_integration_fapi_key_create_policy_authorize_sign_rsa_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_authorize_sign_rsa_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_authorize_sign_rsa_int_SOURCES = \
     test/integration/fapi-key-create-policy-authorize-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_authorize_nv_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_key_create_policy_authorize_nv_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_authorize_nv_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_authorize_nv_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_authorize_nv_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_key_create_policy_authorize_nv_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_authorize_nv_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_authorize_nv_sign_int_SOURCES = \
     test/integration/fapi-key-create-policy-authorize-nv-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_authorize_nv_tpms_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_policy_authorize_nv_tpms_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
     -DPOLICY_AUTHORIZE_NV=\""/policy/pol_authorize_nv_tpms\""
-test_integration_fapi_key_create_policy_authorize_nv_tpms_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_authorize_nv_tpms_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_authorize_nv_tpms_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_authorize_nv_tpms_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_authorize_nv_tpms_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_authorize_nv_tpms_sign_int_SOURCES = \
     test/integration/fapi-key-create-policy-authorize-nv-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_authorize_nv_complex_tpm2b_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_policy_authorize_nv_complex_tpm2b_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
     -DPOLICY_AUTHORIZE_NV=\""/policy/pol_authorize_nv_complex_tpm2b\""
-test_integration_fapi_key_create_policy_authorize_nv_complex_tpm2b_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_authorize_nv_complex_tpm2b_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_authorize_nv_complex_tpm2b_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_authorize_nv_complex_tpm2b_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_authorize_nv_complex_tpm2b_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_authorize_nv_complex_tpm2b_sign_int_SOURCES = \
     test/integration/fapi-key-create-policy-authorize-nv-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_secret_nv_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_policy_secret_nv_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
     -DFAPI_PROFILE=\"P_RSA256\" -DFAPI_TEST_EK_CERT_LESS
-test_integration_fapi_key_create_policy_secret_nv_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_secret_nv_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_secret_nv_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_secret_nv_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_secret_nv_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_secret_nv_sign_int_SOURCES = \
     test/integration/fapi-key-create-policy-secret-nv-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_secret_key_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_key_create_policy_secret_key_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_secret_key_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_secret_key_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_secret_key_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_key_create_policy_secret_key_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_secret_key_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_secret_key_sign_int_SOURCES = \
     test/integration/fapi-key-create-policy-secret-key-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_pcr_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_key_create_policy_pcr_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_pcr_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_pcr_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_pcr_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_key_create_policy_pcr_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_pcr_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_pcr_sign_int_SOURCES = \
     test/integration/fapi-key-create-policy-pcr-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_signed_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_key_create_policy_signed_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_signed_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_signed_fint_SOURCES = \
+test_integration_fapi_key_create_policy_signed_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_key_create_policy_signed_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_signed_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_signed_int_SOURCES = \
     test/integration/fapi-key-create-policy-signed.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_signed_ecc_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_policy_signed_ecc_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DTEST_ECC
-test_integration_fapi_key_create_policy_signed_ecc_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_signed_ecc_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_signed_ecc_fint_SOURCES = \
+test_integration_fapi_key_create_policy_signed_ecc_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_signed_ecc_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_signed_ecc_int_SOURCES = \
     test/integration/fapi-key-create-policy-signed.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_signed_keyedhash_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_key_create_policy_signed_keyedhash_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_signed_keyedhash_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_signed_keyedhash_fint_SOURCES = \
+test_integration_fapi_key_create_policy_signed_keyedhash_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_key_create_policy_signed_keyedhash_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_signed_keyedhash_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_signed_keyedhash_int_SOURCES = \
     test/integration/fapi-key-create-policy-signed-keyedhash.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
 
-test_integration_fapi_key_create_policy_nv_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_key_create_policy_nv_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_nv_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_nv_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_nv_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_key_create_policy_nv_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_nv_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_nv_sign_int_SOURCES = \
     test/integration/fapi-key-create-policy-nv-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_nv_tpm_idx_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_policy_nv_tpm_idx_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
     -DTPMIDX
-test_integration_fapi_key_create_policy_nv_tpm_idx_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_nv_tpm_idx_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_nv_tpm_idx_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_nv_tpm_idx_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_nv_tpm_idx_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_nv_tpm_idx_sign_int_SOURCES = \
     test/integration/fapi-key-create-policy-nv-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_nv_counter_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_key_create_policy_nv_counter_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_nv_counter_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_nv_counter_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_nv_counter_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_key_create_policy_nv_counter_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_nv_counter_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_nv_counter_sign_int_SOURCES = \
     test/integration/fapi-key-create-policy-nv-counter-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_or_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_key_create_policy_or_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_or_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_or_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_or_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_key_create_policy_or_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_or_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_or_sign_int_SOURCES = \
     test/integration/fapi-key-create-policy-or-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_password_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_policy_password_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
     -DTEST_POLICY_PASSWORD -DTEST_PASSWORD
-test_integration_fapi_key_create_policy_password_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_password_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_password_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_password_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_password_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_password_sign_int_SOURCES = \
     test/integration/fapi-key-create-policies-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_countertimer_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_policy_countertimer_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
     -DTEST_POLICY_COUNTERTIMER
-test_integration_fapi_key_create_policy_countertimer_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_countertimer_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_countertimer_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_countertimer_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_countertimer_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_countertimer_sign_int_SOURCES = \
     test/integration/fapi-key-create-policies-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_physical_presence_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_policy_physical_presence_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
     -DTEST_POLICY_PHYSICAL_PRESENCE
-test_integration_fapi_key_create_policy_physical_presence_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_physical_presence_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_physical_presence_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_physical_presence_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_physical_presence_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_physical_presence_sign_int_SOURCES = \
     test/integration/fapi-key-create-policies-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_locality_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_policy_locality_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
     -DTEST_POLICY_LOCALITY
-test_integration_fapi_key_create_policy_locality_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_locality_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_locality_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_locality_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_locality_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_locality_sign_int_SOURCES = \
     test/integration/fapi-key-create-policies-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_command_code_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_policy_command_code_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
     -DTEST_POLICY_COMMAND_CODE
-test_integration_fapi_key_create_policy_command_code_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_command_code_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_command_code_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_command_code_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_command_code_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_command_code_sign_int_SOURCES = \
     test/integration/fapi-key-create-policies-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_policy_auth_value_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_policy_auth_value_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DTEST_POLICY_AUTH_VALUE -DTEST_PASSWORD
-test_integration_fapi_key_create_policy_auth_value_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_policy_auth_value_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_policy_auth_value_sign_fint_SOURCES = \
+test_integration_fapi_key_create_policy_auth_value_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_policy_auth_value_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_policy_auth_value_sign_int_SOURCES = \
     test/integration/fapi-key-create-policies-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_ckda_sign_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_ckda_sign_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DFAPI_PROFILE=\"P_RSA\"
-test_integration_fapi_key_create_ckda_sign_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_ckda_sign_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_ckda_sign_fint_SOURCES = \
+test_integration_fapi_key_create_ckda_sign_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_ckda_sign_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_ckda_sign_int_SOURCES = \
     test/integration/fapi-key-create-ckda-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_ckda_sign_password_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_ckda_sign_password_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DFAPI_PASSWORD  -DFAPI_PROFILE=\"P_RSA\"
-test_integration_fapi_key_create_ckda_sign_password_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_ckda_sign_password_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_ckda_sign_password_fint_SOURCES = \
+test_integration_fapi_key_create_ckda_sign_password_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_ckda_sign_password_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_ckda_sign_password_int_SOURCES = \
     test/integration/fapi-key-create-ckda-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_create_ckda_sign_password_da_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_key_create_ckda_sign_password_da_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DFAPI_PASSWORD -DFAPI_DA  -DFAPI_PROFILE=\"P_RSA\"
-test_integration_fapi_key_create_ckda_sign_password_da_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_create_ckda_sign_password_da_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_create_ckda_sign_password_da_fint_SOURCES = \
+test_integration_fapi_key_create_ckda_sign_password_da_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_create_ckda_sign_password_da_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_create_ckda_sign_password_da_int_SOURCES = \
     test/integration/fapi-key-create-ckda-sign.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_key_change_auth_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_key_change_auth_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_key_change_auth_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_key_change_auth_fint_SOURCES = \
+test_integration_fapi_key_change_auth_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_key_change_auth_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_key_change_auth_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_key_change_auth_int_SOURCES = \
     test/integration/fapi-key-change-auth.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_nv_ordinary_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_nv_ordinary_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_nv_ordinary_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_nv_ordinary_fint_SOURCES = \
+test_integration_fapi_nv_ordinary_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_nv_ordinary_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_nv_ordinary_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_nv_ordinary_int_SOURCES = \
     test/integration/fapi-nv-ordinary.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_nv_authorizenv_cphash_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_nv_authorizenv_cphash_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_nv_authorizenv_cphash_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_nv_authorizenv_cphash_fint_SOURCES = \
+test_integration_fapi_nv_authorizenv_cphash_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_nv_authorizenv_cphash_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_nv_authorizenv_cphash_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_nv_authorizenv_cphash_int_SOURCES = \
     test/integration/fapi-nv-authorizenv-cphash.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_nv_extend_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_nv_extend_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_nv_extend_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_nv_extend_fint_SOURCES = \
+test_integration_fapi_nv_extend_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_nv_extend_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_nv_extend_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_nv_extend_int_SOURCES = \
     test/integration/fapi-nv-extend.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_nv_increment_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_nv_increment_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_nv_increment_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_nv_increment_fint_SOURCES = \
+test_integration_fapi_nv_increment_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_nv_increment_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_nv_increment_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_nv_increment_int_SOURCES = \
     test/integration/fapi-nv-increment.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_nv_set_bits_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_nv_set_bits_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_nv_set_bits_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_nv_set_bits_fint_SOURCES = \
+test_integration_fapi_nv_set_bits_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_nv_set_bits_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_nv_set_bits_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_nv_set_bits_int_SOURCES = \
     test/integration/fapi-nv-set-bits.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_nv_written_policy_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_nv_written_policy_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_nv_written_policy_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_nv_written_policy_fint_SOURCES = \
+test_integration_fapi_nv_written_policy_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_nv_written_policy_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_nv_written_policy_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_nv_written_policy_int_SOURCES = \
     test/integration/fapi-nv-written-policy.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_export_policy_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_export_policy_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_export_policy_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_export_policy_fint_SOURCES = \
+test_integration_fapi_export_policy_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_export_policy_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_export_policy_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_export_policy_int_SOURCES = \
     test/integration/fapi-export-policy.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_ext_public_key_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_ext_public_key_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
   -DFAPI_NONTPM
-test_integration_fapi_ext_public_key_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_ext_public_key_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_ext_public_key_fint_SOURCES = \
+test_integration_fapi_ext_public_key_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_ext_public_key_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_ext_public_key_int_SOURCES = \
     test/integration/fapi-ext-public-key.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_data_crypt_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_data_crypt_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_data_crypt_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_data_crypt_fint_SOURCES = \
+test_integration_fapi_data_crypt_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_data_crypt_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_data_crypt_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_data_crypt_int_SOURCES = \
     test/integration/fapi-data-crypt.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_data_crypt_persistent_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_data_crypt_persistent_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DPERSISTENT
-test_integration_fapi_data_crypt_persistent_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_data_crypt_persistent_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_data_crypt_persistent_fint_SOURCES = \
+test_integration_fapi_data_crypt_persistent_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_data_crypt_persistent_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_data_crypt_persistent_int_SOURCES = \
     test/integration/fapi-data-crypt.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_data_crypt_rsa_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_data_crypt_rsa_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DFAPI_PROFILE=\"P_RSA\"
-test_integration_fapi_data_crypt_rsa_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_data_crypt_rsa_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_data_crypt_rsa_fint_SOURCES = \
+test_integration_fapi_data_crypt_rsa_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_data_crypt_rsa_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_data_crypt_rsa_int_SOURCES = \
     test/integration/fapi-data-crypt.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_data_crypt_rsa_persistent_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_data_crypt_rsa_persistent_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DFAPI_PROFILE=\"P_RSA\" -DPERSISTENT
-test_integration_fapi_data_crypt_rsa_persistent_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_data_crypt_rsa_persistent_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_data_crypt_rsa_persistent_fint_SOURCES = \
+test_integration_fapi_data_crypt_rsa_persistent_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_data_crypt_rsa_persistent_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_data_crypt_rsa_persistent_int_SOURCES = \
     test/integration/fapi-data-crypt.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_duplicate_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_duplicate_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_duplicate_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_duplicate_fint_SOURCES = \
+test_integration_fapi_duplicate_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_duplicate_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_duplicate_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_duplicate_int_SOURCES = \
     test/integration/fapi-duplicate.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_import_ossl_key_ecc_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_import_ossl_key_ecc_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DFAPI_PROFILE=\"P_ECC\"
-test_integration_fapi_import_ossl_key_ecc_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_import_ossl_key_ecc_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_import_ossl_key_ecc_fint_SOURCES = \
+test_integration_fapi_import_ossl_key_ecc_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_import_ossl_key_ecc_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_import_ossl_key_ecc_int_SOURCES = \
     test/integration/fapi-import-ossl-key.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_import_ossl_key_rsa_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_import_ossl_key_rsa_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DFAPI_PROFILE=\"P_RSA\"
-test_integration_fapi_import_ossl_key_rsa_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_import_ossl_key_rsa_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_import_ossl_key_rsa_fint_SOURCES = \
+test_integration_fapi_import_ossl_key_rsa_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_import_ossl_key_rsa_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_import_ossl_key_rsa_int_SOURCES = \
     test/integration/fapi-import-ossl-key.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_pcr_test_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_pcr_test_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_pcr_test_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_pcr_test_fint_SOURCES = \
+test_integration_fapi_pcr_test_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_pcr_test_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_pcr_test_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_pcr_test_int_SOURCES = \
     test/integration/fapi-pcr-test.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_quote_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_quote_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_quote_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_quote_fint_SOURCES = \
+test_integration_fapi_quote_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_quote_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_quote_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_quote_int_SOURCES = \
     test/integration/fapi-quote.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_quote_with_primary_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_quote_with_primary_fint_LDADD    = $(TESTS_LDADD)
-test_integration_fapi_quote_with_primary_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_quote_with_primary_fint_SOURCES = \
+test_integration_fapi_quote_with_primary_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_quote_with_primary_int_LDADD    = $(TESTS_LDADD)
+test_integration_fapi_quote_with_primary_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_quote_with_primary_int_SOURCES = \
     test/integration/fapi-quote-with-primary.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_quote_rsa_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_quote_rsa_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DFAPI_PROFILE=\"P_RSA\"
-test_integration_fapi_quote_rsa_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_quote_rsa_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_quote_rsa_fint_SOURCES = \
+test_integration_fapi_quote_rsa_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_quote_rsa_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_quote_rsa_int_SOURCES = \
     test/integration/fapi-quote.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_policy_or_nv_read_write_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_policy_or_nv_read_write_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_policy_or_nv_read_write_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_policy_or_nv_read_write_fint_SOURCES = \
+test_integration_fapi_policy_or_nv_read_write_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_policy_or_nv_read_write_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_policy_or_nv_read_write_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_policy_or_nv_read_write_int_SOURCES = \
     test/integration/fapi-policy-or-nv-read-write.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_info_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_info_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_info_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_info_fint_SOURCES = \
+test_integration_fapi_info_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_info_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_info_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_info_int_SOURCES = \
     test/integration/fapi-info.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_unseal_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_unseal_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_unseal_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_unseal_fint_SOURCES = \
+test_integration_fapi_unseal_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_unseal_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_unseal_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_unseal_int_SOURCES = \
     test/integration/fapi-unseal.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_unseal_persistent_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_unseal_persistent_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DPERSISTENT
-test_integration_fapi_unseal_persistent_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_unseal_persistent_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_unseal_persistent_fint_SOURCES = \
+test_integration_fapi_unseal_persistent_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_unseal_persistent_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_unseal_persistent_int_SOURCES = \
     test/integration/fapi-unseal.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
 
-test_integration_fapi_provision_fingerprint_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_provision_fingerprint_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DFAPI_TEST_FINGERPRINT  -DFAPI_PROFILE=\"P_RSA\"
-test_integration_fapi_provision_fingerprint_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_provision_fingerprint_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_provision_fingerprint_fint_SOURCES = \
+test_integration_fapi_provision_fingerprint_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_provision_fingerprint_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_provision_fingerprint_int_SOURCES = \
     test/integration/fapi-get-random.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_provision_certificate_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_provision_certificate_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DFAPI_TEST_CERTIFICATE  -DFAPI_PROFILE=\"P_RSA\"
-test_integration_fapi_provision_certificate_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_provision_certificate_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_provision_certificate_fint_SOURCES = \
+test_integration_fapi_provision_certificate_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_provision_certificate_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_provision_certificate_int_SOURCES = \
     test/integration/fapi-get-random.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_provision_fingerprint_ecc_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_provision_fingerprint_ecc_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DFAPI_TEST_FINGERPRINT_ECC  -DFAPI_PROFILE=\"P_ECC\"
-test_integration_fapi_provision_fingerprint_ecc_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_provision_fingerprint_ecc_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_provision_fingerprint_ecc_fint_SOURCES = \
+test_integration_fapi_provision_fingerprint_ecc_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_provision_fingerprint_ecc_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_provision_fingerprint_ecc_int_SOURCES = \
     test/integration/fapi-get-random.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_provision_certificate_ecc_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_provision_certificate_ecc_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DFAPI_TEST_CERTIFICATE_ECC  -DFAPI_PROFILE=\"P_ECC\"
-test_integration_fapi_provision_certificate_ecc_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_provision_certificate_ecc_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_provision_certificate_ecc_fint_SOURCES = \
+test_integration_fapi_provision_certificate_ecc_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_provision_certificate_ecc_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_provision_certificate_ecc_int_SOURCES = \
     test/integration/fapi-get-random.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_second_provisioning_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_second_provisioning_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_second_provisioning_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_second_provisioning_fint_SOURCES = \
+test_integration_fapi_second_provisioning_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_second_provisioning_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_second_provisioning_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_second_provisioning_int_SOURCES = \
     test/integration/fapi-second-provisioning.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_provisioning_error_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_provisioning_error_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DFAPI_PROFILE=\"P_ECC_error\" -DFAPI_TEST_EK_CERT_LESS
-test_integration_fapi_provisioning_error_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_provisioning_error_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_provisioning_error_fint_SOURCES = \
+test_integration_fapi_provisioning_error_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_provisioning_error_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_provisioning_error_int_SOURCES = \
     test/integration/fapi-provisioning-error.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_provisioning_cert_error_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_provisioning_cert_error_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DSELF_SIGNED_CERTIFICATE
-test_integration_fapi_provisioning_cert_error_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_provisioning_cert_error_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_provisioning_cert_error_fint_SOURCES = \
+test_integration_fapi_provisioning_cert_error_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_provisioning_cert_error_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_provisioning_cert_error_int_SOURCES = \
     test/integration/fapi-provisioning-cert-error.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_quote_destructive_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_quote_destructive_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_quote_destructive_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_quote_destructive_fint_SOURCES = \
+test_integration_fapi_quote_destructive_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_quote_destructive_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_quote_destructive_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_quote_destructive_int_SOURCES = \
     test/integration/fapi-quote-destructive.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_quote_destructive_eventlog_null_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_quote_destructive_eventlog_null_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
   -DFAPI_PROFILE=\"P_ECC_system\" \
   -D FAPI_TEST_FIRMWARE_NULL \
   -D FAPI_TEST_FIRMWARE_LOG_FILE_ABS=\"/dev/null\" \
   -D FAPI_TEST_IMA_LOG_FILE_ABS=\"/dev/null\"
-test_integration_fapi_quote_destructive_eventlog_null_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_quote_destructive_eventlog_null_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_quote_destructive_eventlog_null_fint_SOURCES = \
+test_integration_fapi_quote_destructive_eventlog_null_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_quote_destructive_eventlog_null_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_quote_destructive_eventlog_null_int_SOURCES = \
     test/integration/fapi-quote-destructive-eventlog.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_quote_destructive_eventlog_not_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_quote_destructive_eventlog_not_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
   -DFAPI_PROFILE=\"P_ECC_system\" \
   -D FAPI_TEST_FIRMWARE_NULL
-test_integration_fapi_quote_destructive_eventlog_not_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_quote_destructive_eventlog_not_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_quote_destructive_eventlog_not_fint_SOURCES = \
+test_integration_fapi_quote_destructive_eventlog_not_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_quote_destructive_eventlog_not_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_quote_destructive_eventlog_not_int_SOURCES = \
     test/integration/fapi-quote-destructive-eventlog.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-EXTRA_test_integration_fapi_quote_destructive_eventlog_fint_DEPENDENCIES = $(FAPI_TEST_BINS)
+EXTRA_test_integration_fapi_quote_destructive_eventlog_int_DEPENDENCIES = $(FAPI_TEST_BINS)
 
-test_integration_fapi_quote_destructive_eventlog_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_quote_destructive_eventlog_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
   -DFAPI_PROFILE=\"P_ECC_system\" \
   -D FAPI_TEST_FIRMWARE_NUC \
   -D FAPI_TEST_FIRMWARE_LOG_FILE=\"test/data/fapi/eventlog/binary_measurements_nuc.bin\" \
   -D FAPI_TEST_IMA_LOG_FILE=\"test/data/fapi/eventlog/sml-ima-ng-sha1.bin\"
-test_integration_fapi_quote_destructive_eventlog_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_quote_destructive_eventlog_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_quote_destructive_eventlog_fint_SOURCES = \
+test_integration_fapi_quote_destructive_eventlog_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_quote_destructive_eventlog_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_quote_destructive_eventlog_int_SOURCES = \
     test/integration/fapi-quote-destructive-eventlog.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-EXTRA_test_integration_fapi_quote_destructive_eventlog_pc_client_fint_DEPENDENCIES = $(FAPI_TEST_BINS)
+EXTRA_test_integration_fapi_quote_destructive_eventlog_pc_client_int_DEPENDENCIES = $(FAPI_TEST_BINS)
 
-test_integration_fapi_quote_destructive_eventlog_pc_client_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_quote_destructive_eventlog_pc_client_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
   -DFAPI_PROFILE=\"P_ECC_system\" \
   -D FAPI_TEST_FIRMWARE_PC_CLIENT \
   -D FAPI_TEST_FIRMWARE_LOG_FILE=\"test/data/fapi/eventlog/binary_measurements_pc_client.bin\" \
   -D FAPI_TEST_IMA_LOG_FILE=\"test/data/fapi/eventlog/sml-ima-ng-sha1.bin\"
-test_integration_fapi_quote_destructive_eventlog_pc_client_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_quote_destructive_eventlog_pc_client_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_quote_destructive_eventlog_pc_client_fint_SOURCES = \
+test_integration_fapi_quote_destructive_eventlog_pc_client_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_quote_destructive_eventlog_pc_client_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_quote_destructive_eventlog_pc_client_int_SOURCES = \
     test/integration/fapi-quote-destructive-eventlog.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_provisioning_with_template_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
-test_integration_fapi_provisioning_with_template_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_provisioning_with_template_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_provisioning_with_template_fint_SOURCES = \
+test_integration_fapi_provisioning_with_template_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS)
+test_integration_fapi_provisioning_with_template_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_provisioning_with_template_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_provisioning_with_template_int_SOURCES = \
     test/integration/fapi-provisioning-with-template.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h
 
-test_integration_fapi_provisioning_with_template_rsa_fint_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
+test_integration_fapi_provisioning_with_template_rsa_int_CFLAGS  = $(JSONC_CFLAGS) $(TESTS_CFLAGS) \
  -DFAPI_PROFILE=\"P_RSA\"
-test_integration_fapi_provisioning_with_template_rsa_fint_LDADD   = $(TESTS_LDADD)
-test_integration_fapi_provisioning_with_template_rsa_fint_LDFLAGS = $(TESTS_LDFLAGS)
-test_integration_fapi_provisioning_with_template_rsa_fint_SOURCES = \
+test_integration_fapi_provisioning_with_template_rsa_int_LDADD   = $(TESTS_LDADD)
+test_integration_fapi_provisioning_with_template_rsa_int_LDFLAGS = $(TESTS_LDFLAGS)
+test_integration_fapi_provisioning_with_template_rsa_int_SOURCES = \
     test/integration/fapi-provisioning-with-template.int.c \
     test/integration/main-fapi.c test/integration/test-fapi.h