diff --git a/cmd/gobl/testdata/Test_build_do_not_envelop b/cmd/gobl/testdata/Test_build_do_not_envelop
index 9057ec4..f998d89 100644
--- a/cmd/gobl/testdata/Test_build_do_not_envelop
+++ b/cmd/gobl/testdata/Test_build_do_not_envelop
@@ -6,11 +6,11 @@
 	"currency": "EUR",
 	"issue_date": "2021-06-16",
 	"supplier": {
+		"name": "A Company Name S.L.",
 		"tax_id": {
 			"country": "ES",
 			"code": "B91983379"
 		},
-		"name": "A Company Name S.L.",
 		"people": [
 			{
 				"name": {
@@ -43,11 +43,11 @@
 		]
 	},
 	"customer": {
+		"name": "Autofiscal S.L.",
 		"tax_id": {
 			"country": "ES",
 			"code": "B85905495"
 		},
-		"name": "Autofiscal S.L.",
 		"addresses": [
 			{
 				"num": "1629",
diff --git a/cmd/gobl/testdata/Test_build_envelop b/cmd/gobl/testdata/Test_build_envelop
index 6014ffd..91958f0 100644
--- a/cmd/gobl/testdata/Test_build_envelop
+++ b/cmd/gobl/testdata/Test_build_envelop
@@ -16,11 +16,11 @@
 		"currency": "EUR",
 		"issue_date": "2021-06-16",
 		"supplier": {
+			"name": "A Company Name S.L.",
 			"tax_id": {
 				"country": "ES",
 				"code": "B91983379"
 			},
-			"name": "A Company Name S.L.",
 			"people": [
 				{
 					"name": {
@@ -53,11 +53,11 @@
 			]
 		},
 		"customer": {
+			"name": "Autofiscal S.L.",
 			"tax_id": {
 				"country": "ES",
 				"code": "B85905495"
 			},
-			"name": "Autofiscal S.L.",
 			"addresses": [
 				{
 					"num": "1629",
diff --git a/cmd/gobl/testdata/Test_build_explicit_stdout b/cmd/gobl/testdata/Test_build_explicit_stdout
index e70f9ed..3168676 100644
--- a/cmd/gobl/testdata/Test_build_explicit_stdout
+++ b/cmd/gobl/testdata/Test_build_explicit_stdout
@@ -14,11 +14,11 @@
 		"currency": "EUR",
 		"issue_date": "2022-02-01",
 		"supplier": {
+			"name": "MªF. Services",
 			"tax_id": {
 				"country": "ES",
 				"code": "58384285G"
 			},
-			"name": "MªF. Services",
 			"people": [
 				{
 					"name": {
@@ -45,11 +45,11 @@
 			]
 		},
 		"customer": {
+			"name": "Sample Consumer",
 			"tax_id": {
 				"country": "ES",
 				"code": "54387763P"
-			},
-			"name": "Sample Consumer"
+			}
 		},
 		"lines": [
 			{
diff --git a/cmd/gobl/testdata/Test_build_input_file b/cmd/gobl/testdata/Test_build_input_file
index e70f9ed..3168676 100644
--- a/cmd/gobl/testdata/Test_build_input_file
+++ b/cmd/gobl/testdata/Test_build_input_file
@@ -14,11 +14,11 @@
 		"currency": "EUR",
 		"issue_date": "2022-02-01",
 		"supplier": {
+			"name": "MªF. Services",
 			"tax_id": {
 				"country": "ES",
 				"code": "58384285G"
 			},
-			"name": "MªF. Services",
 			"people": [
 				{
 					"name": {
@@ -45,11 +45,11 @@
 			]
 		},
 		"customer": {
+			"name": "Sample Consumer",
 			"tax_id": {
 				"country": "ES",
 				"code": "54387763P"
-			},
-			"name": "Sample Consumer"
+			}
 		},
 		"lines": [
 			{
diff --git a/cmd/gobl/testdata/Test_build_merge_values b/cmd/gobl/testdata/Test_build_merge_values
index 9c0a129..1bfdac6 100644
--- a/cmd/gobl/testdata/Test_build_merge_values
+++ b/cmd/gobl/testdata/Test_build_merge_values
@@ -14,11 +14,11 @@
 		"currency": "MXN",
 		"issue_date": "2022-02-01",
 		"supplier": {
+			"name": "MªF. Services",
 			"tax_id": {
 				"country": "ES",
 				"code": "58384285G"
 			},
-			"name": "MªF. Services",
 			"people": [
 				{
 					"name": {
@@ -45,11 +45,11 @@
 			]
 		},
 		"customer": {
+			"name": "Sample Consumer",
 			"tax_id": {
 				"country": "ES",
 				"code": "54387763P"
-			},
-			"name": "Sample Consumer"
+			}
 		},
 		"lines": [
 			{
diff --git a/cmd/gobl/testdata/Test_build_output_file_outfile b/cmd/gobl/testdata/Test_build_output_file_outfile
index e70f9ed..3168676 100644
--- a/cmd/gobl/testdata/Test_build_output_file_outfile
+++ b/cmd/gobl/testdata/Test_build_output_file_outfile
@@ -14,11 +14,11 @@
 		"currency": "EUR",
 		"issue_date": "2022-02-01",
 		"supplier": {
+			"name": "MªF. Services",
 			"tax_id": {
 				"country": "ES",
 				"code": "58384285G"
 			},
-			"name": "MªF. Services",
 			"people": [
 				{
 					"name": {
@@ -45,11 +45,11 @@
 			]
 		},
 		"customer": {
+			"name": "Sample Consumer",
 			"tax_id": {
 				"country": "ES",
 				"code": "54387763P"
-			},
-			"name": "Sample Consumer"
+			}
 		},
 		"lines": [
 			{
diff --git a/cmd/gobl/testdata/Test_build_overwrite_input_file_outfile b/cmd/gobl/testdata/Test_build_overwrite_input_file_outfile
index bbbc560..a5801b0 100644
--- a/cmd/gobl/testdata/Test_build_overwrite_input_file_outfile
+++ b/cmd/gobl/testdata/Test_build_overwrite_input_file_outfile
@@ -15,11 +15,11 @@
 		"currency": "EUR",
 		"issue_date": "2021-06-16",
 		"supplier": {
+			"name": "A Company Name S.L.",
 			"tax_id": {
 				"country": "ES",
 				"code": "B91983379"
 			},
-			"name": "A Company Name S.L.",
 			"people": [
 				{
 					"name": {
@@ -52,11 +52,11 @@
 			]
 		},
 		"customer": {
+			"name": "Autofiscal S.L.",
 			"tax_id": {
 				"country": "ES",
 				"code": "B85905495"
 			},
-			"name": "Autofiscal S.L.",
 			"addresses": [
 				{
 					"num": "1629",
diff --git a/cmd/gobl/testdata/Test_build_overwrite_output_file_outfile b/cmd/gobl/testdata/Test_build_overwrite_output_file_outfile
index e70f9ed..3168676 100644
--- a/cmd/gobl/testdata/Test_build_overwrite_output_file_outfile
+++ b/cmd/gobl/testdata/Test_build_overwrite_output_file_outfile
@@ -14,11 +14,11 @@
 		"currency": "EUR",
 		"issue_date": "2022-02-01",
 		"supplier": {
+			"name": "MªF. Services",
 			"tax_id": {
 				"country": "ES",
 				"code": "58384285G"
 			},
-			"name": "MªF. Services",
 			"people": [
 				{
 					"name": {
@@ -45,11 +45,11 @@
 			]
 		},
 		"customer": {
+			"name": "Sample Consumer",
 			"tax_id": {
 				"country": "ES",
 				"code": "54387763P"
-			},
-			"name": "Sample Consumer"
+			}
 		},
 		"lines": [
 			{
diff --git a/cmd/gobl/testdata/Test_build_recalculate b/cmd/gobl/testdata/Test_build_recalculate
index 0b18b6f..ff7776e 100644
--- a/cmd/gobl/testdata/Test_build_recalculate
+++ b/cmd/gobl/testdata/Test_build_recalculate
@@ -15,11 +15,11 @@
 		"currency": "EUR",
 		"issue_date": "2021-06-16",
 		"supplier": {
+			"name": "A Company Name S.L.",
 			"tax_id": {
 				"country": "ES",
 				"code": "B91983379"
 			},
-			"name": "A Company Name S.L.",
 			"people": [
 				{
 					"name": {
@@ -52,11 +52,11 @@
 			]
 		},
 		"customer": {
+			"name": "Autofiscal S.L.",
 			"tax_id": {
 				"country": "ES",
 				"code": "54387763P"
 			},
-			"name": "Autofiscal S.L.",
 			"addresses": [
 				{
 					"num": "1629",
diff --git a/cmd/gobl/testdata/Test_build_success b/cmd/gobl/testdata/Test_build_success
index 0b18b6f..ff7776e 100644
--- a/cmd/gobl/testdata/Test_build_success
+++ b/cmd/gobl/testdata/Test_build_success
@@ -15,11 +15,11 @@
 		"currency": "EUR",
 		"issue_date": "2021-06-16",
 		"supplier": {
+			"name": "A Company Name S.L.",
 			"tax_id": {
 				"country": "ES",
 				"code": "B91983379"
 			},
-			"name": "A Company Name S.L.",
 			"people": [
 				{
 					"name": {
@@ -52,11 +52,11 @@
 			]
 		},
 		"customer": {
+			"name": "Autofiscal S.L.",
 			"tax_id": {
 				"country": "ES",
 				"code": "54387763P"
 			},
-			"name": "Autofiscal S.L.",
 			"addresses": [
 				{
 					"num": "1629",
diff --git a/cmd/gobl/testdata/Test_build_valid_file b/cmd/gobl/testdata/Test_build_valid_file
index 7c4cee1..1dbc7d5 100644
--- a/cmd/gobl/testdata/Test_build_valid_file
+++ b/cmd/gobl/testdata/Test_build_valid_file
@@ -15,11 +15,11 @@
 		"currency": "EUR",
 		"issue_date": "2021-06-16",
 		"supplier": {
+			"name": "A Different Company S.L.",
 			"tax_id": {
 				"country": "ES",
 				"code": "B91983379"
 			},
-			"name": "A Different Company S.L.",
 			"people": [
 				{
 					"name": {
@@ -52,11 +52,11 @@
 			]
 		},
 		"customer": {
+			"name": "Autofiscal S.L.",
 			"tax_id": {
 				"country": "ES",
 				"code": "54387763P"
 			},
-			"name": "Autofiscal S.L.",
 			"addresses": [
 				{
 					"num": "1629",
diff --git a/cmd/gobl/testdata/Test_sign_explicit_stdout b/cmd/gobl/testdata/Test_sign_explicit_stdout
index 9e10d2e..3b46b3e 100644
--- a/cmd/gobl/testdata/Test_sign_explicit_stdout
+++ b/cmd/gobl/testdata/Test_sign_explicit_stdout
@@ -14,11 +14,11 @@
 		"currency": "EUR",
 		"issue_date": "2022-02-01",
 		"supplier": {
+			"name": "MªF. Services",
 			"tax_id": {
 				"country": "ES",
 				"code": "58384285G"
 			},
-			"name": "MªF. Services",
 			"people": [
 				{
 					"name": {
@@ -45,11 +45,11 @@
 			]
 		},
 		"customer": {
+			"name": "Sample Consumer",
 			"tax_id": {
 				"country": "ES",
 				"code": "54387763P"
-			},
-			"name": "Sample Consumer"
+			}
 		},
 		"lines": [
 			{
diff --git a/cmd/gobl/testdata/Test_sign_input_file b/cmd/gobl/testdata/Test_sign_input_file
index 9e10d2e..3b46b3e 100644
--- a/cmd/gobl/testdata/Test_sign_input_file
+++ b/cmd/gobl/testdata/Test_sign_input_file
@@ -14,11 +14,11 @@
 		"currency": "EUR",
 		"issue_date": "2022-02-01",
 		"supplier": {
+			"name": "MªF. Services",
 			"tax_id": {
 				"country": "ES",
 				"code": "58384285G"
 			},
-			"name": "MªF. Services",
 			"people": [
 				{
 					"name": {
@@ -45,11 +45,11 @@
 			]
 		},
 		"customer": {
+			"name": "Sample Consumer",
 			"tax_id": {
 				"country": "ES",
 				"code": "54387763P"
-			},
-			"name": "Sample Consumer"
+			}
 		},
 		"lines": [
 			{
diff --git a/cmd/gobl/testdata/Test_sign_merge_values b/cmd/gobl/testdata/Test_sign_merge_values
index a9c1072..2b3421e 100644
--- a/cmd/gobl/testdata/Test_sign_merge_values
+++ b/cmd/gobl/testdata/Test_sign_merge_values
@@ -14,11 +14,11 @@
 		"currency": "MXN",
 		"issue_date": "2022-02-01",
 		"supplier": {
+			"name": "MªF. Services",
 			"tax_id": {
 				"country": "ES",
 				"code": "58384285G"
 			},
-			"name": "MªF. Services",
 			"people": [
 				{
 					"name": {
@@ -45,11 +45,11 @@
 			]
 		},
 		"customer": {
+			"name": "Sample Consumer",
 			"tax_id": {
 				"country": "ES",
 				"code": "54387763P"
-			},
-			"name": "Sample Consumer"
+			}
 		},
 		"lines": [
 			{
diff --git a/cmd/gobl/testdata/Test_sign_output_file_outfile b/cmd/gobl/testdata/Test_sign_output_file_outfile
index 9e10d2e..3b46b3e 100644
--- a/cmd/gobl/testdata/Test_sign_output_file_outfile
+++ b/cmd/gobl/testdata/Test_sign_output_file_outfile
@@ -14,11 +14,11 @@
 		"currency": "EUR",
 		"issue_date": "2022-02-01",
 		"supplier": {
+			"name": "MªF. Services",
 			"tax_id": {
 				"country": "ES",
 				"code": "58384285G"
 			},
-			"name": "MªF. Services",
 			"people": [
 				{
 					"name": {
@@ -45,11 +45,11 @@
 			]
 		},
 		"customer": {
+			"name": "Sample Consumer",
 			"tax_id": {
 				"country": "ES",
 				"code": "54387763P"
-			},
-			"name": "Sample Consumer"
+			}
 		},
 		"lines": [
 			{
diff --git a/cmd/gobl/testdata/Test_sign_overwrite_input_file_outfile b/cmd/gobl/testdata/Test_sign_overwrite_input_file_outfile
index 8e868e9..46f59e1 100644
--- a/cmd/gobl/testdata/Test_sign_overwrite_input_file_outfile
+++ b/cmd/gobl/testdata/Test_sign_overwrite_input_file_outfile
@@ -15,11 +15,11 @@
 		"currency": "EUR",
 		"issue_date": "2021-06-16",
 		"supplier": {
+			"name": "A Company Name S.L.",
 			"tax_id": {
 				"country": "ES",
 				"code": "B91983379"
 			},
-			"name": "A Company Name S.L.",
 			"people": [
 				{
 					"name": {
@@ -52,11 +52,11 @@
 			]
 		},
 		"customer": {
+			"name": "Autofiscal S.L.",
 			"tax_id": {
 				"country": "ES",
 				"code": "B85905495"
 			},
-			"name": "Autofiscal S.L.",
 			"addresses": [
 				{
 					"num": "1629",
diff --git a/cmd/gobl/testdata/Test_sign_overwrite_output_file_outfile b/cmd/gobl/testdata/Test_sign_overwrite_output_file_outfile
index 9e10d2e..3b46b3e 100644
--- a/cmd/gobl/testdata/Test_sign_overwrite_output_file_outfile
+++ b/cmd/gobl/testdata/Test_sign_overwrite_output_file_outfile
@@ -14,11 +14,11 @@
 		"currency": "EUR",
 		"issue_date": "2022-02-01",
 		"supplier": {
+			"name": "MªF. Services",
 			"tax_id": {
 				"country": "ES",
 				"code": "58384285G"
 			},
-			"name": "MªF. Services",
 			"people": [
 				{
 					"name": {
@@ -45,11 +45,11 @@
 			]
 		},
 		"customer": {
+			"name": "Sample Consumer",
 			"tax_id": {
 				"country": "ES",
 				"code": "54387763P"
-			},
-			"name": "Sample Consumer"
+			}
 		},
 		"lines": [
 			{
diff --git a/cmd/gobl/testdata/Test_sign_recalculate b/cmd/gobl/testdata/Test_sign_recalculate
index ca14e71..9ccf82d 100644
--- a/cmd/gobl/testdata/Test_sign_recalculate
+++ b/cmd/gobl/testdata/Test_sign_recalculate
@@ -15,11 +15,11 @@
 		"currency": "EUR",
 		"issue_date": "2021-06-16",
 		"supplier": {
+			"name": "A Company Name S.L.",
 			"tax_id": {
 				"country": "ES",
 				"code": "B91983379"
 			},
-			"name": "A Company Name S.L.",
 			"people": [
 				{
 					"name": {
@@ -52,11 +52,11 @@
 			]
 		},
 		"customer": {
+			"name": "Autofiscal S.L.",
 			"tax_id": {
 				"country": "ES",
 				"code": "54387763P"
 			},
-			"name": "Autofiscal S.L.",
 			"addresses": [
 				{
 					"num": "1629",
diff --git a/cmd/gobl/testdata/Test_sign_success b/cmd/gobl/testdata/Test_sign_success
index ca14e71..9ccf82d 100644
--- a/cmd/gobl/testdata/Test_sign_success
+++ b/cmd/gobl/testdata/Test_sign_success
@@ -15,11 +15,11 @@
 		"currency": "EUR",
 		"issue_date": "2021-06-16",
 		"supplier": {
+			"name": "A Company Name S.L.",
 			"tax_id": {
 				"country": "ES",
 				"code": "B91983379"
 			},
-			"name": "A Company Name S.L.",
 			"people": [
 				{
 					"name": {
@@ -52,11 +52,11 @@
 			]
 		},
 		"customer": {
+			"name": "Autofiscal S.L.",
 			"tax_id": {
 				"country": "ES",
 				"code": "54387763P"
 			},
-			"name": "Autofiscal S.L.",
 			"addresses": [
 				{
 					"num": "1629",
diff --git a/cmd/gobl/testdata/Test_sign_valid_file b/cmd/gobl/testdata/Test_sign_valid_file
index 2155307..17774a8 100644
--- a/cmd/gobl/testdata/Test_sign_valid_file
+++ b/cmd/gobl/testdata/Test_sign_valid_file
@@ -15,11 +15,11 @@
 		"currency": "EUR",
 		"issue_date": "2021-06-16",
 		"supplier": {
+			"name": "A Different Company S.L.",
 			"tax_id": {
 				"country": "ES",
 				"code": "B91983379"
 			},
-			"name": "A Different Company S.L.",
 			"people": [
 				{
 					"name": {
@@ -52,11 +52,11 @@
 			]
 		},
 		"customer": {
+			"name": "Autofiscal S.L.",
 			"tax_id": {
 				"country": "ES",
 				"code": "54387763P"
 			},
-			"name": "Autofiscal S.L.",
 			"addresses": [
 				{
 					"num": "1629",
diff --git a/go.mod b/go.mod
index fd0af1c..d158918 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.17
 require (
 	github.com/google/go-cmp v0.5.9
 	github.com/imdario/mergo v0.3.15
-	github.com/invopop/gobl v0.51.1
+	github.com/invopop/gobl v0.52.1
 	github.com/invopop/yaml v0.2.0
 	github.com/labstack/echo/v4 v4.10.2
 	github.com/magefile/mage v1.13.0
diff --git a/go.sum b/go.sum
index 665b112..2010ce6 100644
--- a/go.sum
+++ b/go.sum
@@ -794,16 +794,10 @@ github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM=
 github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/invopop/gobl v0.50.0 h1:dg6FpOp5fG/jUIr+sDIJRKurSOKr9GLfTgLnSZh+cCE=
-github.com/invopop/gobl v0.50.0/go.mod h1:X7EqVSEfeeIymdaOUrwkHu+OPPNATAHDQ8FPs2BvZFM=
-github.com/invopop/gobl v0.50.1 h1:6VqFqlO7EGWCyHsEyNrzl8te/x9X7IYO97CkpiMaeQY=
-github.com/invopop/gobl v0.50.1/go.mod h1:X7EqVSEfeeIymdaOUrwkHu+OPPNATAHDQ8FPs2BvZFM=
-github.com/invopop/gobl v0.50.2 h1:wQgx85xDE9wHdrtMjIctvlkpY2BKHUNs7qn9/cC9qMw=
-github.com/invopop/gobl v0.50.2/go.mod h1:X7EqVSEfeeIymdaOUrwkHu+OPPNATAHDQ8FPs2BvZFM=
-github.com/invopop/gobl v0.51.0 h1:q2Tc6HEu5RCfw7KcrOprjHNd3mvg7jdscdJx+J4F9iw=
-github.com/invopop/gobl v0.51.0/go.mod h1:X7EqVSEfeeIymdaOUrwkHu+OPPNATAHDQ8FPs2BvZFM=
-github.com/invopop/gobl v0.51.1 h1:70ayZ4rAtvHP6NJmH372pB94GNFsCjkStYnf69DE35s=
-github.com/invopop/gobl v0.51.1/go.mod h1:X7EqVSEfeeIymdaOUrwkHu+OPPNATAHDQ8FPs2BvZFM=
+github.com/invopop/gobl v0.52.0 h1:U1NUsBnGGV73kdubAh7xFsqEtqlo2S7jEqo0dYmQcHA=
+github.com/invopop/gobl v0.52.0/go.mod h1:/s8rsPX3RK5J/yGK41lzzzB+zXeC29rpIZBYjSjvYzM=
+github.com/invopop/gobl v0.52.1 h1:fxuO6rVFmeV6t/irA4gfzqwOphfEhTHKe9j254aR/lQ=
+github.com/invopop/gobl v0.52.1/go.mod h1:/s8rsPX3RK5J/yGK41lzzzB+zXeC29rpIZBYjSjvYzM=
 github.com/invopop/jsonschema v0.7.0 h1:2vgQcBz1n256N+FpX3Jq7Y17AjYt46Ig3zIWyy770So=
 github.com/invopop/jsonschema v0.7.0/go.mod h1:O9uiLokuu0+MGFlyiaqtWxwqJm41/+8Nj0lD7A36YH0=
 github.com/invopop/validation v0.3.0 h1:o260kbjXzoBO/ypXDSSrCLL7SxEFUXBsX09YTE9AxZw=