diff --git a/electrum/lnchan.py b/electrum/lnchan.py
index 92004f619..91e8c8513 100644
--- a/electrum/lnchan.py
+++ b/electrum/lnchan.py
@@ -476,7 +476,7 @@ class Channel(PrintError):
         sweeptxs = create_sweeptxs_for_their_just_revoked_ctx(self, ctx, per_commitment_secret, self.sweep_address)
         for prev_txid, tx in sweeptxs.items():
             if tx is not None:
-                self.lnwatcher.add_sweep_tx(outpoint, prev_txid, tx.to_dict())
+                self.lnwatcher.add_sweep_tx(outpoint, prev_txid, tx.as_dict())
 
     def receive_revocation(self, revocation) -> Tuple[int, int]:
         self.print_error("receive_revocation")
diff --git a/electrum/lnsweep.py b/electrum/lnsweep.py
index d27b40a5a..2b9563153 100644
--- a/electrum/lnsweep.py
+++ b/electrum/lnsweep.py
@@ -383,7 +383,7 @@ def create_sweeptx_their_ctx_htlc(ctx: Transaction, witness_script: bytes, sweep
     outvalue = val - fee
     if outvalue <= dust_threshold(): return None
     sweep_outputs = [TxOutput(TYPE_ADDRESS, sweep_address, outvalue)]
-    tx = Transaction.from_io(sweep_inputs, sweep_outputs, version=2, name=f'their_ctx_sweep_htlc_{bh2u(htlc.payment_hash)}', cltv_expiry=cltv_expiry)
+    tx = Transaction.from_io(sweep_inputs, sweep_outputs, version=2, name=f'their_ctx_sweep_htlc_{ctx.txid()[:8]}_{output_idx}', cltv_expiry=cltv_expiry)
 
     sig = bfh(tx.sign_txin(0, privkey))
     if not is_revocation: