diff --git a/npa/src/npa.c b/npa/src/npa.c
index 4536333..30203f2 100644
--- a/npa/src/npa.c
+++ b/npa/src/npa.c
@@ -1892,7 +1892,7 @@ err:
 }
 
 static const char *MRZ_name = "MRZ";
-static const char *PIN_name = "PIN";
+static const char *PIN_name = "eID PIN";
 static const char *PUK_name = "PUK";
 static const char *CAN_name = "CAN";
 static const char *UNDEF_name = "UNDEF";
diff --git a/npa/src/pkcs15-npa.c b/npa/src/pkcs15-npa.c
index f68c2b1..d83f726 100644
--- a/npa/src/pkcs15-npa.c
+++ b/npa/src/pkcs15-npa.c
@@ -89,7 +89,7 @@ static int npa_add_pins(sc_pkcs15_card_t *p15card)
 	if (r != SC_SUCCESS)
 		goto err;
 
-	r = npa_add_pin(p15card, "MRZ", -1,
+	r = npa_add_pin(p15card, npa_secret_name(PACE_PIN_ID_MRZ), -1,
 			SC_PKCS15_PIN_FLAG_CASE_SENSITIVE
 			| SC_PKCS15_PIN_FLAG_INITIALIZED
 			| SC_PKCS15_PIN_FLAG_SO_PIN
@@ -99,7 +99,7 @@ static int npa_add_pins(sc_pkcs15_card_t *p15card)
 	if (r != SC_SUCCESS)
 		goto err;
 
-	r = npa_add_pin(p15card, "CAN", -1,
+	r = npa_add_pin(p15card, npa_secret_name(PACE_PIN_ID_CAN), -1,
 			SC_PKCS15_PIN_FLAG_CASE_SENSITIVE
 			| SC_PKCS15_PIN_FLAG_INITIALIZED
 			| SC_PKCS15_PIN_FLAG_SO_PIN
@@ -108,14 +108,14 @@ static int npa_add_pins(sc_pkcs15_card_t *p15card)
 	if (r != SC_SUCCESS)
 		goto err;
 
-	r = npa_add_pin(p15card, "eID PIN", 3,
+	r = npa_add_pin(p15card, npa_secret_name(PACE_PIN_ID_PIN), 3,
 			SC_PKCS15_PIN_FLAG_CASE_SENSITIVE
 			| SC_PKCS15_PIN_FLAG_INITIALIZED,
 			5, 6, PACE_PIN_ID_PIN, PACE_PIN_ID_PUK, mf);
 	if (r != SC_SUCCESS)
 		goto err;
 
-	r = npa_add_pin(p15card, "PUK", -1,
+	r = npa_add_pin(p15card, npa_secret_name(PACE_PIN_ID_PUK), -1,
 			SC_PKCS15_PIN_FLAG_CASE_SENSITIVE
 			| SC_PKCS15_PIN_FLAG_INITIALIZED
 			| SC_PKCS15_PIN_FLAG_UNBLOCKING_PIN