diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs
index dc8dcb3c9..23c89d17a 100644
--- a/PKHeX/MainWindow/Main.cs
+++ b/PKHeX/MainWindow/Main.cs
@@ -2611,7 +2611,8 @@ namespace PKHeX
                 pkm.setShinyPID();
             else
             {
-                TB_ATKIV.Text = "15";
+                int[] atkIVs = {2, 3, 6, 7, 10, 11, 14, 15};
+                TB_ATKIV.Text = atkIVs[Util.rnd32()%atkIVs.Length].ToString();
                 TB_DEFIV.Text = "10";
                 TB_SPEIV.Text = "10";
                 TB_SPAIV.Text = "10";
diff --git a/PKHeX/PKM/PK2.cs b/PKHeX/PKM/PK2.cs
index af3696e72..b9a4f5377 100644
--- a/PKHeX/PKM/PK2.cs
+++ b/PKHeX/PKM/PK2.cs
@@ -23,8 +23,15 @@ namespace PKHeX
         public override int Format => 2;
 
         public bool Japanese => otname.Length == STRLEN_J;
-
-        public override string FileName => $"{Species:000} - {Nickname} - {SaveUtil.ccitt16(Encrypt()):X4}.{Extension}";
+        public override string FileName
+        {
+            get
+            {
+                string form = AltForm > 0 ? $"-{AltForm:00)}" : "";
+                string star = IsShiny ? " ★" : "";
+                return $"{Species:000}{form}{star} - {Nickname} - {SaveUtil.ccitt16(Encrypt()):X4}.{Extension}";
+            }
+        }
 
         public PK2(byte[] decryptedData = null, string ident = null, bool jp = false)
         {