diff --git a/aviary/mission/flops_based/ode/landing_ode.py b/aviary/mission/flops_based/ode/landing_ode.py
index 76f5f9a36..c5e6d293d 100644
--- a/aviary/mission/flops_based/ode/landing_ode.py
+++ b/aviary/mission/flops_based/ode/landing_ode.py
@@ -150,7 +150,7 @@ def setup(self):
             'aviary_options':  options['aviary_options']}
 
         self.add_subsystem(
-            'eoms',
+            'landing_eom',
             FlareEOM(**kwargs),
             promotes_inputs=[
                 Dynamic.Mission.FLIGHT_PATH_ANGLE, Dynamic.Mission.VELOCITY, Dynamic.Mission.MASS, Dynamic.Mission.LIFT,
diff --git a/aviary/mission/flops_based/ode/takeoff_ode.py b/aviary/mission/flops_based/ode/takeoff_ode.py
index e8304e181..23a0325bb 100644
--- a/aviary/mission/flops_based/ode/takeoff_ode.py
+++ b/aviary/mission/flops_based/ode/takeoff_ode.py
@@ -150,7 +150,7 @@ def setup(self):
             'aviary_options':  options['aviary_options']}
 
         self.add_subsystem(
-            'eoms', TakeoffEOM(**kwargs),
+            'takeoff_eom', TakeoffEOM(**kwargs),
             promotes_inputs=[
                 Dynamic.Mission.FLIGHT_PATH_ANGLE, Dynamic.Mission.VELOCITY, Dynamic.Mission.MASS, Dynamic.Mission.LIFT,
                 Dynamic.Mission.THRUST_TOTAL, Dynamic.Mission.DRAG, 'angle_of_attack'],
diff --git a/aviary/mission/flops_based/phases/detailed_takeoff_phases.py b/aviary/mission/flops_based/phases/detailed_takeoff_phases.py
index ea9dc73b5..b6606b0e0 100644
--- a/aviary/mission/flops_based/phases/detailed_takeoff_phases.py
+++ b/aviary/mission/flops_based/phases/detailed_takeoff_phases.py
@@ -880,7 +880,7 @@ def build_phase(self, aviary_options: AviaryValues = None):
         phase.add_path_constraint(
             'v_over_v_stall', lower=1.25, ref=2.0)
 
-        phase.add_boundary_constraint('eoms.forces_vertical', loc='initial', equals=0,
+        phase.add_boundary_constraint('takeoff_eom.forces_vertical', loc='initial', equals=0,
                                       ref=100000)
 
         return phase
diff --git a/aviary/mission/gasp_based/ode/accel_ode.py b/aviary/mission/gasp_based/ode/accel_ode.py
index 8b452cc09..4b11441e8 100644
--- a/aviary/mission/gasp_based/ode/accel_ode.py
+++ b/aviary/mission/gasp_based/ode/accel_ode.py
@@ -71,7 +71,7 @@ def setup(self):
             Dynamic.Mission.ALTITUDE_RATE] if analysis_scheme is AnalysisScheme.SHOOTING else []
 
         self.add_subsystem(
-            "eom",
+            "accel_eom",
             AccelerationRates(
                 num_nodes=nn,
                 analysis_scheme=analysis_scheme),
diff --git a/aviary/mission/gasp_based/ode/ascent_ode.py b/aviary/mission/gasp_based/ode/ascent_ode.py
index e5700df6e..14cfab863 100644
--- a/aviary/mission/gasp_based/ode/ascent_ode.py
+++ b/aviary/mission/gasp_based/ode/ascent_ode.py
@@ -80,7 +80,7 @@ def setup(self):
             shooting_inputs = []
 
         self.add_subsystem(
-            "eoms",
+            "ascent_eom",
             AscentEOM(num_nodes=nn,
                       analysis_scheme=analysis_scheme),
             promotes_inputs=[
diff --git a/aviary/mission/gasp_based/ode/breguet_cruise_ode.py b/aviary/mission/gasp_based/ode/breguet_cruise_ode.py
index 552589cab..b1954de8f 100644
--- a/aviary/mission/gasp_based/ode/breguet_cruise_ode.py
+++ b/aviary/mission/gasp_based/ode/breguet_cruise_ode.py
@@ -124,7 +124,7 @@ def setup(self):
         # collect initial/final outputs
         #
         self.add_subsystem(
-            "eom",
+            "breguet_eom",
             RangeComp(num_nodes=nn),
             promotes_inputs=[
                 ("cruise_distance_initial", "initial_distance"),
diff --git a/aviary/mission/gasp_based/ode/climb_ode.py b/aviary/mission/gasp_based/ode/climb_ode.py
index 5e13108cc..ca9697001 100644
--- a/aviary/mission/gasp_based/ode/climb_ode.py
+++ b/aviary/mission/gasp_based/ode/climb_ode.py
@@ -180,7 +180,7 @@ def setup(self):
         lift_balance_group.linear_solver = om.DirectSolver(assemble_jac=True)
 
         lift_balance_group.add_subsystem(
-            "eom",
+            "climb_eom",
             ClimbRates(
                 num_nodes=nn,
                 analysis_scheme=analysis_scheme),
diff --git a/aviary/mission/gasp_based/ode/descent_ode.py b/aviary/mission/gasp_based/ode/descent_ode.py
index c94a55ec7..fa117f639 100644
--- a/aviary/mission/gasp_based/ode/descent_ode.py
+++ b/aviary/mission/gasp_based/ode/descent_ode.py
@@ -13,7 +13,6 @@
 from aviary.mission.gasp_based.ode.constraints.flight_constraints import \
     FlightConstraints
 from aviary.mission.gasp_based.ode.constraints.speed_constraints import SpeedConstraints
-from aviary.mission.gasp_based.ode.descent_eom import DescentRates
 
 from aviary.variable_info.enums import AnalysisScheme, SpeedType
 from aviary.variable_info.variables import Dynamic
@@ -170,7 +169,7 @@ def setup(self):
         lift_balance_group.linear_solver = om.DirectSolver(assemble_jac=True)
 
         lift_balance_group.add_subsystem(
-            "eom",
+            "descent_eom",
             DescentRates(
                 num_nodes=nn,
                 analysis_scheme=analysis_scheme),
diff --git a/aviary/mission/gasp_based/ode/flight_path_ode.py b/aviary/mission/gasp_based/ode/flight_path_ode.py
index 6abc1ff90..838693eba 100644
--- a/aviary/mission/gasp_based/ode/flight_path_ode.py
+++ b/aviary/mission/gasp_based/ode/flight_path_ode.py
@@ -189,7 +189,7 @@ def setup(self):
                                     atol=1e-8, print_level=print_level)
 
         self.add_subsystem(
-            "eoms",
+            "flight_path_eom",
             FlightPathEOM(
                 num_nodes=nn,
                 ground_roll=self.options['ground_roll'],
@@ -205,7 +205,7 @@ def setup(self):
         )
 
         if not self.options['ground_roll']:
-            self.promotes('eoms', outputs=[
+            self.promotes('flight_path_eom', outputs=[
                           Dynamic.Mission.ALTITUDE_RATE, Dynamic.Mission.FLIGHT_PATH_ANGLE_RATE])
 
         self.add_excess_rate_comps(nn)
@@ -261,7 +261,7 @@ def setup(self):
                 'core_aerodynamics',
                 'alpha_comp',
                 'prop_group',
-                'eoms',
+                'flight_path_eom',
                 'mass_trigger',
                 'SPECIFIC_ENERGY_RATE_EXCESS',
                 'ALTITUDE_RATE_MAX',
diff --git a/aviary/mission/gasp_based/ode/groundroll_ode.py b/aviary/mission/gasp_based/ode/groundroll_ode.py
index 15b2d6f35..bb9700dea 100644
--- a/aviary/mission/gasp_based/ode/groundroll_ode.py
+++ b/aviary/mission/gasp_based/ode/groundroll_ode.py
@@ -58,7 +58,7 @@ def setup(self):
                     src_indices=np.zeros(nn, dtype=int),
                 )
 
-        self.add_subsystem("eoms", GroundrollEOM(num_nodes=nn, analysis_scheme=analysis_scheme),
+        self.add_subsystem("groundroll_eom", GroundrollEOM(num_nodes=nn, analysis_scheme=analysis_scheme),
                            promotes=["*"])
 
         self.add_subsystem("exec", om.ExecComp(f"over_a = velocity / velocity_rate",
diff --git a/aviary/mission/gasp_based/ode/rotation_ode.py b/aviary/mission/gasp_based/ode/rotation_ode.py
index f2b32e2a7..f739ce825 100644
--- a/aviary/mission/gasp_based/ode/rotation_ode.py
+++ b/aviary/mission/gasp_based/ode/rotation_ode.py
@@ -60,7 +60,7 @@ def setup(self):
                                promotes_outputs=["alpha"],
                                )
 
-        self.add_subsystem("eoms", RotationEOM(
+        self.add_subsystem("rotation_eom", RotationEOM(
             num_nodes=nn, analysis_scheme=analysis_scheme), promotes=["*"])
 
         ParamPort.set_default_vals(self)