diff --git a/lightningd/hsm/hsm_wire.csv b/lightningd/hsm/hsm_wire.csv
index 4ce802f46..5f646e584 100644
--- a/lightningd/hsm/hsm_wire.csv
+++ b/lightningd/hsm/hsm_wire.csv
@@ -7,7 +7,7 @@ hsmstatus_key_failed,0x8004
 
 # Clients should not give a bad request but not the HSM's decision to crash.
 hsmstatus_client_bad_request,1000
-hsmstatus_client_bad_request,0,unique-id,8
+hsmstatus_client_bad_request,0,unique_id,8
 hsmstatus_client_bad_request,8,len,2
 hsmstatus_client_bad_request,10,msg,len*u8
 
diff --git a/tools/generate-wire.py b/tools/generate-wire.py
index 812dc0479..56d74130f 100755
--- a/tools/generate-wire.py
+++ b/tools/generate-wire.py
@@ -100,7 +100,7 @@ class Field(object):
     def __init__(self, message, name, size, comments, prevname):
         self.message = message
         self.comments = comments
-        self.name = name.replace('-', '_')
+        self.name = name
         self.is_len_var = False
         self.lenvar = None
         self.num_elems = 1
@@ -109,14 +109,14 @@ class Field(object):
         if '*' in size:
             number = size.split('*')[0]
             if number == prevname:
-                self.lenvar = number.replace('-','_');
+                self.lenvar = number
             else:
                 self.num_elems = int(number)
             size = size.split('*')[1]
         else:
             if size == prevname:
                 # Raw length field, implies u8.
-                self.lenvar = size.replace('-','_')
+                self.lenvar = size
                 size = 'u8'
 
         try:
diff --git a/wire/gen_onion_wire_csv b/wire/gen_onion_wire_csv
index f885adaf2..5c6cf4e26 100644
--- a/wire/gen_onion_wire_csv
+++ b/wire/gen_onion_wire_csv
@@ -4,11 +4,11 @@ temporary_node_failure,NODE|2
 permanent_node_failure,PERM|NODE|2
 required_node_feature_missing,PERM|NODE|3
 invalid_onion_version,BADONION|PERM|4
-invalid_onion_version,0,sha256-of-onion,32
+invalid_onion_version,0,sha256_of_onion,32
 invalid_onion_hmac,BADONION|PERM|5
-invalid_onion_hmac,0,sha256-of-onion,32
+invalid_onion_hmac,0,sha256_of_onion,32
 invalid_onion_key,BADONION|PERM|6
-invalid_onion_key,0,sha256-of-onion,32
+invalid_onion_key,0,sha256_of_onion,32
 temporary_channel_failure,7
 temporary_channel_failure,0,len,2
 temporary_channel_failure,2,channel_update,len
@@ -16,15 +16,15 @@ permanent_channel_failure,PERM|8
 required_channel_feature_missing,PERM|9
 unknown_next_peer,PERM|10
 amount_below_minimum,UPDATE|11
-amount_below_minimum,0,htlc-msat,4
+amount_below_minimum,0,htlc_msat,4
 amount_below_minimum,4,len,2
 amount_below_minimum,6,channel_update,len
 fee_insufficient,UPDATE|12
-fee_insufficient,0,htlc-msat,4
+fee_insufficient,0,htlc_msat,4
 fee_insufficient,4,len,2
 fee_insufficient,6,channel_update,len
 incorrect_cltv_expiry,UPDATE|13
-incorrect_cltv_expiry,0,cltv-expiry,4
+incorrect_cltv_expiry,0,cltv_expiry,4
 incorrect_cltv_expiry,4,len,2
 incorrect_cltv_expiry,6,channel_update,len
 expiry_too_soon,UPDATE|14
@@ -34,6 +34,6 @@ unknown_payment_hash,PERM|15
 incorrect_payment_amount,PERM|16
 final_expiry_too_soon,17
 final_incorrect_cltv_expiry,18
-final_incorrect_cltv_expiry,0,cltv-expiry,4
+final_incorrect_cltv_expiry,0,cltv_expiry,4
 final_incorrect_htlc_amount,19
-final_incorrect_htlc_amount,0,incoming-htlc-amt,4
+final_incorrect_htlc_amount,0,incoming_htlc_amt,4
diff --git a/wire/gen_peer_wire_csv b/wire/gen_peer_wire_csv
index 40cad4f84..c6839990e 100644
--- a/wire/gen_peer_wire_csv
+++ b/wire/gen_peer_wire_csv
@@ -4,7 +4,7 @@ init,2,globalfeatures,gflen
 init,2+gflen,lflen,2
 init,4+gflen,localfeatures,lflen
 error,17
