diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..b2cc3c4
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,3 @@
+module github.com/go-playground/tz
+
+go 1.17.0
diff --git a/tz_data.go b/tz_data.go
index 86b135d..48c2b35 100755
--- a/tz_data.go
+++ b/tz_data.go
@@ -228,10 +228,6 @@ var (
 					CountryCode: "AU",
 					Name:        "Australia/Broken_Hill",
 				},
-				{
-					CountryCode: "AU",
-					Name:        "Australia/Currie",
-				},
 				{
 					CountryCode: "AU",
 					Name:        "Australia/Darwin",
@@ -388,7 +384,7 @@ var (
 		},
 		{
 			Code: "BO",
-			Name: "Bolivia, Plurinational State of",
+			Name: "Bolivia (Plurinational State of)",
 			Zones: []Zone{
 				{
 					CountryCode: "BO",
@@ -551,6 +547,16 @@ var (
 				},
 			},
 		},
+		{
+			Code: "CV",
+			Name: "Cabo Verde",
+			Zones: []Zone{
+				{
+					CountryCode: "CV",
+					Name:        "Atlantic/Cape_Verde",
+				},
+			},
+		},
 		{
 			Code: "KH",
 			Name: "Cambodia",
@@ -689,16 +695,6 @@ var (
 				},
 			},
 		},
-		{
-			Code: "CV",
-			Name: "Cape Verde",
-			Zones: []Zone{
-				{
-					CountryCode: "CV",
-					Name:        "Atlantic/Cape_Verde",
-				},
-			},
-		},
 		{
 			Code: "KY",
 			Name: "Cayman Islands",
@@ -813,7 +809,7 @@ var (
 		},
 		{
 			Code: "CD",
-			Name: "Congo, the Democratic Republic of the",
+			Name: "Congo, Democratic Republic of the",
 			Zones: []Zone{
 				{
 					CountryCode: "CD",
@@ -891,7 +887,7 @@ var (
 		},
 		{
 			Code: "CZ",
-			Name: "Czech Republic",
+			Name: "Czechia",
 			Zones: []Zone{
 				{
 					CountryCode: "CZ",
@@ -1013,6 +1009,16 @@ var (
 				},
 			},
 		},
+		{
+			Code: "SZ",
+			Name: "Eswatini",
+			Zones: []Zone{
+				{
+					CountryCode: "SZ",
+					Name:        "Africa/Mbabane",
+				},
+			},
+		},
 		{
 			Code: "ET",
 			Name: "Ethiopia",
@@ -1195,7 +1201,7 @@ var (
 				},
 				{
 					CountryCode: "GL",
-					Name:        "America/Godthab",
+					Name:        "America/Nuuk",
 				},
 				{
 					CountryCode: "GL",
@@ -1304,7 +1310,7 @@ var (
 		},
 		{
 			Code: "VA",
-			Name: "Holy See (Vatican City State)",
+			Name: "Holy See",
 			Zones: []Zone{
 				{
 					CountryCode: "VA",
@@ -1386,7 +1392,7 @@ var (
 		},
 		{
 			Code: "IR",
-			Name: "Iran, Islamic Republic of",
+			Name: "Iran (Islamic Republic of)",
 			Zones: []Zone{
 				{
 					CountryCode: "IR",
@@ -1534,7 +1540,7 @@ var (
 			Zones: []Zone{
 				{
 					CountryCode: "KI",
-					Name:        "Pacific/Enderbury",
+					Name:        "Pacific/Kanton",
 				},
 				{
 					CountryCode: "KI",
@@ -1548,7 +1554,7 @@ var (
 		},
 		{
 			Code: "KP",
-			Name: "Korea, Democratic People's Republic of",
+			Name: "Korea (Democratic People's Republic of)",
 			Zones: []Zone{
 				{
 					CountryCode: "KP",
@@ -1686,16 +1692,6 @@ var (
 				},
 			},
 		},
-		{
-			Code: "MK",
-			Name: "Macedonia, the Former Yugoslav Republic of",
-			Zones: []Zone{
-				{
-					CountryCode: "MK",
-					Name:        "Europe/Skopje",
-				},
-			},
-		},
 		{
 			Code: "MG",
 			Name: "Madagascar",
@@ -1866,7 +1862,7 @@ var (
 		},
 		{
 			Code: "FM",
-			Name: "Micronesia, Federated States of",
+			Name: "Micronesia (Federated States of)",
 			Zones: []Zone{
 				{
 					CountryCode: "FM",
@@ -2084,6 +2080,16 @@ var (
 				},
 			},
 		},
+		{
+			Code: "MK",
+			Name: "North Macedonia",
+			Zones: []Zone{
+				{
+					CountryCode: "MK",
+					Name:        "Europe/Skopje",
+				},
+			},
+		},
 		{
 			Code: "MP",
 			Name: "Northern Mariana Islands",
@@ -2698,16 +2704,6 @@ var (
 				},
 			},
 		},
-		{
-			Code: "SZ",
-			Name: "Swaziland",
-			Zones: []Zone{
-				{
-					CountryCode: "SZ",
-					Name:        "Africa/Mbabane",
-				},
-			},
-		},
 		{
 			Code: "SE",
 			Name: "Sweden",
@@ -2922,7 +2918,7 @@ var (
 		},
 		{
 			Code: "GB",
-			Name: "United Kingdom",
+			Name: "United Kingdom of Great Britain and Northern Ireland",
 			Zones: []Zone{
 				{
 					CountryCode: "GB",
@@ -2930,9 +2926,23 @@ var (
 				},
 			},
 		},
+		{
+			Code: "UM",
+			Name: "United States Minor Outlying Islands",
+			Zones: []Zone{
+				{
+					CountryCode: "UM",
+					Name:        "Pacific/Midway",
+				},
+				{
+					CountryCode: "UM",
+					Name:        "Pacific/Wake",
+				},
+			},
+		},
 		{
 			Code: "US",
-			Name: "United States",
+			Name: "United States of America",
 			Zones: []Zone{
 				{
 					CountryCode: "US",
@@ -3052,20 +3062,6 @@ var (
 				},
 			},
 		},
-		{
-			Code: "UM",
-			Name: "United States Minor Outlying Islands",
-			Zones: []Zone{
-				{
-					CountryCode: "UM",
-					Name:        "Pacific/Midway",
-				},
-				{
-					CountryCode: "UM",
-					Name:        "Pacific/Wake",
-				},
-			},
-		},
 		{
 			Code: "UY",
 			Name: "Uruguay",
@@ -3102,7 +3098,7 @@ var (
 		},
 		{
 			Code: "VE",
-			Name: "Venezuela, Bolivarian Republic of",
+			Name: "Venezuela (Bolivarian Republic of)",
 			Zones: []Zone{
 				{
 					CountryCode: "VE",
@@ -3122,7 +3118,7 @@ var (
 		},
 		{
 			Code: "VG",
-			Name: "Virgin Islands, British",
+			Name: "Virgin Islands (British)",
 			Zones: []Zone{
 				{
 					CountryCode: "VG",
@@ -3132,7 +3128,7 @@ var (
 		},
 		{
 			Code: "VI",
-			Name: "Virgin Islands, U.S.",
+			Name: "Virgin Islands (U.S.)",
 			Zones: []Zone{
 				{
 					CountryCode: "VI",