diff --git a/backend/coins/btc/transactions/transactions.go b/backend/coins/btc/transactions/transactions.go
index 3edade88e9..aa288c4f8d 100644
--- a/backend/coins/btc/transactions/transactions.go
+++ b/backend/coins/btc/transactions/transactions.go
@@ -316,7 +316,7 @@ func (transactions *Transactions) UpdateAddressHistory(scriptHashHex blockchain.
 	}
 }
 
-// getTransactionsCached requires transactions lock.
+// getTransactionCached requires transactions lock.
 func (transactions *Transactions) getTransactionCached(
 	dbTx DBTxInterface,
 	txHash chainhash.Hash,
diff --git a/backend/devices/bitbox02/keystore.go b/backend/devices/bitbox02/keystore.go
index 7bb35852d7..d533653a42 100644
--- a/backend/devices/bitbox02/keystore.go
+++ b/backend/devices/bitbox02/keystore.go
@@ -616,7 +616,7 @@ func (keystore *keystore) SignETHMessage(message []byte, keypath signing.Absolut
 	return signature, nil
 }
 
-// SignETHTypedData implements keystore.Keystore.
+// SignETHTypedMessage implements keystore.Keystore.
 func (keystore *keystore) SignETHTypedMessage(chainId uint64, data []byte, keypath signing.AbsoluteKeypath) ([]byte, error) {
 	signature, err := keystore.device.ETHSignTypedMessage(chainId, keypath.ToUInt32(), data)
 	if firmware.IsErrorAbort(err) {
diff --git a/backend/rates/history_test.go b/backend/rates/history_test.go
index 4da93ef702..1e83f31493 100644
--- a/backend/rates/history_test.go
+++ b/backend/rates/history_test.go
@@ -161,7 +161,7 @@ func TestHistoryEarliestLatest(t *testing.T) {
 	assert.Zero(t, updater.HistoryLatestTimestampFiat([]string{"foo", "btc"}, "USD"))
 }
 
-// TestLoadDumpUnusableDB ensures no panic when the RateUpdater.historyDB is unusable.
+// TestLoadDumpBucketUnusableDB ensures no panic when the RateUpdater.historyDB is unusable.
 func TestLoadDumpBucketUnusableDB(t *testing.T) {
 	updater := NewRateUpdater(nil, "/dev/null")
 	defer updater.Stop()