diff --git a/devtools/mkclose.c b/devtools/mkclose.c
index d04558a9c..3f0ebb5c1 100644
--- a/devtools/mkclose.c
+++ b/devtools/mkclose.c
@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
 
 	fee = commit_tx_base_fee(feerate_per_kw, 0,
 				 option_anchor_outputs);
-	/* BOLT-a12da24dd0102c170365124782b46d9710950ac1:
+	/* BOLT #3:
 	 * If `option_anchor_outputs` applies to the commitment
 	 * transaction, also subtract two times the fixed anchor size
 	 * of 330 sats from the funder (either `to_local` or
diff --git a/hsmd/hsmd.c b/hsmd/hsmd.c
index 58f812cff..9ea8079f1 100644
--- a/hsmd/hsmd.c
+++ b/hsmd/hsmd.c
@@ -1111,7 +1111,7 @@ static struct io_plan *handle_sign_remote_htlc_tx(struct io_conn *conn,
 		return bad_req_fmt(conn, c, msg_in,
 				   "Failed deriving htlc pubkey");
 
-	/* BOLT-a12da24dd0102c170365124782b46d9710950ac1 #3:
+	/* BOLT #3:
 	 * ## HTLC-Timeout and HTLC-Success Transactions
 	 *...
 	 * * if `option_anchor_outputs` applies to this commitment transaction,
@@ -1243,7 +1243,7 @@ static struct io_plan *handle_sign_remote_htlc_to_us(struct io_conn *conn,
 		return bad_req_fmt(conn, c, msg_in,
 				   "Failed deriving htlc privkey");
 
-	/* BOLT-a12da24dd0102c170365124782b46d9710950ac1 #3:
+	/* BOLT #3:
 	 * ## HTLC-Timeout and HTLC-Success Transactions
 	 *...
 	 * * if `option_anchor_outputs` applies to this commitment transaction,
@@ -1354,7 +1354,7 @@ static struct io_plan *handle_sign_local_htlc_tx(struct io_conn *conn,
 
 	/* FIXME: Check that output script is correct! */
 
-	/* BOLT-a12da24dd0102c170365124782b46d9710950ac1 #3:
+	/* BOLT #3:
 	 * ## HTLC-Timeout and HTLC-Success Transactions
 	 *...
 	 * * if `option_anchor_outputs` applies to this commitment transaction,
diff --git a/lightningd/opening_control.c b/lightningd/opening_control.c
index 8fba03fbc..3d26add0f 100644
--- a/lightningd/opening_control.c
+++ b/lightningd/opening_control.c
@@ -136,7 +136,7 @@ wallet_commit_channel(struct lightningd *ld,
 	/* old_remote_per_commit not valid yet, copy valid one. */
 	channel_info->old_remote_per_commit = channel_info->remote_per_commit;
 
-	/* BOLT-a12da24dd0102c170365124782b46d9710950ac1 #2:
+	/* BOLT #2:
 	 * 1. type: 35 (`funding_signed`)
 	 * 2. data:
 	 *     * [`channel_id`:`channel_id`]
diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c
index d07691c98..337754a59 100644
--- a/lightningd/peer_control.c
+++ b/lightningd/peer_control.c
@@ -573,7 +573,7 @@ static struct amount_sat commit_txfee(const struct channel *channel,
 	}
 
 	/*
-	 * BOLT-f5490f17d17ff49dc26ee459432b3c9db4fda8a9 #2:
+	 * BOLT #2:
 	 * A sending node:
 	 *...
 	 * - SHOULD NOT offer `amount_msat` if, after adding that HTLC to its
@@ -588,7 +588,7 @@ static struct amount_sat commit_txfee(const struct channel *channel,
 				 channel->option_anchor_outputs);
 
 	if (channel->option_anchor_outputs) {
-		/* BOLT-a12da24dd0102c170365124782b46d9710950ac1:
+		/* BOLT #3:
 		 * If `option_anchor_outputs` applies to the commitment
 		 * transaction, also subtract two times the fixed anchor size
 		 * of 330 sats from the funder (either `to_local` or
diff --git a/onchaind/onchaind.c b/onchaind/onchaind.c
index 5257e5779..1e1857fa0 100644
--- a/onchaind/onchaind.c
+++ b/onchaind/onchaind.c
@@ -512,7 +512,7 @@ static bool set_htlc_timeout_fee(struct bitcoin_tx *tx,
 	struct amount_asset asset = bitcoin_tx_output_get_amount(tx, 0);
 	size_t weight;
 
-	/* BOLT-a12da24dd0102c170365124782b46d9710950ac1 #3:
+	/* BOLT #3:
 	 *
 	 * The fee for an HTLC-timeout transaction:
 	 *  - MUST BE calculated to match:
@@ -559,7 +559,7 @@ static void set_htlc_success_fee(struct bitcoin_tx *tx,
 	struct amount_asset asset;
 	size_t weight;
 
-	/* BOLT-a12da24dd0102c170365124782b46d9710950ac1 #3:
+	/* BOLT #3:
 	 *
 	 * The fee for an HTLC-success transaction:
 	 * - MUST BE calculated to match:
@@ -2559,7 +2559,7 @@ static void get_anchor_scriptpubkeys(const tal_t *ctx, u8 **anchor)
 static u8 *scriptpubkey_to_remote(const tal_t *ctx,
 				  const struct pubkey *remotekey)
 {
-	/* BOLT-a12da24dd0102c170365124782b46d9710950ac1 #3:
+	/* BOLT #3:
 	 *
 	 * #### `to_remote` Output
 	 *
diff --git a/openingd/common.c b/openingd/common.c
index dd3fd87e3..6bc3dd534 100644
--- a/openingd/common.c
+++ b/openingd/common.c
@@ -62,7 +62,7 @@ bool check_config_bounds(const tal_t *ctx,
 		return false;
 	}
 
-	/* BOLT-a12da24dd0102c170365124782b46d9710950ac1 #2:
+	/* BOLT #2:
 	 *  - if `option_anchor_outputs` applies to this commitment
 	 *    transaction and the sending node is the funder:
 	 *   - MUST be able to additionally pay for `to_local_anchor` and
diff --git a/wallet/db_postgres_sqlgen.c b/wallet/db_postgres_sqlgen.c
index bf37ff7a8..c9e2f8126 100644
--- a/wallet/db_postgres_sqlgen.c
+++ b/wallet/db_postgres_sqlgen.c
@@ -1888,4 +1888,4 @@ struct db_query db_postgres_queries[] = {
 
 #endif /* LIGHTNINGD_WALLET_GEN_DB_POSTGRES */
 
