diff --git a/PKHeX.Core/PKM/SK2.cs b/PKHeX.Core/PKM/SK2.cs
index dc691b7c2..3a9876df2 100644
--- a/PKHeX.Core/PKM/SK2.cs
+++ b/PKHeX.Core/PKM/SK2.cs
@@ -12,8 +12,8 @@ public sealed class SK2 : GBPKM, ICaughtData2
 
         public override int SIZE_PARTY => PokeCrypto.SIZE_2STADIUM;
         public override int SIZE_STORED => PokeCrypto.SIZE_2STADIUM;
-        private bool _jp { get; set; }
-        public override bool Japanese => _jp;
+        private bool IsEncodingJapanese { get; set; }
+        public override bool Japanese => IsEncodingJapanese;
         public override bool Korean => false;
         private const int StringLength = 12;
 
@@ -21,13 +21,9 @@ public sealed class SK2 : GBPKM, ICaughtData2
         public override int OTLength => StringLength;
         public override int NickLength => StringLength;
 
-        public SK2(bool jp = false) : base(PokeCrypto.SIZE_2STADIUM)
-        {
-            _jp = jp;
-        }
-
+        public SK2(bool jp = false) : base(PokeCrypto.SIZE_2STADIUM) => IsEncodingJapanese = jp;
         public SK2(byte[] data) : this(data, IsJapanese(data)) { }
-        public SK2(byte[] data, bool jp) : base(data) => _jp = jp;
+        public SK2(byte[] data, bool jp) : base(data) => IsEncodingJapanese = jp;
 
         public override PKM Clone() => new SK2((byte[])Data.Clone(), Japanese)
         {
@@ -64,7 +60,7 @@ public override PKM Clone() => new SK2((byte[])Data.Clone(), Japanese)
         public override int CurrentFriendship { get => Data[0x1C]; set => Data[0x1C] = (byte)value; }
 
         public override int Stat_Level { get => Data[0x1D]; set => Data[0x1D] = (byte)value; }
-        public override bool IsEgg { get => (Data[0x1E] & 1) == 1; set => Data[0x1E] = (byte)(Data[0x1E] & ~1 | (value ? 1 : 0)); }
+        public override bool IsEgg { get => (Data[0x1E] & 1) == 1; set => Data[0x1E] = (byte)((Data[0x1E] & ~1) | (value ? 1 : 0)); }
 
         public bool IsRental
         {
@@ -211,6 +207,6 @@ private static bool IsJapanese(byte[] data)
 
         private static bool IsEnglish(byte[] data) => StringConverter12.GetIsG1English(data, 0x24, StringLength) && StringConverter12.GetIsG1English(data, 0x30, StringLength);
         public bool IsPossible(bool japanese) => japanese ? IsJapanese(Data) : IsEnglish(Data);
-        public void SwapLanguage() => _jp ^= true;
+        public void SwapLanguage() => IsEncodingJapanese ^= true;
     }
 }
diff --git a/PKHeX.Core/PKM/Strings/StringConverter12.cs b/PKHeX.Core/PKM/Strings/StringConverter12.cs
index 1059fd35b..5040d8b6b 100644
--- a/PKHeX.Core/PKM/Strings/StringConverter12.cs
+++ b/PKHeX.Core/PKM/Strings/StringConverter12.cs
@@ -115,7 +115,7 @@ public static byte[] SetString1(string value, int maxLength, bool jp, int padTo
 
             var dict = jp ? U2RBY_J : U2RBY_U;
             if (value.StartsWith(G1TradeOTStr)) // Handle "[TRAINER]"
-                return new[] { dict[G1TradeOT], dict[G1Terminator] };
+                return new[] { G1TradeOTCode, G1TerminatorCode };
 
             var arr = new List<byte>(padTo);
             foreach (char c in value)
@@ -124,8 +124,7 @@ public static byte[] SetString1(string value, int maxLength, bool jp, int padTo
                     break;
                 arr.Add(val);
             }
-            var term = dict[G1Terminator]; // terminator
-            arr.Add(term);
+            arr.Add(G1TerminatorCode);
             while (arr.Count < padTo)
                 arr.Add((byte)padWith);
             return arr.ToArray();
diff --git a/PKHeX.Core/PKM/Strings/StringConverter2KOR.cs b/PKHeX.Core/PKM/Strings/StringConverter2KOR.cs
index fabfce458..8a6e3798e 100644
--- a/PKHeX.Core/PKM/Strings/StringConverter2KOR.cs
+++ b/PKHeX.Core/PKM/Strings/StringConverter2KOR.cs
@@ -53,7 +53,7 @@ public static byte[] SetString2KOR(string value, int maxLength, int padTo = 0, u
 
             var dict = U2RBY_U;
             if (value.StartsWith(G1TradeOTStr)) // Handle "[TRAINER]"
-                return new[] { dict[G1TradeOT], dict[G1Terminator] };
+                return new[] { G1TradeOTCode, G1TerminatorCode };
 
             var arr = new List<byte>(padTo);
             foreach (char c in value)