-error,0,channel-id,32
+error,0,channel_id,32
 error,32,len,2
 error,34,data,len
 ping,18
@@ -15,110 +15,110 @@ pong,19
 pong,0,byteslen,2
 pong,2,ignored,byteslen
 open_channel,32
-open_channel,0,chain-hash,32
-open_channel,32,temporary-channel-id,32
-open_channel,64,funding-satoshis,8
-open_channel,72,push-msat,8
-open_channel,80,dust-limit-satoshis,8
-open_channel,88,max-htlc-value-in-flight-msat,8
-open_channel,96,channel-reserve-satoshis,8
-open_channel,104,htlc-minimum-msat,4
-open_channel,108,feerate-per-kw,4
-open_channel,112,to-self-delay,2
-open_channel,114,max-accepted-htlcs,2
-open_channel,116,funding-pubkey,33
-open_channel,149,revocation-basepoint,33
-open_channel,182,payment-basepoint,33
-open_channel,215,delayed-payment-basepoint,33
-open_channel,248,first-per-commitment-point,33
+open_channel,0,chain_hash,32
+open_channel,32,temporary_channel_id,32
+open_channel,64,funding_satoshis,8
+open_channel,72,push_msat,8
+open_channel,80,dust_limit_satoshis,8
+open_channel,88,max_htlc_value_in_flight_msat,8
+open_channel,96,channel_reserve_satoshis,8
+open_channel,104,htlc_minimum_msat,4
+open_channel,108,feerate_per_kw,4
+open_channel,112,to_self_delay,2
+open_channel,114,max_accepted_htlcs,2
+open_channel,116,funding_pubkey,33
+open_channel,149,revocation_basepoint,33
+open_channel,182,payment_basepoint,33
+open_channel,215,delayed_payment_basepoint,33
+open_channel,248,first_per_commitment_point,33
 accept_channel,33
-accept_channel,0,temporary-channel-id,32
-accept_channel,32,dust-limit-satoshis,8
-accept_channel,40,max-htlc-value-in-flight-msat,8
-accept_channel,48,channel-reserve-satoshis,8
-accept_channel,56,minimum-depth,4
-accept_channel,60,htlc-minimum-msat,4
-accept_channel,64,to-self-delay,2
-accept_channel,66,max-accepted-htlcs,2
-accept_channel,68,funding-pubkey,33
-accept_channel,101,revocation-basepoint,33
-accept_channel,134,payment-basepoint,33
-accept_channel,167,delayed-payment-basepoint,33
-accept_channel,200,first-per-commitment-point,33
+accept_channel,0,temporary_channel_id,32
+accept_channel,32,dust_limit_satoshis,8
+accept_channel,40,max_htlc_value_in_flight_msat,8
+accept_channel,48,channel_reserve_satoshis,8
+accept_channel,56,minimum_depth,4
+accept_channel,60,htlc_minimum_msat,4
+accept_channel,64,to_self_delay,2
+accept_channel,66,max_accepted_htlcs,2
+accept_channel,68,funding_pubkey,33
+accept_channel,101,revocation_basepoint,33
+accept_channel,134,payment_basepoint,33
+accept_channel,167,delayed_payment_basepoint,33
+accept_channel,200,first_per_commitment_point,33
 funding_created,34
-funding_created,0,temporary-channel-id,32
-funding_created,32,funding-txid,32
-funding_created,64,funding-output-index,2
+funding_created,0,temporary_channel_id,32
+funding_created,32,funding_txid,32
+funding_created,64,funding_output_index,2
 funding_created,66,signature,64
 funding_signed,35
-funding_signed,0,channel-id,32
+funding_signed,0,channel_id,32
 funding_signed,32,signature,64
 funding_locked,36
-funding_locked,0,channel-id,32
-funding_locked,32,next-per-commitment-point,33
+funding_locked,0,channel_id,32
+funding_locked,32,next_per_commitment_point,33
 shutdown,38
-shutdown,0,channel-id,32
+shutdown,0,channel_id,32
 shutdown,32,len,2
 shutdown,34,scriptpubkey,len
 closing_signed,39
-closing_signed,0,channel-id,32
-closing_signed,32,fee-satoshis,8
+closing_signed,0,channel_id,32
+closing_signed,32,fee_satoshis,8
 closing_signed,40,signature,64
 update_add_htlc,128
-update_add_htlc,0,channel-id,32
+update_add_htlc,0,channel_id,32
 update_add_htlc,32,id,8