-// SHA256STAMP:3744f07477049e8640c44c9d9d2ba90672e0cc5ca610b6e7cda7b593085a1f63
+// SHA256STAMP:4404a89dadab8225901d024fd293d4b47b57ed4c6b5e7f00cf1fc9df0c345d57
diff --git a/wallet/db_sqlite3_sqlgen.c b/wallet/db_sqlite3_sqlgen.c
index c30a603f4..256d3326b 100644
--- a/wallet/db_sqlite3_sqlgen.c
+++ b/wallet/db_sqlite3_sqlgen.c
@@ -1888,4 +1888,4 @@ struct db_query db_sqlite3_queries[] = {
 
 #endif /* LIGHTNINGD_WALLET_GEN_DB_SQLITE3 */
 
-// SHA256STAMP:3744f07477049e8640c44c9d9d2ba90672e0cc5ca610b6e7cda7b593085a1f63
+// SHA256STAMP:4404a89dadab8225901d024fd293d4b47b57ed4c6b5e7f00cf1fc9df0c345d57
diff --git a/wallet/reservation.c b/wallet/reservation.c
index 9f433e60b..6a445741f 100644
--- a/wallet/reservation.c
+++ b/wallet/reservation.c
@@ -268,10 +268,10 @@ static struct wally_psbt *psbt_using_utxos(const tal_t *ctx,
 			scriptPubkey = utxos[i]->scriptPubkey;
 		}
 
-		/* BOLT-a12da24dd0102c170365124782b46d9710950ac1 #3:
+		/* BOLT #3:
 		 * #### `to_remote` Output
 		 * ...
-		 * The output is spent by a transaction with `nSequence` field
+		 * The output is spent by an input with `nSequence` field
 		 * set to `1` and witness:
 		 */
 		if (utxos[i]->close_info
diff --git a/wallet/statements_gettextgen.po b/wallet/statements_gettextgen.po
index 38fc958b9..33769f9ba 100644
--- a/wallet/statements_gettextgen.po
+++ b/wallet/statements_gettextgen.po
@@ -1245,4 +1245,4 @@ msgstr ""
 #: wallet/test/run-wallet.c:1643
 msgid "INSERT INTO channels (id) VALUES (1);"
 msgstr ""
-#  SHA256STAMP:20d1dab0cbcccd97d272a24875a28c235580a45f422db8ae2c375dab07361a86
+#  SHA256STAMP:be8710aae042274c3b689ec333ee2d50d4116c3ea4d6b97338eaf88050137967
diff --git a/wallet/wallet.c b/wallet/wallet.c
index 33b689aa2..3818dfa11 100644
--- a/wallet/wallet.c
+++ b/wallet/wallet.c
@@ -846,7 +846,7 @@ wallet_htlc_sigs_load(const tal_t *ctx, struct wallet *w, u64 channelid,
 	while (db_step(stmt)) {
 		struct bitcoin_signature sig;
 		db_column_signature(stmt, 0, &sig.s);
-		/* BOLT-a12da24dd0102c170365124782b46d9710950ac1 #3:
+		/* BOLT #3:
 		 * ## HTLC-Timeout and HTLC-Success Transactions
 		 *...
 		 * * if `option_anchor_outputs` applies to this commitment