diff --git a/PKHeX.Core/Legality/Areas/EncounterArea7g.cs b/PKHeX.Core/Legality/Areas/EncounterArea7g.cs
index 46e9ab00d..c7202e22b 100644
--- a/PKHeX.Core/Legality/Areas/EncounterArea7g.cs
+++ b/PKHeX.Core/Legality/Areas/EncounterArea7g.cs
@@ -20,11 +20,11 @@ private EncounterArea7g(int species, int form) : base(GameVersion.GO)
             Location = 50;
         }
 
-        internal static EncounterArea7g[] GetArea(byte[][] pickle)
+        internal static EncounterArea7g[] GetArea(byte[][] data)
         {
-            var areas = new EncounterArea7g[pickle.Length];
+            var areas = new EncounterArea7g[data.Length];
             for (int i = 0; i < areas.Length; i++)
-                areas[i] = GetArea(pickle[i]);
+                areas[i] = GetArea(data[i]);
             return areas;
         }
 
diff --git a/PKHeX.Core/Legality/Areas/EncounterArea8g.cs b/PKHeX.Core/Legality/Areas/EncounterArea8g.cs
index cafa7fae0..0ae06bcf2 100644
--- a/PKHeX.Core/Legality/Areas/EncounterArea8g.cs
+++ b/PKHeX.Core/Legality/Areas/EncounterArea8g.cs
@@ -20,11 +20,11 @@ private EncounterArea8g(int species, int form) : base(GameVersion.GO)
             Location = Locations.GO8;
         }
 
-        internal static EncounterArea8g[] GetArea(byte[][] pickle)
+        internal static EncounterArea8g[] GetArea(byte[][] data)
         {
-            var areas = new EncounterArea8g[pickle.Length];
+            var areas = new EncounterArea8g[data.Length];
             for (int i = 0; i < areas.Length; i++)
-                areas[i] = GetArea(pickle[i]);
+                areas[i] = GetArea(data[i]);
             return areas;
         }
 
diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot7GO.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot7GO.cs
index 9b9b5bc4d..0d767924a 100644
--- a/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot7GO.cs
+++ b/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot7GO.cs
@@ -6,6 +6,8 @@ public sealed class EncounterSlot7GO : EncounterSlot, IPogoSlot
         public PogoType Type { get; }
         public Shiny Shiny { get; }
 
+        public override string LongName => $"{Name} ({Type})";
+
         public EncounterSlot7GO(EncounterArea7g area, int species, int form, Shiny shiny, PogoType type) : base(area)
         {
             Species = species;
diff --git a/PKHeX.Core/Legality/Enums/SlotType.cs b/PKHeX.Core/Legality/Enums/SlotType.cs
index 681cb38c5..0fce95e03 100644
--- a/PKHeX.Core/Legality/Enums/SlotType.cs
+++ b/PKHeX.Core/Legality/Enums/SlotType.cs
@@ -62,7 +62,7 @@ public enum SlotType : byte
         BugContest = 9,
 
         HiddenGrotto = 10,
-        GoPark = 11,
+        // GoPark = 11,
         FriendSafari = 12,
         Horde = 13,
         // Pokeradar = 14,
diff --git a/PKHeX.Core/Legality/Verifiers/EffortValueVerifier.cs b/PKHeX.Core/Legality/Verifiers/EffortValueVerifier.cs
index 2fab2f4ab..c368ee339 100644
--- a/PKHeX.Core/Legality/Verifiers/EffortValueVerifier.cs
+++ b/PKHeX.Core/Legality/Verifiers/EffortValueVerifier.cs
@@ -68,12 +68,13 @@ private void VerifyAwakenedValues(LegalityAnalysis data, IAwakened awakened)
             if (sum != 0)
                 data.AddLine(GetInvalid(LEffortShouldBeZero));
 
-            var EncounterMatch = data.EncounterMatch;
             if (!awakened.AwakeningAllValid())
                 data.AddLine(GetInvalid(LAwakenedCap));
-            if (EncounterMatch is EncounterSlot s && s.Area.Type == SlotType.GoPark && Enumerable.Range(0, 6).Select(awakened.GetAV).Any(z => z < 2))
+
+            var enc = data.EncounterMatch;
+            if (enc is EncounterSlot7GO && Enumerable.Range(0, 6).Select(awakened.GetAV).Any(z => z < 2))
                 data.AddLine(GetInvalid(string.Format(LAwakenedShouldBeValue, 2))); // go park transfers have 2 AVs for all stats.
-            else if (awakened.AwakeningSum() == 0 && !EncounterMatch.IsWithinRange(pkm))
+            else if (awakened.AwakeningSum() == 0 && !enc.IsWithinRange(pkm))
                 data.AddLine(Get(LAwakenedEXPIncreased, Severity.Fishy));
         }
     }