--- old/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java	2020-04-27 18:00:52.177477679 +0000
+++ new/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java	2020-04-27 18:00:51.781457695 +0000
@@ -272,6 +272,9 @@
         String VICTORIA[] = new String[] {"Australian Eastern Standard Time (Victoria)", "AEST",
                                           "Australian Eastern Daylight Time (Victoria)", "AEDT",
                                           "Australian Eastern Time (Victoria)", "AET"};
+        String WGT[] = new String[] {"Western Greenland Time", "WGT",
+                                     "Western Greenland Summer Time", "WGST",
+                                     "Western Greenland Time", "WGT"};
         String UTC[] = new String[] {"Coordinated Universal Time", "UTC",
                                      "Coordinated Universal Time", "UTC",
                                      "Coordinated Universal Time", "UTC"};
@@ -432,7 +435,7 @@
             {"America/Cuiaba", AMT},
             {"America/Curacao", AST},
             {"America/Danmarkshavn", GMT},
-            {"America/Dawson", PST},
+            {"America/Dawson", MST},
             {"America/Dawson_Creek", MST},
             {"America/Detroit", EST},
             {"America/Dominica", AST},
@@ -444,9 +447,7 @@
             {"America/Fort_Wayne", EST},
             {"America/Fortaleza", BRT},
             {"America/Glace_Bay", AST},
-            {"America/Godthab", new String[] {"Western Greenland Time", "WGT",
-                                              "Western Greenland Summer Time", "WGST",
-                                              "Western Greenland Time", "WGT"}},
+            {"America/Godthab", WGT},
             {"America/Goose_Bay", AST},
             {"America/Grand_Turk", EST},
             {"America/Grenada", AST},
@@ -514,6 +515,7 @@
             {"America/North_Dakota/Beulah", CST},
             {"America/North_Dakota/Center", CST},
             {"America/North_Dakota/New_Salem", CST},
+            {"America/Nuuk", WGT},
             {"America/Ojinaga", MST},
             {"America/Panama", EST},
             {"America/Pangnirtung", EST},
@@ -556,7 +558,7 @@
             {"America/Tortola", AST},
             {"America/Vancouver", PST},
             {"America/Virgin", AST},
-            {"America/Whitehorse", PST},
+            {"America/Whitehorse", MST},
             {"America/Winnipeg", CST},
             {"America/Yakutat", AKST},
             {"America/Yellowknife", MST},
@@ -798,7 +800,7 @@
             {"Canada/Mountain", MST},
             {"Canada/Newfoundland", NST},
             {"Canada/Pacific", PST},
-            {"Canada/Yukon", PST},
+            {"Canada/Yukon", MST},
             {"Canada/Saskatchewan", CST},
             {"CAT", CAT},
             {"CET", CET},