diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs
index 52f7cdfb2..2e76c311f 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs	
@@ -127,7 +127,7 @@ private void InitializeComponent()
             this.TC_Editor = new System.Windows.Forms.TabControl();
             this.Tab_Overview = new System.Windows.Forms.TabPage();
             this.GB_Stats = new System.Windows.Forms.GroupBox();
-            this.TrainerStats = new PKHeX.WinForms.Subforms.Save_Editors.TrainerStat();
+            this.TrainerStats = new Controls.TrainerStat();
             this.GB_Adventure = new System.Windows.Forms.GroupBox();
             this.L_Fame = new System.Windows.Forms.Label();
             this.CAL_HoFDate = new System.Windows.Forms.DateTimePicker();
@@ -1725,7 +1725,7 @@ private void InitializeComponent()
         private System.Windows.Forms.Label L_TRNick;
         private System.Windows.Forms.TextBox TB_TRNick;
         private System.Windows.Forms.CheckBox CHK_MegaUnlocked;
-        private Subforms.Save_Editors.TrainerStat TrainerStats;
+        private Controls.TrainerStat TrainerStats;
         private System.Windows.Forms.PropertyGrid PG_CurrentAppearance;
         private System.Windows.Forms.CheckBox CHK_MegaRayquazaUnlocked;
         private System.Windows.Forms.ToolTip Tip1;
diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.Designer.cs
index 79e3ba996..a13abc3e7 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.Designer.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.Designer.cs	
@@ -103,7 +103,7 @@ private void InitializeComponent()
             this.CB_Vivillon = new System.Windows.Forms.ComboBox();
             this.L_Vivillon = new System.Windows.Forms.Label();
             this.GB_Stats = new System.Windows.Forms.GroupBox();
-            this.TrainerStats = new PKHeX.WinForms.Subforms.Save_Editors.TrainerStat();
+            this.TrainerStats = new Controls.TrainerStat();
             this.NUD_FC = new System.Windows.Forms.NumericUpDown();
             this.NUD_BP = new System.Windows.Forms.NumericUpDown();
             this.L_FC = new System.Windows.Forms.Label();
@@ -2435,7 +2435,7 @@ private void InitializeComponent()
         private System.Windows.Forms.TextBox TB_RotomOT;
         private System.Windows.Forms.Label L_RotomOT;
         private Controls.TrainerID trainerID1;
-        private Subforms.Save_Editors.TrainerStat TrainerStats;
+        private Controls.TrainerStat TrainerStats;
         private System.Windows.Forms.NumericUpDown NUD_RotomAffection;
         private System.Windows.Forms.GroupBox GB_Rotom;
         private System.Windows.Forms.CheckBox CHK_RotoLoto2;
diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.Designer.cs
index e392e25a5..74508bc3c 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.Designer.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.Designer.cs	
@@ -107,7 +107,7 @@ private void InitializeComponent()
             this.GB_Stats = new System.Windows.Forms.GroupBox();
             this.NUD_BP = new System.Windows.Forms.NumericUpDown();
             this.L_BP = new System.Windows.Forms.Label();
-            this.TrainerStats = new PKHeX.WinForms.Subforms.Save_Editors.TrainerStat();
+            this.TrainerStats = new Controls.TrainerStat();
             this.trainerID1 = new PKHeX.WinForms.Controls.TrainerID();
             this.GB_Adventure = new System.Windows.Forms.GroupBox();
             this.L_Fame = new System.Windows.Forms.Label();
@@ -1497,7 +1497,7 @@ private void InitializeComponent()
         private System.Windows.Forms.Label L_R;
         private Controls.TrainerID trainerID1;
         private System.Windows.Forms.GroupBox GB_Stats;
-        private Subforms.Save_Editors.TrainerStat TrainerStats;
+        private Controls.TrainerStat TrainerStats;
         private System.Windows.Forms.NumericUpDown NUD_BP;
         private System.Windows.Forms.Label L_BP;
         private System.Windows.Forms.TextBox TB_TrainerCardName;
diff --git a/PKHeX.WinForms/Subforms/Save Editors/TrainerStat.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/TrainerStat.Designer.cs
index f75e985f0..841e1f00e 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/TrainerStat.Designer.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/TrainerStat.Designer.cs	
@@ -1,4 +1,4 @@
-namespace PKHeX.WinForms.Subforms.Save_Editors
+namespace PKHeX.WinForms.Controls
 {
     partial class TrainerStat
     {
diff --git a/PKHeX.WinForms/Subforms/Save Editors/TrainerStat.cs b/PKHeX.WinForms/Subforms/Save Editors/TrainerStat.cs
index 573cb1cd9..9cfa65697 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/TrainerStat.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/TrainerStat.cs	
@@ -4,7 +4,7 @@
 using System.Windows.Forms;
 using PKHeX.Core;
 
-namespace PKHeX.WinForms.Subforms.Save_Editors
+namespace PKHeX.WinForms.Controls
 {
     public partial class TrainerStat : UserControl
     {