diff --git a/remote-wallet/src/wallet/keystone/error.rs b/remote-wallet/src/wallet/keystone/error.rs
index 09f993e3b3345b..4548cd1d001a6d 100644
--- a/remote-wallet/src/wallet/keystone/error.rs
+++ b/remote-wallet/src/wallet/keystone/error.rs
@@ -98,7 +98,7 @@ impl FromStr for KeystoneError {
             "previous request is not finished" | "previous request not finished" => {
                 Ok(KeystoneError::PreviousRequestNotFinished)
             }
-            "solana app not open on ledger device" | "no app response" => {
+            "solana app not open on keystone device" | "no app response" => {
                 Ok(KeystoneError::NoAppResponse)
             }
             "invalid json response" | "invalid json" => Ok(KeystoneError::InvalidJson),
diff --git a/remote-wallet/src/wallet/keystone/keystone.rs b/remote-wallet/src/wallet/keystone/keystone.rs
index d5d96e88443a04..1679bad985f5b4 100644
--- a/remote-wallet/src/wallet/keystone/keystone.rs
+++ b/remote-wallet/src/wallet/keystone/keystone.rs
@@ -45,7 +45,7 @@ const HID_TAG: u8 = 0xAA;
 const KEYSTONE_VID: u16 = 0x1209;
 /// Keystone product IDs
 const KEYSTONE_PID: u16 = 0x3001;
-const LEDGER_TRANSPORT_HEADER_LEN: usize = 5;
+const KEYSTONE_TRANSPORT_HEADER_LEN: usize = 5;
 
 const HID_PACKET_SIZE: usize = 64 + HID_PREFIX_ZERO;
 
@@ -106,7 +106,7 @@ impl CommandType {
     }
 }
 
-/// Ledger Wallet device
+/// Keystone Wallet device
 pub struct KeystoneWallet {
     pub transport: Box<dyn Transport>,
     pub pretty_path: String,
@@ -200,7 +200,7 @@ impl KeystoneWallet {
 
                 chunk[header..header + size].copy_from_slice(&data[offset..offset + size]);
             }
-            trace!("Ledger write {:?}", &hid_chunk[..]);
+            trace!("Keystone write {:?}", &hid_chunk[..]);
             let n = self.transport.write(&hid_chunk[..])?;
             if n < size + header {
                 return Err(RemoteWalletError::Protocol("Write data size mismatch"));
@@ -234,7 +234,7 @@ impl KeystoneWallet {
         loop {
             // Read HID packet
             let chunk = self.transport.read()?;
-            if chunk.len() < LEDGER_TRANSPORT_HEADER_LEN {
+            if chunk.len() < KEYSTONE_TRANSPORT_HEADER_LEN {
                 return Err(RemoteWalletError::Protocol("Invalid HID packet size"));
             }
 
@@ -651,7 +651,7 @@ fn extend_and_serialize_multiple(derivation_paths: &[&DerivationPath]) -> Vec<u8
     concat_derivation
 }
 
-/// Choose a Ledger wallet based on matching info fields
+/// Choose a Keystone wallet based on matching info fields
 pub fn get_keystone_from_info(
     info: RemoteWalletInfo,
     keypair_name: &str,