diff --git a/PKHeX.Core/Editing/ShowdownSet.cs b/PKHeX.Core/Editing/ShowdownSet.cs
index 0b4fd46db..7faff2584 100644
--- a/PKHeX.Core/Editing/ShowdownSet.cs
+++ b/PKHeX.Core/Editing/ShowdownSet.cs
@@ -578,8 +578,7 @@ private static string ConvertFormToShowdown(string form, int spec)
                     return "Pokeball"; // Vivillon
                 case 718: // Zygarde
                     form = form.Replace("-C", string.Empty);
-                    form = form.Replace("50%", string.Empty);
-                    return form.Replace("100%", "Complete");
+                    return form.Replace("50%", string.Empty);
                 case 774: // Minior
                     if (form.StartsWith("M-"))
                         return "Meteor";
@@ -618,7 +617,7 @@ private static string ConvertFormFromShowdown(string form, int spec, int ability
                 case 718 when string.IsNullOrWhiteSpace(form):
                     return "50%";
                 case 718 when form == "Complete":
-                    return "100%";
+                    return form;
                 case 718 when ability == 211:
                     return "-C"; // Power Construct
 
diff --git a/PKHeX.Core/PKM/Util/FormConverter.cs b/PKHeX.Core/PKM/Util/FormConverter.cs
index 0483c64fd..ce8989abc 100644
--- a/PKHeX.Core/PKM/Util/FormConverter.cs
+++ b/PKHeX.Core/PKM/Util/FormConverter.cs
@@ -409,10 +409,10 @@ private static string[] GetFormsGen6(int species, IReadOnlyList<string> types, I
                     return new[]
                     {
                         forms[718], // 50% (Aura Break)
-                        "10%", // (Aura Break)
-                        "10%-C", // Cell (Power Construct)
-                        "50%-C", // Cell (Power Construct)
-                        "100%-C" // Cell (Power Construct)
+                        forms[1013], // 10% (Aura Break)
+                        forms[1014] + "-C", // 10% Cell (Power Construct)
+                        forms[1015] + "-C", // 50% Cell (Power Construct)
+                        forms[1016], // 100% Cell (Power Construct)
                     };
             }
         }