diff --git a/card-functionality/src/tests.rs b/card-functionality/src/tests.rs
index 2af2ef2..809c7a2 100644
--- a/card-functionality/src/tests.rs
+++ b/card-functionality/src/tests.rs
@@ -513,7 +513,7 @@ pub fn test_verify(mut card: Card<Open>, _param: &[&str]) -> Result<TestOutput,
         panic!("Status should be 'SecurityStatusNotSatisfied'");
     }
 
-    transaction.verify_admin("12345678")?;
+    transaction.verify_admin_pin("12345678")?;
 
     match transaction.check_admin_verified() {
         Err(Error::CardStatus(s)) => {
@@ -535,7 +535,7 @@ pub fn test_verify(mut card: Card<Open>, _param: &[&str]) -> Result<TestOutput,
     let cardholder = transaction.cardholder_related_data()?;
     assert_eq!(cardholder.name(), Some("Admin<<Hello".as_bytes()));
 
-    transaction.verify_user("123456")?;
+    transaction.verify_user_pin("123456")?;
 
     match transaction.check_user_verified() {
         Err(Error::CardStatus(s)) => {
@@ -580,7 +580,7 @@ pub fn test_change_pw(mut card: Card<Open>, _param: &[&str]) -> Result<TestOutpu
     // ca.change_pw1("123456", "abcdef")?;
 
     println!("verify bad pw1");
-    match transaction.verify_user("123456ab") {
+    match transaction.verify_user_pin("123456ab") {
         Err(Error::CardStatus(StatusBytes::SecurityStatusNotSatisfied)) => {
             // this is expected
         }
@@ -591,10 +591,10 @@ pub fn test_change_pw(mut card: Card<Open>, _param: &[&str]) -> Result<TestOutpu
     }
 
     println!("verify good pw1");
-    transaction.verify_user("abcdef")?;
+    transaction.verify_user_pin("abcdef")?;
 
     println!("verify bad pw3");
-    match transaction.verify_admin("00000000") {
+    match transaction.verify_admin_pin("00000000") {
         Err(Error::CardStatus(StatusBytes::SecurityStatusNotSatisfied)) => {
             // this is expected
         }
@@ -605,7 +605,7 @@ pub fn test_change_pw(mut card: Card<Open>, _param: &[&str]) -> Result<TestOutpu
     }
 
     println!("verify good pw3");
-    transaction.verify_admin("abcdefgh")?;
+    transaction.verify_admin_pin("abcdefgh")?;
 
     println!("change pw3 back to default");
     transaction.change_admin_pin("abcdefgh", "12345678")?;
@@ -631,10 +631,10 @@ pub fn test_reset_retry_counter(
     transaction.change_user_pin("123456", "123456")?;
 
     println!("break pw1");
-    let _ = transaction.verify_user("wrong0");
-    let _ = transaction.verify_user("wrong0");
-    let _ = transaction.verify_user("wrong0");
-    let res = transaction.verify_user("wrong0");
+    let _ = transaction.verify_user_pin("wrong0");
+    let _ = transaction.verify_user_pin("wrong0");
+    let _ = transaction.verify_user_pin("wrong0");
+    let res = transaction.verify_user_pin("wrong0");
 
     match res {
         Err(Error::CardStatus(StatusBytes::AuthenticationMethodBlocked)) => {
@@ -653,7 +653,7 @@ pub fn test_reset_retry_counter(
     }
 
     println!("verify pw3");
-    transaction.verify_admin("12345678")?;
+    transaction.verify_admin_pin("12345678")?;
 
     println!("set resetting code");
     let mut admin = transaction.to_admin_card(None)?;
@@ -664,10 +664,10 @@ pub fn test_reset_retry_counter(
     let _res = transaction.reset_user_pin("abcdef", "abcdefgh");
 
     println!("verify good pw1");
-    transaction.verify_user("abcdef")?;
+    transaction.verify_user_pin("abcdef")?;
 
     println!("verify bad pw1");
-    match transaction.verify_user("00000000") {
+    match transaction.verify_user_pin("00000000") {
         Err(Error::CardStatus(StatusBytes::SecurityStatusNotSatisfied)) => {
             // this is expected
         }
diff --git a/openpgp-card-sequoia/examples/test.rs b/openpgp-card-sequoia/examples/test.rs
index 19b8f7f..2d3cdd4 100644
--- a/openpgp-card-sequoia/examples/test.rs
+++ b/openpgp-card-sequoia/examples/test.rs
@@ -93,7 +93,7 @@ fn main() -> Result<(), Box<dyn Error>> {
             println!("factory reset\n");
             transaction.factory_reset()?;
 
-            transaction.verify_admin("12345678")?;
+            transaction.verify_admin_pin("12345678")?;
             println!("verify for admin ok");
 
             let check = transaction.check_user_verified();
@@ -152,7 +152,7 @@ fn main() -> Result<(), Box<dyn Error>> {
             let check = transaction.check_user_verified();
             println!("has user (pw1/82) been verified yet?\n{check:x?}\n");
 
-            transaction.verify_user("123456")?;
+            transaction.verify_user_pin("123456")?;
             println!("verify for user (pw1/82) ok");
 
             let check = transaction.check_user_verified();
@@ -187,7 +187,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         let mut transaction = card.transaction()?;
 
         // Sign
-        transaction.verify_user_for_signing("123456")?;
+        transaction.verify_user_signing_pin("123456")?;
         println!("verify for sign (pw1/81) ok\n");
 
         // Use Sign access to card
diff --git a/openpgp-card-sequoia/src/lib.rs b/openpgp-card-sequoia/src/lib.rs
index 142e3bf..241899a 100644
--- a/openpgp-card-sequoia/src/lib.rs
+++ b/openpgp-card-sequoia/src/lib.rs
@@ -312,7 +312,7 @@ impl<'a> Card<Transaction<'a>> {
     }
 
     /// Verify the User PIN (for operations such as decryption)
-    pub fn verify_user(&mut self, pin: &str) -> Result<(), Error> {
+    pub fn verify_user_pin(&mut self, pin: &str) -> Result<(), Error> {
         self.state.opt.verify_pw1_user(pin.as_bytes())?;
         self.state.pw1 = true;
         Ok(())
@@ -333,7 +333,7 @@ impl<'a> Card<Transaction<'a>> {
     /// (Note that depending on the configuration of the card, this may enable
     /// performing just one signing operation, or an unlimited amount of
     /// signing operations).
-    pub fn verify_user_for_signing(&mut self, pin: &str) -> Result<(), Error> {
+    pub fn verify_user_signing_pin(&mut self, pin: &str) -> Result<(), Error> {
         self.state.opt.verify_pw1_sign(pin.as_bytes())?;
 
         // FIXME: depending on card mode, pw1_sign is only usable once
@@ -344,10 +344,7 @@ impl<'a> Card<Transaction<'a>> {
 
     /// Verify the User PIN for signing operations with a physical PIN pad
     /// (if available, see [`Self::feature_pinpad_verify`]).
-    pub fn verify_user_for_signing_pinpad(
-        &mut self,
-        pinpad_prompt: &dyn Fn(),
-    ) -> Result<(), Error> {
+    pub fn verify_user_signing_pinpad(&mut self, pinpad_prompt: &dyn Fn()) -> Result<(), Error> {
         pinpad_prompt();
 
         self.state.opt.verify_pw1_sign_pinpad()?;
@@ -359,7 +356,7 @@ impl<'a> Card<Transaction<'a>> {
     }
 
     /// Verify the Admin PIN.
-    pub fn verify_admin(&mut self, pin: &str) -> Result<(), Error> {
+    pub fn verify_admin_pin(&mut self, pin: &str) -> Result<(), Error> {
         self.state.opt.verify_pw3(pin.as_bytes())?;
         self.state.pw3 = true;
         Ok(())
@@ -433,7 +430,7 @@ impl<'a> Card<Transaction<'a>> {
         let pin: OptionalPin = pin.into();
 
         if let Some(pin) = pin.0 {
-            self.verify_user(String::from_utf8_lossy(pin).as_ref())?;
+            self.verify_user_pin(String::from_utf8_lossy(pin).as_ref())?;
         }
 
         Ok(Card::<User> {
@@ -452,7 +449,7 @@ impl<'a> Card<Transaction<'a>> {
         let pin: OptionalPin = pin.into();
 
         if let Some(pin) = pin.0 {
-            self.verify_user_for_signing(String::from_utf8_lossy(pin).as_ref())?;
+            self.verify_user_signing_pin(String::from_utf8_lossy(pin).as_ref())?;
         }
 
         Ok(Card::<Sign> {
@@ -471,7 +468,7 @@ impl<'a> Card<Transaction<'a>> {
         let pin: OptionalPin = pin.into();
 
         if let Some(pin) = pin.0 {
-            self.verify_admin(String::from_utf8_lossy(pin).as_ref())?;
+            self.verify_admin_pin(String::from_utf8_lossy(pin).as_ref())?;
         }
 
         Ok(Card::<Admin> {
diff --git a/openpgp-card-sequoia/src/util.rs b/openpgp-card-sequoia/src/util.rs
index 91ec37b..e62bff9 100644
--- a/openpgp-card-sequoia/src/util.rs
+++ b/openpgp-card-sequoia/src/util.rs
@@ -54,9 +54,9 @@ pub fn make_cert(
         |op: &mut dyn Fn(&mut dyn sequoia_openpgp::crypto::Signer) -> Result<Signature>| {
             // Allow signing on the card
             if let Some(pw1) = pw1 {
-                open.verify_user_for_signing(pw1)?;
+                open.verify_user_signing_pin(pw1)?;
             } else {
-                open.verify_user_for_signing_pinpad(pinpad_prompt)?;
+                open.verify_user_signing_pinpad(pinpad_prompt)?;
             }
             let mut sign = open.to_signing_card(None)?;