Merge pull request #1581 from PolicyEngine/codex/capital-limit-label-cleanup

MaxGhenis · web-flow · commit 3aa33798c683 · 2026-04-12T09:13:14.000-04:00
Rename capital threshold labels to capital limits
diff --git a/policyengine_uk/parameters/gov/dwp/housing_benefit/means_test/capital/pension_age/limit.yaml b/policyengine_uk/parameters/gov/dwp/housing_benefit/means_test/capital/pension_age/limit.yaml
@@ -1,6 +1,6 @@
-description: Pension-age Housing Benefit upper capital threshold.
+description: Pension-age Housing Benefit capital limit.
 metadata:
-  label: Pension-age Housing Benefit upper capital threshold
+  label: Pension-age Housing Benefit capital limit
   period: year
   unit: currency-GBP
   reference:
diff --git a/policyengine_uk/parameters/gov/dwp/housing_benefit/means_test/capital/pension_age/tariff_income/threshold.yaml b/policyengine_uk/parameters/gov/dwp/housing_benefit/means_test/capital/pension_age/tariff_income/threshold.yaml
@@ -1,6 +1,6 @@
-description: Standard pension-age Housing Benefit lower capital threshold.
+description: Standard pension-age Housing Benefit tariff income threshold.
 metadata:
-  label: Pension-age Housing Benefit lower capital threshold
+  label: Pension-age Housing Benefit tariff income threshold
   period: year
   unit: currency-GBP
   reference:
diff --git a/policyengine_uk/parameters/gov/dwp/housing_benefit/means_test/capital/working_age/limit.yaml b/policyengine_uk/parameters/gov/dwp/housing_benefit/means_test/capital/working_age/limit.yaml
@@ -1,6 +1,6 @@
-description: Standard working-age Housing Benefit upper capital threshold.
+description: Standard working-age Housing Benefit capital limit.
 metadata:
-  label: Working-age Housing Benefit upper capital threshold
+  label: Working-age Housing Benefit capital limit
   period: year
   unit: currency-GBP
   reference:
diff --git a/policyengine_uk/parameters/gov/dwp/housing_benefit/means_test/capital/working_age/tariff_income/threshold.yaml b/policyengine_uk/parameters/gov/dwp/housing_benefit/means_test/capital/working_age/tariff_income/threshold.yaml
@@ -1,6 +1,6 @@
-description: Standard working-age Housing Benefit lower capital threshold.
+description: Standard working-age Housing Benefit tariff income threshold.
 metadata:
-  label: Working-age Housing Benefit lower capital threshold
+  label: Working-age Housing Benefit tariff income threshold
   period: year
   unit: currency-GBP
   reference:
diff --git a/policyengine_uk/parameters/gov/dwp/income_support/means_test/capital/limit.yaml b/policyengine_uk/parameters/gov/dwp/income_support/means_test/capital/limit.yaml
@@ -1,6 +1,6 @@
-description: Upper capital threshold for Income Support eligibility.
+description: Capital limit for Income Support eligibility.
 metadata:
-  label: Income Support upper capital threshold
+  label: Income Support capital limit
   period: year
   reference:
     - title: Income Support (General) Regulations 1987 reg. 45
diff --git a/policyengine_uk/parameters/gov/dwp/income_support/means_test/capital/tariff_income/threshold.yaml b/policyengine_uk/parameters/gov/dwp/income_support/means_test/capital/tariff_income/threshold.yaml
@@ -1,6 +1,6 @@
-description: Lower capital threshold for Income Support tariff income.
+description: Capital threshold for Income Support tariff income.
 metadata:
-  label: Income Support lower capital threshold
+  label: Income Support tariff income threshold
   period: year
   reference:
     - title: Income Support (General) Regulations 1987 reg. 53(1)
diff --git a/policyengine_uk/parameters/gov/dwp/universal_credit/means_test/capital/limit.yaml b/policyengine_uk/parameters/gov/dwp/universal_credit/means_test/capital/limit.yaml
@@ -1,8 +1,8 @@
-description: Universal Credit upper capital threshold.
+description: Universal Credit capital limit.
 values:
   2013-04-29: 16_000
 metadata:
-  label: Universal Credit upper capital threshold
+  label: Universal Credit capital limit
   period: year
   unit: currency-GBP
   reference:
diff --git a/policyengine_uk/parameters/gov/dwp/universal_credit/means_test/capital/tariff_income/threshold.yaml b/policyengine_uk/parameters/gov/dwp/universal_credit/means_test/capital/tariff_income/threshold.yaml
@@ -1,8 +1,8 @@
-description: Universal Credit lower capital threshold.
+description: Universal Credit tariff income threshold.
 values:
   2013-04-29: 6_000
 metadata:
-  label: Universal Credit lower capital threshold
+  label: Universal Credit tariff income threshold
   period: year
   unit: currency-GBP
   reference:
