diff --git a/generated/models/channel_close_mutual_tx_json.go b/generated/models/channel_close_mutual_tx_json.go
index f3041ca9..ff52995d 100644
--- a/generated/models/channel_close_mutual_tx_json.go
+++ b/generated/models/channel_close_mutual_tx_json.go
@@ -25,7 +25,7 @@ type ChannelCloseMutualTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *ChannelCloseMutualTxJSON) Type() string {
-	return "ChannelCloseMutualTxJSON"
+	return "ChannelCloseMutualTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/channel_close_solo_tx_json.go b/generated/models/channel_close_solo_tx_json.go
index 48c3f77c..a014faf3 100644
--- a/generated/models/channel_close_solo_tx_json.go
+++ b/generated/models/channel_close_solo_tx_json.go
@@ -25,7 +25,7 @@ type ChannelCloseSoloTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *ChannelCloseSoloTxJSON) Type() string {
-	return "ChannelCloseSoloTxJSON"
+	return "ChannelCloseSoloTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/channel_create_tx_json.go b/generated/models/channel_create_tx_json.go
index 8ee62338..1030f794 100644
--- a/generated/models/channel_create_tx_json.go
+++ b/generated/models/channel_create_tx_json.go
@@ -25,7 +25,7 @@ type ChannelCreateTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *ChannelCreateTxJSON) Type() string {
-	return "ChannelCreateTxJSON"
+	return "ChannelCreateTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/channel_deposit_tx_json.go b/generated/models/channel_deposit_tx_json.go
index a8b40aa8..a3ba549e 100644
--- a/generated/models/channel_deposit_tx_json.go
+++ b/generated/models/channel_deposit_tx_json.go
@@ -25,7 +25,7 @@ type ChannelDepositTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *ChannelDepositTxJSON) Type() string {
-	return "ChannelDepositTxJSON"
+	return "ChannelDepositTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/channel_force_progress_tx_json.go b/generated/models/channel_force_progress_tx_json.go
index 2f7cd32d..86b322d2 100644
--- a/generated/models/channel_force_progress_tx_json.go
+++ b/generated/models/channel_force_progress_tx_json.go
@@ -25,7 +25,7 @@ type ChannelForceProgressTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *ChannelForceProgressTxJSON) Type() string {
-	return "ChannelForceProgressTxJSON"
+	return "ChannelForceProgressTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/channel_settle_tx_json.go b/generated/models/channel_settle_tx_json.go
index 9ee0e415..359cf67e 100644
--- a/generated/models/channel_settle_tx_json.go
+++ b/generated/models/channel_settle_tx_json.go
@@ -25,7 +25,7 @@ type ChannelSettleTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *ChannelSettleTxJSON) Type() string {
-	return "ChannelSettleTxJSON"
+	return "ChannelSettleTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/channel_sla_s_h_tx_json.go b/generated/models/channel_sla_s_h_tx_json.go
index b4e34edd..c446b0e4 100644
--- a/generated/models/channel_sla_s_h_tx_json.go
+++ b/generated/models/channel_sla_s_h_tx_json.go
@@ -25,7 +25,7 @@ type ChannelSLASHTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *ChannelSLASHTxJSON) Type() string {
-	return "ChannelSlashTxJSON"
+	return "ChannelSlashTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/channel_snapshot_solo_tx_json.go b/generated/models/channel_snapshot_solo_tx_json.go
index 6dbb4769..9e64c122 100644
--- a/generated/models/channel_snapshot_solo_tx_json.go
+++ b/generated/models/channel_snapshot_solo_tx_json.go
@@ -25,7 +25,7 @@ type ChannelSnapshotSoloTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *ChannelSnapshotSoloTxJSON) Type() string {
-	return "ChannelSnapshotSoloTxJSON"
+	return "ChannelSnapshotSoloTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/channel_withdrawal_tx_json.go b/generated/models/channel_withdrawal_tx_json.go
index db11b017..b57fefa8 100644
--- a/generated/models/channel_withdrawal_tx_json.go
+++ b/generated/models/channel_withdrawal_tx_json.go
@@ -25,7 +25,7 @@ type ChannelWithdrawalTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *ChannelWithdrawalTxJSON) Type() string {
-	return "ChannelWithdrawalTxJSON"
+	return "ChannelWithdrawalTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/contract_call_tx_json.go b/generated/models/contract_call_tx_json.go
index 121d6f9e..f54cb8f4 100644
--- a/generated/models/contract_call_tx_json.go
+++ b/generated/models/contract_call_tx_json.go
@@ -25,7 +25,7 @@ type ContractCallTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *ContractCallTxJSON) Type() string {
-	return "ContractCallTxJSON"
+	return "ContractCallTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/contract_create_tx_json.go b/generated/models/contract_create_tx_json.go
index 89b6ff19..27256502 100644
--- a/generated/models/contract_create_tx_json.go
+++ b/generated/models/contract_create_tx_json.go
@@ -25,7 +25,7 @@ type ContractCreateTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *ContractCreateTxJSON) Type() string {
-	return "ContractCreateTxJSON"
+	return "ContractCreateTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/error.go b/generated/models/error.go
index 1ca4fc4b..c2b8a818 100644
--- a/generated/models/error.go
+++ b/generated/models/error.go
@@ -62,3 +62,7 @@ func (m *Error) UnmarshalBinary(b []byte) error {
 	*m = res
 	return nil
 }
+
+func (m *Error) String() string {
+	return *m.Reason
+}
diff --git a/generated/models/generic_tx.go b/generated/models/generic_tx.go
index 94820b44..c8f59acc 100644
--- a/generated/models/generic_tx.go
+++ b/generated/models/generic_tx.go
@@ -106,77 +106,77 @@ func unmarshalGenericTx(data []byte, consumer runtime.Consumer) (GenericTx, erro
 
 	// The value of type is used to determine which type to create and unmarshal the data into
 	switch getType.Type {
-	case "ChannelCloseMutualTxJSON":
+	case "ChannelCloseMutualTxJSON", "ChannelCloseMutualTx":
 		var result ChannelCloseMutualTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "ChannelCloseSoloTxJSON":
+	case "ChannelCloseSoloTxJSON", "ChannelCloseSoloTx":
 		var result ChannelCloseSoloTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "ChannelCreateTxJSON":
+	case "ChannelCreateTxJSON", "ChannelCreateTx":
 		var result ChannelCreateTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "ChannelDepositTxJSON":
+	case "ChannelDepositTxJSON", "ChannelDepositTx":
 		var result ChannelDepositTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "ChannelForceProgressTxJSON":
+	case "ChannelForceProgressTxJSON", "ChannelForceProgressTx":
 		var result ChannelForceProgressTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "ChannelSettleTxJSON":
+	case "ChannelSettleTxJSON", "ChannelSettleTx":
 		var result ChannelSettleTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "ChannelSlashTxJSON":
+	case "ChannelSlashTxJSON", "ChannelSlashTx":
 		var result ChannelSLASHTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "ChannelSnapshotSoloTxJSON":
+	case "ChannelSnapshotSoloTxJSON", "ChannelSnapshotSoloTx":
 		var result ChannelSnapshotSoloTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "ChannelWithdrawalTxJSON":
+	case "ChannelWithdrawalTxJSON", "ChannelWithdrawalTx":
 		var result ChannelWithdrawalTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "ContractCallTxJSON":
+	case "ContractCallTxJSON", "ContractCallTx":
 		var result ContractCallTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "ContractCreateTxJSON":
+	case "ContractCreateTxJSON", "ContractCreateTx":
 		var result ContractCreateTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
@@ -190,70 +190,70 @@ func unmarshalGenericTx(data []byte, consumer runtime.Consumer) (GenericTx, erro
 		}
 		return &result, nil
 
-	case "NameClaimTxJSON":
+	case "NameClaimTxJSON", "NameClaimTx":
 		var result NameClaimTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "NamePreclaimTxJSON":
+	case "NamePreclaimTxJSON", "NamePreclaimTx":
 		var result NamePreclaimTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "NameRevokeTxJSON":
+	case "NameRevokeTxJSON", "NameRevokeTx":
 		var result NameRevokeTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "NameTransferTxJSON":
+	case "NameTransferTxJSON", "NameTransferTx":
 		var result NameTransferTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "NameUpdateTxJSON":
+	case "NameUpdateTxJSON", "NameUpdateTx":
 		var result NameUpdateTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "OracleExtendTxJSON":
+	case "OracleExtendTxJSON", "OracleExtendTx":
 		var result OracleExtendTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "OracleQueryTxJSON":
+	case "OracleQueryTxJSON", "OracleQueryTx":
 		var result OracleQueryTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "OracleRegisterTxJSON":
+	case "OracleRegisterTxJSON", "OracleRegisterTx":
 		var result OracleRegisterTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "OracleResponseTxJSON":
+	case "OracleResponseTxJSON", "OracleResponseTx":
 		var result OracleResponseTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
 		}
 		return &result, nil
 
-	case "SpendTxJSON":
+	case "SpendTxJSON", "SpendTx":
 		var result SpendTxJSON
 		if err := consumer.Consume(buf2, &result); err != nil {
 			return nil, err
diff --git a/generated/models/name_claim_tx_json.go b/generated/models/name_claim_tx_json.go
index 3f54cfef..512246ac 100644
--- a/generated/models/name_claim_tx_json.go
+++ b/generated/models/name_claim_tx_json.go
@@ -25,7 +25,7 @@ type NameClaimTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *NameClaimTxJSON) Type() string {
-	return "NameClaimTxJSON"
+	return "NameClaimTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/name_preclaim_tx_json.go b/generated/models/name_preclaim_tx_json.go
index 8b2d006c..56c735d6 100644
--- a/generated/models/name_preclaim_tx_json.go
+++ b/generated/models/name_preclaim_tx_json.go
@@ -25,7 +25,7 @@ type NamePreclaimTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *NamePreclaimTxJSON) Type() string {
-	return "NamePreclaimTxJSON"
+	return "NamePreclaimTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/name_revoke_tx_json.go b/generated/models/name_revoke_tx_json.go
index 0b3890b4..704e7857 100644
--- a/generated/models/name_revoke_tx_json.go
+++ b/generated/models/name_revoke_tx_json.go
@@ -25,7 +25,7 @@ type NameRevokeTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *NameRevokeTxJSON) Type() string {
-	return "NameRevokeTxJSON"
+	return "NameRevokeTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/name_transfer_tx_json.go b/generated/models/name_transfer_tx_json.go
index a9dd1372..027c1547 100644
--- a/generated/models/name_transfer_tx_json.go
+++ b/generated/models/name_transfer_tx_json.go
@@ -25,7 +25,7 @@ type NameTransferTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *NameTransferTxJSON) Type() string {
-	return "NameTransferTxJSON"
+	return "NameTransferTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/name_update_tx_json.go b/generated/models/name_update_tx_json.go
index 34d3a32f..3dfd1f38 100644
--- a/generated/models/name_update_tx_json.go
+++ b/generated/models/name_update_tx_json.go
@@ -25,7 +25,7 @@ type NameUpdateTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *NameUpdateTxJSON) Type() string {
-	return "NameUpdateTxJSON"
+	return "NameUpdateTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/oracle_extend_tx_json.go b/generated/models/oracle_extend_tx_json.go
index 0bf23ef0..8b25e8b4 100644
--- a/generated/models/oracle_extend_tx_json.go
+++ b/generated/models/oracle_extend_tx_json.go
@@ -25,7 +25,7 @@ type OracleExtendTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *OracleExtendTxJSON) Type() string {
-	return "OracleExtendTxJSON"
+	return "OracleExtendTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/oracle_query_tx_json.go b/generated/models/oracle_query_tx_json.go
index 921997a5..af378977 100644
--- a/generated/models/oracle_query_tx_json.go
+++ b/generated/models/oracle_query_tx_json.go
@@ -25,7 +25,7 @@ type OracleQueryTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *OracleQueryTxJSON) Type() string {
-	return "OracleQueryTxJSON"
+	return "OracleQueryTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/oracle_register_tx_json.go b/generated/models/oracle_register_tx_json.go
index 94a0a51a..c77809fc 100644
--- a/generated/models/oracle_register_tx_json.go
+++ b/generated/models/oracle_register_tx_json.go
@@ -25,7 +25,7 @@ type OracleRegisterTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *OracleRegisterTxJSON) Type() string {
-	return "OracleRegisterTxJSON"
+	return "OracleRegisterTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/oracle_response_tx_json.go b/generated/models/oracle_response_tx_json.go
index 5f0f1782..b50882b8 100644
--- a/generated/models/oracle_response_tx_json.go
+++ b/generated/models/oracle_response_tx_json.go
@@ -25,7 +25,7 @@ type OracleResponseTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *OracleResponseTxJSON) Type() string {
-	return "OracleResponseTxJSON"
+	return "OracleResponseTx"
 }
 
 // SetType sets the type of this subtype
diff --git a/generated/models/spend_tx_json.go b/generated/models/spend_tx_json.go
index 0ecd8c23..677e394b 100644
--- a/generated/models/spend_tx_json.go
+++ b/generated/models/spend_tx_json.go
@@ -25,7 +25,7 @@ type SpendTxJSON struct {
 
 // Type gets the type of this subtype
 func (m *SpendTxJSON) Type() string {
-	return "SpendTxJSON"
+	return "SpendTx"
 }
 
 // SetType sets the type of this subtype