diff --git a/channeld/channeld_wiregen.c b/channeld/channeld_wiregen.c
index 29f1acaa8..ef8aa1aed 100644
--- a/channeld/channeld_wiregen.c
+++ b/channeld/channeld_wiregen.c
@@ -1046,4 +1046,4 @@ bool fromwire_channeld_send_error_reply(const void *p)
 		return false;
 	return cursor != NULL;
 }
-// SHA256STAMP:e80e573f3b577ea36374e290de2917ec5ebcb61b213b85c2cdf687ba04f48769
+// SHA256STAMP:8b6491f5aa25f4c067f4aedff32620ddb8b39cc78f95c70cb2d0b5366026871a
diff --git a/channeld/channeld_wiregen.h b/channeld/channeld_wiregen.h
index a9a7199f2..6346058c6 100644
--- a/channeld/channeld_wiregen.h
+++ b/channeld/channeld_wiregen.h
@@ -213,4 +213,4 @@ bool fromwire_channeld_send_error_reply(const void *p);
 
 
 #endif /* LIGHTNING_CHANNELD_CHANNELD_WIREGEN_H */
-// SHA256STAMP:e80e573f3b577ea36374e290de2917ec5ebcb61b213b85c2cdf687ba04f48769
+// SHA256STAMP:8b6491f5aa25f4c067f4aedff32620ddb8b39cc78f95c70cb2d0b5366026871a
diff --git a/closingd/closingd_wiregen.c b/closingd/closingd_wiregen.c
index 5f61cb083..eabe04049 100644
--- a/closingd/closingd_wiregen.c
+++ b/closingd/closingd_wiregen.c
@@ -201,4 +201,4 @@ bool fromwire_closingd_complete(const void *p)
 		return false;
 	return cursor != NULL;
 }
-// SHA256STAMP:4c5c7cce1af5d1e90d298e286ca885d6153237aba8d52a427bda58d4d7094f3b
+// SHA256STAMP:196786d8f37f20c93162a33692b7caddc638a48d4ec15c1a9bc09bbec41da360
diff --git a/closingd/closingd_wiregen.h b/closingd/closingd_wiregen.h
index 673d48931..7423051a8 100644
--- a/closingd/closingd_wiregen.h
+++ b/closingd/closingd_wiregen.h
@@ -56,4 +56,4 @@ bool fromwire_closingd_complete(const void *p);
 
 
 #endif /* LIGHTNING_CLOSINGD_CLOSINGD_WIREGEN_H */
-// SHA256STAMP:4c5c7cce1af5d1e90d298e286ca885d6153237aba8d52a427bda58d4d7094f3b
+// SHA256STAMP:196786d8f37f20c93162a33692b7caddc638a48d4ec15c1a9bc09bbec41da360
diff --git a/common/peer_status_wiregen.c b/common/peer_status_wiregen.c
index 694f90418..52055bd72 100644
--- a/common/peer_status_wiregen.c
+++ b/common/peer_status_wiregen.c
@@ -80,4 +80,4 @@ bool fromwire_status_peer_error(const tal_t *ctx, const void *p, struct channel_
 	fromwire_u8_array(&cursor, &plen, *error_for_them, len);
 	return cursor != NULL;
 }