-update_add_htlc,40,amount-msat,4
-update_add_htlc,44,cltv-expiry,4
-update_add_htlc,48,payment-hash,32
-update_add_htlc,80,onion-routing-packet,1366
+update_add_htlc,40,amount_msat,4
+update_add_htlc,44,cltv_expiry,4
+update_add_htlc,48,payment_hash,32
+update_add_htlc,80,onion_routing_packet,1366
 update_fulfill_htlc,130
-update_fulfill_htlc,0,channel-id,32
+update_fulfill_htlc,0,channel_id,32
 update_fulfill_htlc,32,id,8
-update_fulfill_htlc,40,payment-preimage,32
+update_fulfill_htlc,40,payment_preimage,32
 update_fail_htlc,131
-update_fail_htlc,0,channel-id,32
+update_fail_htlc,0,channel_id,32
 update_fail_htlc,32,id,8
 update_fail_htlc,40,len,2
 update_fail_htlc,42,reason,len
 update_fail_malformed_htlc,135
-update_fail_malformed_htlc,0,channel-id,32
+update_fail_malformed_htlc,0,channel_id,32
 update_fail_malformed_htlc,32,id,8
-update_fail_malformed_htlc,40,sha256-of-onion,32
-update_fail_malformed_htlc,72,failure-code,2
+update_fail_malformed_htlc,40,sha256_of_onion,32
+update_fail_malformed_htlc,72,failure_code,2
 commitment_signed,132
-commitment_signed,0,channel-id,32
+commitment_signed,0,channel_id,32
 commitment_signed,32,signature,64
-commitment_signed,96,num-htlcs,2
-commitment_signed,98,htlc-signature,num-htlcs*64
+commitment_signed,96,num_htlcs,2
+commitment_signed,98,htlc_signature,num_htlcs*64
 revoke_and_ack,133
-revoke_and_ack,0,channel-id,32
-revoke_and_ack,32,per-commitment-secret,32
-revoke_and_ack,64,next-per-commitment-point,33
+revoke_and_ack,0,channel_id,32
+revoke_and_ack,32,per_commitment_secret,32
+revoke_and_ack,64,next_per_commitment_point,33
 update_fee,134
-update_fee,0,channel-id,32
-update_fee,32,feerate-per-kw,4
+update_fee,0,channel_id,32
+update_fee,32,feerate_per_kw,4
 announcement_signatures,259
-announcement_signatures,0,channel-id,32
-announcement_signatures,32,short-channel-id,8
-announcement_signatures,40,node-signature,64
-announcement_signatures,104,bitcoin-signature,64
+announcement_signatures,0,channel_id,32
+announcement_signatures,32,short_channel_id,8
+announcement_signatures,40,node_signature,64
+announcement_signatures,104,bitcoin_signature,64
 channel_announcement,256
-channel_announcement,0,node-signature-1,64
-channel_announcement,64,node-signature-2,64
-channel_announcement,128,bitcoin-signature-1,64
-channel_announcement,192,bitcoin-signature-2,64
-channel_announcement,256,short-channel-id,8
-channel_announcement,264,node-id-1,33
-channel_announcement,297,node-id-2,33
-channel_announcement,330,bitcoin-key-1,33
-channel_announcement,363,bitcoin-key-2,33
+channel_announcement,0,node_signature_1,64
+channel_announcement,64,node_signature_2,64
+channel_announcement,128,bitcoin_signature_1,64
+channel_announcement,192,bitcoin_signature_2,64
+channel_announcement,256,short_channel_id,8
+channel_announcement,264,node_id_1,33
+channel_announcement,297,node_id_2,33
+channel_announcement,330,bitcoin_key_1,33
+channel_announcement,363,bitcoin_key_2,33
 channel_announcement,396,len,2
 channel_announcement,398,features,len
 node_announcement,257
 node_announcement,0,signature,64
 node_announcement,64,timestamp,4
-node_announcement,68,node-id,33
-node_announcement,101,rgb-color,3
+node_announcement,68,node_id,33
+node_announcement,101,rgb_color,3
 node_announcement,104,alias,32
 node_announcement,136,flen,2
 node_announcement,138,features,flen
@@ -126,10 +126,10 @@ node_announcement,138+flen,addrlen,2
 node_announcement,140+flen,addresses,addrlen
 channel_update,258
 channel_update,0,signature,64
-channel_update,64,short-channel-id,8
+channel_update,64,short_channel_id,8
 channel_update,72,timestamp,4
 channel_update,76,flags,2
-channel_update,78,cltv-expiry-delta,2
-channel_update,80,htlc-minimum-msat,4
-channel_update,84,fee-base-msat,4
-channel_update,88,fee-proportional-millionths,4
+channel_update,78,cltv_expiry_delta,2
+channel_update,80,htlc_minimum_msat,4
+channel_update,84,fee_base_msat,4
+channel_update,88,fee_proportional_millionths,4