diff --git a/protob/messages-cardano.proto b/protob/messages-cardano.proto
index 8962210f43..11510d0c5b 100644
--- a/protob/messages-cardano.proto
+++ b/protob/messages-cardano.proto
@@ -34,6 +34,7 @@ message CardanoAddress {
  */
 message CardanoGetPublicKey {
     repeated uint32 address_n = 1;  // BIP-32 path to derive the key from master node
+    optional bool show_display = 2; // optionally show on display before sending the result
 }
 
 /**
@@ -81,11 +82,11 @@ message CardanoVerifyMessage {
 /**
  * Request: Ask device to sign Cardano transaction
  * @start
- * @next CardanoSignedTransaction
+ * @next CardanoSignedTx
  * @next CardanoTxRequest
  * @next Failure
  */
-message CardanoSignTransaction {
+message CardanoSignTx {
     repeated CardanoTxInputType inputs = 1;     // inputs to be used in transaction
     repeated CardanoTxOutputType outputs = 2;   // outputs to be used in transaction
     optional uint32 transactions_count = 3;     // transactions count
@@ -121,7 +122,7 @@ message CardanoTxRequest {
 
 /**
  * Request: Reported transaction data
- * @next CardanoSignedTransaction
+ * @next CardanoSignedTx
  * @next CardanoTxRequest
  */
 message CardanoTxAck {
@@ -132,7 +133,7 @@ message CardanoTxAck {
  * Response: Serialised signed cardano transaction
  * @end
  */
-message CardanoSignedTransaction {
+message CardanoSignedTx {
     optional bytes tx_hash = 1; // hash of the signed transaction
     optional bytes tx_body = 2; // serialised body of the signed transaction
 }
diff --git a/protob/messages-stellar.proto b/protob/messages-stellar.proto
index b23e25ab0e..c8229c7c0c 100644
--- a/protob/messages-stellar.proto
+++ b/protob/messages-stellar.proto
@@ -33,24 +33,6 @@ message StellarAddress {
     optional string address = 1;    // Address in Stellar format (base32 of a pubkey with checksum)
 }
 
-/**
- * Request: Public key at the specified index
- * @start
- * @next StellarPublicKey
- */
-message StellarGetPublicKey {
-    repeated uint32 address_n = 1;  // BIP-32 path. For compatibility with other wallets, must be m/44'/148'/index'
-    optional bool show_display = 2; // optionally show on display before sending the result
-}
-
-/**
- * Response: Public key for the given index
- * @end
- */
-message StellarPublicKey {
-    optional bytes public_key = 1;  // Raw bytes of the public key (no version or checksum)
-}
-
 /**
  * Request: ask device to sign Stellar transaction
  * @start
diff --git a/protob/messages.proto b/protob/messages.proto
index d93efb02c2..c331b114bf 100644
--- a/protob/messages.proto
+++ b/protob/messages.proto
@@ -141,8 +141,6 @@ enum MessageType {
     MessageType_TezosPublicKey = 155 [(wire_out) = true];
 
     // Stellar
-    MessageType_StellarGetPublicKey = 200 [(wire_in) = true];
-    MessageType_StellarPublicKey = 201 [(wire_out) = true];
     MessageType_StellarSignTx = 202 [(wire_in) = true];
     MessageType_StellarTxOpRequest = 203 [(wire_out) = true];
     MessageType_StellarGetAddress = 207 [(wire_in) = true];
@@ -165,14 +163,14 @@ enum MessageType {
     MessageType_CardanoSignMessage = 300 [(wire_in) = true];
     MessageType_CardanoMessageSignature = 301 [(wire_out) = true];
     MessageType_CardanoVerifyMessage = 302 [(wire_in) = true];
-    MessageType_CardanoSignTransaction = 303 [(wire_in) = true];
+    MessageType_CardanoSignTx = 303 [(wire_in) = true];
     MessageType_CardanoTxRequest = 304 [(wire_out) = true];
     MessageType_CardanoGetPublicKey = 305 [(wire_in) = true];
     MessageType_CardanoPublicKey = 306 [(wire_out) = true];
     MessageType_CardanoGetAddress = 307 [(wire_in) = true];
     MessageType_CardanoAddress = 308 [(wire_out) = true];
     MessageType_CardanoTxAck = 309 [(wire_in) = true];
-    MessageType_CardanoSignedTransaction = 310 [(wire_out) = true];
+    MessageType_CardanoSignedTx = 310 [(wire_out) = true];
 
     // Ontology
     MessageType_OntologyGetAddress = 350 [(wire_in) = true];