diff --git a/scripts/units_dispatch_profile.jl b/scripts/units_dispatch_profile.jl
index 3ef6340f..0aa20730 100644
--- a/scripts/units_dispatch_profile.jl
+++ b/scripts/units_dispatch_profile.jl
@@ -75,13 +75,13 @@ function make_container(devices)
 end
 
 # Build N components, evenly distributed across the 3 unit systems. The cost
-# *curves* are concretely typed (CostCurve{LinearCurve, NaturalUnit/SU/DU}) but
+# *curves* are concretely typed (CostCurve{LinearCurve, NaturalUnit/SU/CU}) but
 # the abstractly-typed `MockThermalGen` storage means upstream callers see a
 # UnionAll. This is the realistic shape of consuming code.
 function make_workload()
     devices = MockThermalGen[]
     curves = Any[]  # heterogeneous on U, simulates abstract field upstream
-    units = (IS.NaturalUnit(), IS.SystemBaseUnit(), IS.DeviceBaseUnit())
+    units = (IS.NaturalUnit(), IS.SystemBaseUnit(), IS.ComponentBaseUnit())
     for i in 1:N_COMPONENTS
         u = units[mod1(i, 3)]
         push!(devices, make_mock_thermal("g$i"; base_power = 50.0 + i))
diff --git a/test/test_linear_curve.jl b/test/test_linear_curve.jl
index 0443fd7d..8398b30a 100644
--- a/test/test_linear_curve.jl
+++ b/test/test_linear_curve.jl
@@ -232,7 +232,7 @@ end
             # Cost: 30 $/p.u.h in device base units
             cost_curve = IS.CostCurve(
                 IS.LinearCurve(30.0),
-                IS.DeviceBaseUnit(),
+                IS.ComponentBaseUnit(),
             )
 
             InfrastructureOptimizationModels.add_variable_cost_to_objective!(
@@ -312,7 +312,7 @@ end
             ),
             DEVICE_BASE = IS.CostCurve(
                 IS.LinearCurve(rate * device_base),
-                IS.DeviceBaseUnit(),
+                IS.ComponentBaseUnit(),
             ),
         )
 
diff --git a/test/test_quadratic_curve.jl b/test/test_quadratic_curve.jl
index 48aefb81..cf0b33e1 100644
--- a/test/test_quadratic_curve.jl
+++ b/test/test_quadratic_curve.jl
@@ -318,7 +318,7 @@ end
 
             cost_curve = IS.CostCurve(
                 IS.QuadraticCurve(1.0, 20.0, 0.0),
-                IS.DeviceBaseUnit(),
+                IS.ComponentBaseUnit(),
             )
 
             InfrastructureOptimizationModels.add_variable_cost_to_objective!(
@@ -404,7 +404,7 @@ end
             ),
             DEVICE_BASE = IS.CostCurve(
                 IS.QuadraticCurve(a * device_base^2, b * device_base, 0.0),
-                IS.DeviceBaseUnit(),
+                IS.ComponentBaseUnit(),
             ),
         )
 
diff --git a/test/test_ts_value_curve_objective.jl b/test/test_ts_value_curve_objective.jl
index b835c5ee..0d8b3103 100644
--- a/test/test_ts_value_curve_objective.jl
+++ b/test/test_ts_value_curve_objective.jl
@@ -351,7 +351,7 @@ end
         for (unit_system, expected_slope_factor, expected_bp_factor) in [
             (IS.NaturalUnit(), system_base, 1.0 / system_base),
             (
-                IS.DeviceBaseUnit(),
+                IS.ComponentBaseUnit(),
                 1.0 / (device_base / system_base),
                 device_base / system_base,
             ),