diff --git a/src/multiset/download-retries.sh b/src/multiset/download-retries.sh
index 9c4a2e5..f49d568 100755
--- a/src/multiset/download-retries.sh
+++ b/src/multiset/download-retries.sh
@@ -35,7 +35,7 @@ EOF
 
 read -d '' mapData <<-'EOF' || true
 {
-	dataset: (.path | split("/")[-2:] | join("/")),
+	dataset: (.path | split("/")[-1:][0]),
 	domains: .domains.counts.all,
 	failed: .domains.counts.failed,
 	rate: .domains.coverage.failed
diff --git a/src/multiset/non-failed.classification.domain-scope.coverage.sh b/src/multiset/non-failed.classification.domain-scope.coverage.sh
index ca7276b..845149e 100755
--- a/src/multiset/non-failed.classification.domain-scope.coverage.sh
+++ b/src/multiset/non-failed.classification.domain-scope.coverage.sh
@@ -17,7 +17,7 @@ EOF
 
 read -d '' mapData <<-'EOF' || true
 {
-	dataset: (.path | split("/")[-2:] | join("/")),
+	dataset: (.path | split("/")[-1:][0]),
 	"non-failed-domains",
 	requests,
 	"is-same-domain",
@@ -32,7 +32,7 @@ read -d '' renameForTsvColumnOrdering <<-'EOF' || true
 map(
 	{
 		"01--Dataset": .dataset,
-		"02--Non-failed domains": ."non-failed-domains",
+		"02--Domains": ."non-failed-domains",
 		"03--Same domain": ."is-same-domain",
 		"04--Subdomain": ."is-subdomain",
 		"05--Superdomain": ."is-superdomain",
diff --git a/src/multiset/non-failed.classification.secure.coverage.sh b/src/multiset/non-failed.classification.secure.coverage.sh
index d5bfa2d..7bfded3 100755
--- a/src/multiset/non-failed.classification.secure.coverage.sh
+++ b/src/multiset/non-failed.classification.secure.coverage.sh
@@ -15,7 +15,7 @@ EOF
 
 read -d '' mapData <<-'EOF' || true
 {
-	dataset: (.path | split("/")[-2:] | join("/")),
+	dataset: (.path | split("/")[-1:][0]),
 	"non-failed-domains",
 	requests,
 	"internal-secure-coverage",
@@ -27,7 +27,7 @@ read -d '' renameForTsvColumnOrdering <<-'EOF' || true
 map(
 	{
 		"01--Dataset": .dataset,
-		"02--Non-failed domains": ."non-failed-domains",
+		"02--Domains": ."non-failed-domains",
 		"03--All secure": .requests,
 		"04--Internal secure": ."internal-secure-coverage",
 		"05--External secure": ."external-secure-coverage",
diff --git a/src/multiset/non-failed.disconnect.categories.sh b/src/multiset/non-failed.disconnect.categories.sh
index 69c18f8..15d389b 100755
--- a/src/multiset/non-failed.disconnect.categories.sh
+++ b/src/multiset/non-failed.disconnect.categories.sh
@@ -13,7 +13,7 @@ EOF
 
 read -d '' mapData <<-'EOF' || true
 {
-	dataset: (.path | split("/")[-2:] | join("/")),
+	dataset: (.path | split("/")[-1:][0]),
 	"non-failed-domains",
 	"Disconnect": (.categories.Disconnect // 0),
 	"Content": (.categories.Content // 0),
@@ -27,7 +27,7 @@ read -d '' renameForTsvColumnOrdering <<-'EOF' || true
 map(
 	{
 		"01--Dataset": .dataset,
-		"02--Non-failed domains": ."non-failed-domains",
+		"02--Domains": ."non-failed-domains",
 		"03--Disconnect": .Disconnect,
 		"04--Content": .Content,
 		"05--Advertising": .Advertising,
diff --git a/src/multiset/non-failed.disconnect.organizations.sh b/src/multiset/non-failed.disconnect.organizations.sh
index f69a00f..9a9145a 100755
--- a/src/multiset/non-failed.disconnect.organizations.sh
+++ b/src/multiset/non-failed.disconnect.organizations.sh
@@ -13,7 +13,7 @@ EOF
 
 read -d '' mapData <<-'EOF' || true
 {
-	dataset: (.path | split("/")[-2:] | join("/")),
+	dataset: (.path | split("/")[-1:][0]),
 	"non-failed-domains",
 	"Google": (.organizations."Google" // 0),
 	"Facebook": (.organizations."Facebook" // 0),
@@ -37,7 +37,7 @@ read -d '' renameForTsvColumnOrdering <<-'EOF' || true
 map(
 	{
 		"01--Dataset": .dataset,
-		"02--Non-failed domains": ."non-failed-domains",
+		"02--Domains": ."non-failed-domains",
 		"03--Google": ."Google",
 		"04--Facebook": ."Facebook",
 		"05--Twitter": ."Twitter",
diff --git a/src/multiset/non-failed.url.counts.sh b/src/multiset/non-failed.url.counts.sh
index cf602f2..4c77ea0 100755
--- a/src/multiset/non-failed.url.counts.sh
+++ b/src/multiset/non-failed.url.counts.sh
@@ -15,7 +15,7 @@ EOF
 
 read -d '' mapData <<-'EOF' || true
 {
-	dataset: (.path | split("/")[-2:] | join("/")),
+	dataset: (.path | split("/")[-1:][0]),
 	"non-failed-domains",
 	requests,
 	"internal-requests",
@@ -32,7 +32,7 @@ read -d '' renameForTsvColumnOrdering <<-'EOF' || true
 map(
 	{
 		"01--Dataset": .dataset,
-		"02--Non-failed domains": ."non-failed-domains",
+		"02--Domains": ."non-failed-domains",
 		"03--Requests": .requests,
 		"04--Internal requests": ."internal-requests",
 		"05--External requests": ."external-requests",