diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 3efb87d48..5c4959af4 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -427,7 +427,7 @@ class PowerPort(CableTermination, ComponentModel):
                 cursor.execute(QUERY_POWER_DRAW, [self.pk])
 
                 # Maximum number of power feeds + the global one
-                results = cursor.fetchmany(len(POWERFEED_LEG_CHOICES) + 1)
+                results = cursor.fetchmany(len(PowerOutletFeedLegChoices.CHOICES) + 1)
 
             # Global results
             allocated_draw_total, maximum_draw_total = get_power_feed_stats(None, results)
@@ -439,8 +439,8 @@ class PowerPort(CableTermination, ComponentModel):
             }
 
             # Calculate per-leg aggregates for three-phase feeds
-            if self._connected_powerfeed and self._connected_powerfeed.phase == POWERFEED_PHASE_3PHASE:
-                for leg, leg_name in POWERFEED_LEG_CHOICES:
+            if self._connected_powerfeed and self._connected_powerfeed.phase == PowerFeedPhaseChoices.PHASE_3PHASE:
+                for leg, leg_name in PowerOutletFeedLegChoices.CHOICES:
                     allocated_draw_total, maximum_draw_total = get_power_feed_stats(leg, results)
                     ret['legs'].append({
                         'name': leg_name,
diff --git a/netbox/dcim/tests/test_models.py b/netbox/dcim/tests/test_models.py
index 583176949..b059063f1 100644
--- a/netbox/dcim/tests/test_models.py
+++ b/netbox/dcim/tests/test_models.py
@@ -572,7 +572,7 @@ class PowerCalculationTestCase(TestCase):
         self.power_feed = PowerFeed.objects.create(
             name='Power Feed 1',
             power_panel=power_panel,
-            phase=POWERFEED_PHASE_3PHASE
+            phase=PowerFeedPhaseChoices.PHASE_3PHASE
         )
         self.power_port1 = PowerPort.objects.create(device=self.device1, name='Power Port 1')
         Cable.objects.create(termination_a=self.power_port1, termination_b=self.power_feed)
@@ -582,7 +582,7 @@ class PowerCalculationTestCase(TestCase):
             device=self.device1,
             name='Power Outlet 12',
             power_port=self.power_port1,
-            feed_leg=POWERFEED_LEG_A,
+            feed_leg=PowerOutletFeedLegChoices.FEED_LEG_A,
         )
         self.power_port21 = PowerPort.objects.create(
             device=self.device2,
@@ -597,7 +597,7 @@ class PowerCalculationTestCase(TestCase):
             device=self.device1,
             name='Power Outlet 13',
             power_port=self.power_port1,
-            feed_leg=POWERFEED_LEG_B,
+            feed_leg=PowerOutletFeedLegChoices.FEED_LEG_B,
         )
         self.power_port31 = PowerPort.objects.create(
             device=self.device3,