-// SHA256STAMP:3190167a077593b13e10bab07e02e8e9666ea73f136a2860eca9618e1771593f
+// SHA256STAMP:de3fc242012abe21984a0590cc604e83e52af8809e3ff357acc5e6f4d7d1d41d
diff --git a/common/peer_status_wiregen.h b/common/peer_status_wiregen.h
index 05ca3ea20..2dce5dc95 100644
--- a/common/peer_status_wiregen.h
+++ b/common/peer_status_wiregen.h
@@ -34,4 +34,4 @@ bool fromwire_status_peer_error(const tal_t *ctx, const void *p, struct channel_
 
 
 #endif /* LIGHTNING_COMMON_PEER_STATUS_WIREGEN_H */
-// SHA256STAMP:3190167a077593b13e10bab07e02e8e9666ea73f136a2860eca9618e1771593f
+// SHA256STAMP:de3fc242012abe21984a0590cc604e83e52af8809e3ff357acc5e6f4d7d1d41d
diff --git a/common/status_wiregen.c b/common/status_wiregen.c
index c89801e49..39864d0b3 100644
--- a/common/status_wiregen.c
+++ b/common/status_wiregen.c
@@ -191,4 +191,4 @@ bool fromwire_status_peer_billboard(const tal_t *ctx, const void *p, bool *perm,
  	*happenings = fromwire_wirestring(ctx, &cursor, &plen);
 	return cursor != NULL;
 }
-// SHA256STAMP:9d3b2dd6c7771732bc056bf348b3593534bbc3fc1dc0181867e60790cc087155
+// SHA256STAMP:67770c6a9a4205f10a455ea925afc2be4f853642b1e7ed70e3867221c64b7abc
diff --git a/common/status_wiregen.h b/common/status_wiregen.h
index 26bbde45d..854ca95fb 100644
--- a/common/status_wiregen.h
+++ b/common/status_wiregen.h
@@ -53,4 +53,4 @@ bool fromwire_status_peer_billboard(const tal_t *ctx, const void *p, bool *perm,
 
 
 #endif /* LIGHTNING_COMMON_STATUS_WIREGEN_H */
-// SHA256STAMP:9d3b2dd6c7771732bc056bf348b3593534bbc3fc1dc0181867e60790cc087155
+// SHA256STAMP:67770c6a9a4205f10a455ea925afc2be4f853642b1e7ed70e3867221c64b7abc
diff --git a/connectd/connectd_gossipd_wiregen.c b/connectd/connectd_gossipd_wiregen.c
index 6909340d2..7332fec6b 100644
--- a/connectd/connectd_gossipd_wiregen.c
+++ b/connectd/connectd_gossipd_wiregen.c
@@ -161,4 +161,4 @@ bool fromwire_gossipd_get_addrs_reply(const tal_t *ctx, const void *p, struct wi
 		fromwire_wireaddr(&cursor, &plen, *addrs + i);
 	return cursor != NULL;
 }
-// SHA256STAMP:7039ba295c9a73c166b91ae1f7e81207759463feb5b425471a5af1bd8d4f8485
+// SHA256STAMP:3843c1c89472b3084feca4bb6d0a39598f768d4c4ff866f8dc94169716b6fadd
diff --git a/connectd/connectd_gossipd_wiregen.h b/connectd/connectd_gossipd_wiregen.h
index a696f50d3..2bc0fb247 100644
--- a/connectd/connectd_gossipd_wiregen.h
+++ b/connectd/connectd_gossipd_wiregen.h
@@ -54,4 +54,4 @@ bool fromwire_gossipd_get_addrs_reply(const tal_t *ctx, const void *p, struct wi
 
 
 #endif /* LIGHTNING_CONNECTD_CONNECTD_GOSSIPD_WIREGEN_H */
-// SHA256STAMP:7039ba295c9a73c166b91ae1f7e81207759463feb5b425471a5af1bd8d4f8485
+// SHA256STAMP:3843c1c89472b3084feca4bb6d0a39598f768d4c4ff866f8dc94169716b6fadd
diff --git a/connectd/connectd_wiregen.c b/connectd/connectd_wiregen.c
index 62e6a007b..4e3f40f25 100644
--- a/connectd/connectd_wiregen.c
+++ b/connectd/connectd_wiregen.c
@@ -406,4 +406,4 @@ bool fromwire_connectd_dev_memleak_reply(const void *p, bool *leak)
  	*leak = fromwire_bool(&cursor, &plen);
 	return cursor != NULL;
 }
-// SHA256STAMP:f9c15e7c9b2eb072f2489fa3db3b993b2fd8cbed7d0d24d9b1ca200d04de8d3d
+// SHA256STAMP:f8dfca9dd140207a71bbc264cce4a86015529ec753f1a61a672800662ed7ee75
diff --git a/connectd/connectd_wiregen.h b/connectd/connectd_wiregen.h
index 021fbc046..2860e3e48 100644
--- a/connectd/connectd_wiregen.h
+++ b/connectd/connectd_wiregen.h
@@ -103,4 +103,4 @@ bool fromwire_connectd_dev_memleak_reply(const void *p, bool *leak);
 
 
 #endif /* LIGHTNING_CONNECTD_CONNECTD_WIREGEN_H */
-// SHA256STAMP:f9c15e7c9b2eb072f2489fa3db3b993b2fd8cbed7d0d24d9b1ca200d04de8d3d
+// SHA256STAMP:f8dfca9dd140207a71bbc264cce4a86015529ec753f1a61a672800662ed7ee75
diff --git a/gossipd/gossip_store_wiregen.c b/gossipd/gossip_store_wiregen.c
index f7ced7f6c..20bd9666a 100644
--- a/gossipd/gossip_store_wiregen.c
+++ b/gossipd/gossip_store_wiregen.c
@@ -187,4 +187,4 @@ bool fromwire_gossipd_local_add_channel_obs(const tal_t *ctx, const void *p, str
 	fromwire_u8_array(&cursor, &plen, *features, flen);
 	return cursor != NULL;
 }
-// SHA256STAMP:166d11ef9f76018daa2e05724c3a1a50d50667344bd4f0c7f093d57a66c408ba
+// SHA256STAMP:e57942b41cb479ca181f13cd0bf5cfc6dd4acbb3685618a9679af8ec546a3fcc
diff --git a/gossipd/gossip_store_wiregen.h b/gossipd/gossip_store_wiregen.h
index f6705eec9..8b7cda627 100644
--- a/gossipd/gossip_store_wiregen.h
+++ b/gossipd/gossip_store_wiregen.h
@@ -58,4 +58,4 @@ bool fromwire_gossipd_local_add_channel_obs(const tal_t *ctx, const void *p, str
 
 
 #endif /* LIGHTNING_GOSSIPD_GOSSIP_STORE_WIREGEN_H */
-// SHA256STAMP:166d11ef9f76018daa2e05724c3a1a50d50667344bd4f0c7f093d57a66c408ba
+// SHA256STAMP:e57942b41cb479ca181f13cd0bf5cfc6dd4acbb3685618a9679af8ec546a3fcc
diff --git a/gossipd/gossipd_peerd_wiregen.c b/gossipd/gossipd_peerd_wiregen.c
index dddd2fb91..fbf7182fd 100644
--- a/gossipd/gossipd_peerd_wiregen.c
+++ b/gossipd/gossipd_peerd_wiregen.c
@@ -187,4 +187,4 @@ bool fromwire_gossipd_local_channel_announcement(const tal_t *ctx, const void *p
 	fromwire_u8_array(&cursor, &plen, *cannount, len);
 	return cursor != NULL;
 }
-// SHA256STAMP:9d7f638f7e34c39ed06ea7150be7c1ae51f038da22d3e842160c5f472cfa40f0
+// SHA256STAMP:3ffcd3b7d7815b6fbeaadc1b3b7235190eb584284f47e46ab8518eac91fd71b5
diff --git a/gossipd/gossipd_peerd_wiregen.h b/gossipd/gossipd_peerd_wiregen.h
index 2e5b69be0..a6d9a090f 100644
--- a/gossipd/gossipd_peerd_wiregen.h
+++ b/gossipd/gossipd_peerd_wiregen.h
@@ -64,4 +64,4 @@ bool fromwire_gossipd_local_channel_announcement(const tal_t *ctx, const void *p
 
 
 #endif /* LIGHTNING_GOSSIPD_GOSSIPD_PEERD_WIREGEN_H */
-// SHA256STAMP:9d7f638f7e34c39ed06ea7150be7c1ae51f038da22d3e842160c5f472cfa40f0
+// SHA256STAMP:3ffcd3b7d7815b6fbeaadc1b3b7235190eb584284f47e46ab8518eac91fd71b5
diff --git a/gossipd/gossipd_wiregen.c b/gossipd/gossipd_wiregen.c
index 952d8beca..67e1b3287 100644
--- a/gossipd/gossipd_wiregen.c
+++ b/gossipd/gossipd_wiregen.c
@@ -1033,4 +1033,4 @@ bool fromwire_gossipd_send_onionmsg(const tal_t *ctx, const void *p, struct node
 	}
 	return cursor != NULL;
 }
-// SHA256STAMP:6ed2cbe23f1e0cda995d8b62631875aef762ee4e1cd7109188d855d23a1752d0
+// SHA256STAMP:1da012a28ad84883f18920e51c39a0af77f85e309e981f9ea8d158d0698f6a59
diff --git a/gossipd/gossipd_wiregen.h b/gossipd/gossipd_wiregen.h
index b131a9b76..5c85110f1 100644
--- a/gossipd/gossipd_wiregen.h
+++ b/gossipd/gossipd_wiregen.h
@@ -218,4 +218,4 @@ bool fromwire_gossipd_send_onionmsg(const tal_t *ctx, const void *p, struct node
 
 
 #endif /* LIGHTNING_GOSSIPD_GOSSIPD_WIREGEN_H */
-// SHA256STAMP:6ed2cbe23f1e0cda995d8b62631875aef762ee4e1cd7109188d855d23a1752d0
+// SHA256STAMP:1da012a28ad84883f18920e51c39a0af77f85e309e981f9ea8d158d0698f6a59
diff --git a/hsmd/hsmd_wiregen.c b/hsmd/hsmd_wiregen.c
index 8a0f5e07b..a664c0472 100644
--- a/hsmd/hsmd_wiregen.c
+++ b/hsmd/hsmd_wiregen.c
@@ -1278,4 +1278,4 @@ bool fromwire_hsmd_sign_bolt12_reply(const void *p, struct bip340sig *sig)
  	fromwire_bip340sig(&cursor, &plen, sig);
 	return cursor != NULL;
 }
-// SHA256STAMP:bba9aa92e35397eb79f9518bbc058ccac4b51c3e48039f29205703f8bc20111e
+// SHA256STAMP:b419989953cbf50796fc237b5d7e2043f96cb838a1356dbdb27943b341f611a8
diff --git a/hsmd/hsmd_wiregen.h b/hsmd/hsmd_wiregen.h
index a457e5bc1..a86a7da16 100644
--- a/hsmd/hsmd_wiregen.h
+++ b/hsmd/hsmd_wiregen.h
@@ -283,4 +283,4 @@ bool fromwire_hsmd_sign_bolt12_reply(const void *p, struct bip340sig *sig);
 
 
 #endif /* LIGHTNING_HSMD_HSMD_WIREGEN_H */
-// SHA256STAMP:bba9aa92e35397eb79f9518bbc058ccac4b51c3e48039f29205703f8bc20111e
+// SHA256STAMP:b419989953cbf50796fc237b5d7e2043f96cb838a1356dbdb27943b341f611a8
diff --git a/onchaind/onchaind_wiregen.c b/onchaind/onchaind_wiregen.c
index 608b682fa..155bffbcd 100644
--- a/onchaind/onchaind_wiregen.c
+++ b/onchaind/onchaind_wiregen.c
@@ -635,4 +635,4 @@ bool fromwire_onchaind_notify_coin_mvt(const void *p, struct chain_coin_mvt *mvt
  	fromwire_chain_coin_mvt(&cursor, &plen, mvt);
 	return cursor != NULL;
 }
-// SHA256STAMP:8e5cf0f64250387b58b21ed885599a9216a3d2f4aee8cf7b7901965c5a197250
+// SHA256STAMP:ef6140d74f021a554c055b0f9b6322334559e6c2059ea51abf1bda2bc90add41
diff --git a/onchaind/onchaind_wiregen.h b/onchaind/onchaind_wiregen.h
index 00a49dfaf..e557d6dc3 100644
--- a/onchaind/onchaind_wiregen.h
+++ b/onchaind/onchaind_wiregen.h
@@ -161,4 +161,4 @@ bool fromwire_onchaind_notify_coin_mvt(const void *p, struct chain_coin_mvt *mvt
 
 
 #endif /* LIGHTNING_ONCHAIND_ONCHAIND_WIREGEN_H */
-// SHA256STAMP:8e5cf0f64250387b58b21ed885599a9216a3d2f4aee8cf7b7901965c5a197250
+// SHA256STAMP:ef6140d74f021a554c055b0f9b6322334559e6c2059ea51abf1bda2bc90add41
diff --git a/openingd/dualopend_wiregen.c b/openingd/dualopend_wiregen.c
index 5ba1b9484..36653cc63 100644
--- a/openingd/dualopend_wiregen.c
+++ b/openingd/dualopend_wiregen.c
@@ -838,4 +838,4 @@ bool fromwire_dualopend_dev_memleak_reply(const void *p, bool *leak)
  	*leak = fromwire_bool(&cursor, &plen);
 	return cursor != NULL;
 }
-// SHA256STAMP:a98345c38c5c28d10d403397332690a49b630fe6b214bcad10162010efa97a7c
+// SHA256STAMP:466b562a93af757c8bea696934d22420f3626b43f1476012e44f7946d51b06ba
diff --git a/openingd/dualopend_wiregen.h b/openingd/dualopend_wiregen.h
index 579e5a529..ec2c70fc3 100644
--- a/openingd/dualopend_wiregen.h
+++ b/openingd/dualopend_wiregen.h
@@ -188,4 +188,4 @@ bool fromwire_dualopend_dev_memleak_reply(const void *p, bool *leak);
 
 
 #endif /* LIGHTNING_OPENINGD_DUALOPEND_WIREGEN_H */
-// SHA256STAMP:a98345c38c5c28d10d403397332690a49b630fe6b214bcad10162010efa97a7c
+// SHA256STAMP:466b562a93af757c8bea696934d22420f3626b43f1476012e44f7946d51b06ba
diff --git a/openingd/openingd_wiregen.c b/openingd/openingd_wiregen.c
index ea19e77fc..8ac045def 100644
--- a/openingd/openingd_wiregen.c
+++ b/openingd/openingd_wiregen.c
@@ -579,4 +579,4 @@ bool fromwire_openingd_dev_memleak_reply(const void *p, bool *leak)
  	*leak = fromwire_bool(&cursor, &plen);
 	return cursor != NULL;
 }
-// SHA256STAMP:4690dd9aa4d8d79f999f90336a18d7682bf7910227f3191af4f2efaaa3ec4f0a
+// SHA256STAMP:056c30b94922859252e3b4171c02c1986242c0ec1f71f78ea62c3a0b5d26a696
diff --git a/openingd/openingd_wiregen.h b/openingd/openingd_wiregen.h
index 6560a03e0..9fdf7f45e 100644
--- a/openingd/openingd_wiregen.h
+++ b/openingd/openingd_wiregen.h
@@ -121,4 +121,4 @@ bool fromwire_openingd_dev_memleak_reply(const void *p, bool *leak);
 
 
 #endif /* LIGHTNING_OPENINGD_OPENINGD_WIREGEN_H */
-// SHA256STAMP:4690dd9aa4d8d79f999f90336a18d7682bf7910227f3191af4f2efaaa3ec4f0a
+// SHA256STAMP:056c30b94922859252e3b4171c02c1986242c0ec1f71f78ea62c3a0b5d26a696
diff --git a/tools/generate-wire.py b/tools/generate-wire.py
index f546494a7..38c372d9c 100755
--- a/tools/generate-wire.py
+++ b/tools/generate-wire.py
@@ -524,7 +524,7 @@ class Master(object):
         stuff = {}
         stuff['top_comments'] = self.top_comments
         stuff['options'] = options
-        stuff['idem'] = re.sub(r'[^A-Z]+', '_', options.header_filename.upper())
+        stuff['idem'] = re.sub(r'[^A-Z0-9]+', '_', options.header_filename.upper())
         stuff['header_filename'] = options.header_filename
         stuff['includes'] = self.inclusions
         stuff['enum_sets'] = enum_sets
diff --git a/wire/common_wiregen.c b/wire/common_wiregen.c
index 29531a683..1020bf324 100644
--- a/wire/common_wiregen.c
+++ b/wire/common_wiregen.c
@@ -100,4 +100,4 @@ bool fromwire_custommsg_out(const tal_t *ctx, const void *p, u8 **msg)
 	fromwire_u8_array(&cursor, &plen, *msg, msg_len);
 	return cursor != NULL;
 }
-// SHA256STAMP:c32984d62bcfe143788726cdbc7f82290c83a566f0f58f9394f6b2298f819b9f
+// SHA256STAMP:c7bc8e19dcbad6f504b8dfb8e1f1d2bc49d86782ef8ba869413461fe5c77faec
diff --git a/wire/common_wiregen.h b/wire/common_wiregen.h
index 193a85e3d..9609b457d 100644
--- a/wire/common_wiregen.h
+++ b/wire/common_wiregen.h
@@ -41,4 +41,4 @@ bool fromwire_custommsg_out(const tal_t *ctx, const void *p, u8 **msg);
 
 
 #endif /* LIGHTNING_WIRE_COMMON_WIREGEN_H */
-// SHA256STAMP:c32984d62bcfe143788726cdbc7f82290c83a566f0f58f9394f6b2298f819b9f
+// SHA256STAMP:c7bc8e19dcbad6f504b8dfb8e1f1d2bc49d86782ef8ba869413461fe5c77faec