diff --git a/policyengine_uk/variables/gov/dwp/housing_benefit/applicable_income/housing_benefit_tariff_income.py b/policyengine_uk/variables/gov/dwp/housing_benefit/applicable_income/housing_benefit_tariff_income.py
@@ -14,10 +14,10 @@ def formula(benunit, period, parameters):
         any_over_SP_age = benunit.any(benunit.members("is_SP_age", period))
         guarantee_credit = any_over_SP_age & (benunit("guarantee_credit", period) > 0)
         p = parameters(period).gov.dwp.housing_benefit.means_test.capital
-        lower_threshold = where(
+        threshold = where(
             any_over_SP_age,
-            p.pension_age.lower_threshold,
-            p.working_age.lower_threshold,
+            p.pension_age.tariff_income.threshold,
+            p.working_age.tariff_income.threshold,
         )
         step = where(
             any_over_SP_age,
@@ -29,7 +29,7 @@ def formula(benunit, period, parameters):
             p.pension_age.tariff_income.amount,
             p.working_age.tariff_income.amount,
         )
-        excess_capital = max_(0, capital - lower_threshold)
+        excess_capital = max_(0, capital - threshold)
         steps = np.ceil(excess_capital / step)
         tariff_income = steps * amount * WEEKS_IN_YEAR
         return where(guarantee_credit, 0, tariff_income)
diff --git a/policyengine_uk/variables/gov/dwp/housing_benefit/housing_benefit_eligible.py b/policyengine_uk/variables/gov/dwp/housing_benefit/housing_benefit_eligible.py
@@ -15,14 +15,14 @@ def formula(benunit, period, parameters):
         any_over_SP_age = benunit.any(benunit.members("is_SP_age", period))
         capital = benunit("housing_benefit_assessable_capital", period)
         hb_capital = parameters(period).gov.dwp.housing_benefit.means_test.capital
-        upper_threshold = where(
+        limit = where(
             any_over_SP_age,
-            hb_capital.pension_age.upper_threshold,
-            hb_capital.working_age.upper_threshold,
+            hb_capital.pension_age.limit,
+            hb_capital.working_age.limit,
         )
         return (
             already_claiming
             & (social | lha_eligible)
             & ~claiming_uc
-            & (capital <= upper_threshold)
+            & (capital <= limit)
         )
diff --git a/policyengine_uk/variables/gov/dwp/income_support_eligible.py b/policyengine_uk/variables/gov/dwp/income_support_eligible.py
@@ -17,11 +17,11 @@ def formula(benunit, period, parameters):
         has_esa_income = benunit("esa_income", period) > 0
         already_claiming = add(benunit, period, ["income_support_reported"]) > 0
         capital = benunit("income_support_assessable_capital", period)
-        capital_limit = IS.means_test.capital.upper_threshold
+        limit = IS.means_test.capital.limit
         return (
             (has_carers | lone_parent_with_young_child)
             & none_SP_age
             & ~has_esa_income
             & already_claiming
-            & (capital <= capital_limit)
+            & (capital <= limit)
         )
diff --git a/policyengine_uk/variables/gov/dwp/income_support_tariff_income.py b/policyengine_uk/variables/gov/dwp/income_support_tariff_income.py
@@ -13,6 +13,6 @@ def formula(benunit, period, parameters):
         IS = parameters(period).gov.dwp.income_support
         capital = benunit("income_support_assessable_capital", period)
         mt = IS.means_test.capital
-        excess_capital = max_(0, capital - mt.lower_threshold)
+        excess_capital = max_(0, capital - mt.tariff_income.threshold)
         tariff_units = np.ceil(excess_capital / mt.tariff_income.step)
         return tariff_units * mt.tariff_income.amount * WEEKS_IN_YEAR
diff --git a/policyengine_uk/variables/gov/dwp/universal_credit/income/uc_tariff_income.py b/policyengine_uk/variables/gov/dwp/universal_credit/income/uc_tariff_income.py
@@ -13,6 +13,6 @@ class uc_tariff_income(Variable):
     def formula(benunit, period, parameters):
         capital = benunit("uc_assessable_capital", period)
         p = parameters(period).gov.dwp.universal_credit.means_test.capital
-        excess_capital = max_(0, capital - p.lower_threshold)
+        excess_capital = max_(0, capital - p.tariff_income.threshold)
         steps = np.ceil(excess_capital / p.tariff_income.step)
         return steps * p.tariff_income.amount * MONTHS_IN_YEAR
diff --git a/policyengine_uk/variables/gov/dwp/universal_credit/is_uc_eligible.py b/policyengine_uk/variables/gov/dwp/universal_credit/is_uc_eligible.py
@@ -10,8 +10,6 @@ class is_uc_eligible(Variable):
 
     def formula(benunit, period, parameters):
         capital = benunit("uc_assessable_capital", period)
-        upper_threshold = parameters(
-            period
-        ).gov.dwp.universal_credit.means_test.capital.upper_threshold
+        limit = parameters(period).gov.dwp.universal_credit.means_test.capital.limit
         has_working_age_adult = benunit.any(benunit.members("is_WA_adult", period))
-        return has_working_age_adult & (capital <= upper_threshold)
+        return has_working_age_adult & (capital <= limit)
