From 2e9ebc01fa7fecc9fa5a6f7ac130a5f46a40988d Mon Sep 17 00:00:00 2001
From: Thomas Dacey <DaceyTom2@gmail.com>
Date: Wed, 19 Aug 2020 11:31:40 -0400
Subject: [PATCH] Updated variable names

---
 .../tests/benefitfinder/cesb/cesb.yaml        | 118 +++++++++---------
 .../benefitfinder/cesb/student_status.py      |   4 +-
 2 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/openfisca_canada/tests/benefitfinder/cesb/cesb.yaml b/openfisca_canada/tests/benefitfinder/cesb/cesb.yaml
index 578e2358..b2d59f3a 100644
--- a/openfisca_canada/tests/benefitfinder/cesb/cesb.yaml
+++ b/openfisca_canada/tests/benefitfinder/cesb/cesb.yaml
@@ -1,61 +1,61 @@
-name: "is student 2019-2020"
-period: "2020-08"
-absolute_error_margin: 0
-input: 
-  persons:
-    student_1:
-      cesb__student_lost_job: true
-      cesb__has_no_income_before: false
-    student_2:
-      cesb__student_lost_job: false
-      cesb__has_no_income_before: true
-    student_3:
-      cesb__student_lost_job: false
-      cesb__has_no_income_before: false
-    student_4:
-      cesb__student_lost_job: true
-      cesb__has_no_income_before: true
-output:
-  cesb__is_student_2019_2020:
-    - true
-    - true
-    - false
-    - true
+- name: "is student 2019-2020"
+  period: "2020-08"
+  absolute_error_margin: 0
+  input: 
+    persons:
+      student_1:
+        cesb__student_lost_job: true
+        cesb__has_no_income_before: false
+      student_2:
+        cesb__student_lost_job: false
+        cesb__has_no_income_before: true
+      student_3:
+        cesb__student_lost_job: false
+        cesb__has_no_income_before: false
+      student_4:
+        cesb__student_lost_job: true
+        cesb__has_no_income_before: true
+  output:
+    cesb__is_student_2019_2020:
+      - true
+      - true
+      - false
+      - true
 
-name: "is high school grad"
-period: "2020-08"
-absolute_error_margin: 0
-input: 
-  persons:
-    student_1:
-      cesb__has_no_income_before: false
-    student_2:
-      cesb__has_no_income_before: true
-output:
-  cesb__is_high_school_grad: 
-    - false
-    - true
+- name: "is high school grad"
+  period: "2020-08"
+  absolute_error_margin: 0
+  input: 
+    persons:
+      student_1:
+        cesb__has_no_income_before: false
+      student_2:
+        cesb__has_no_income_before: true
+  output:
+    cesb__is_high_school_grad: 
+      - false
+      - true
 
-name: "is cesb benefit eligible"
-period: "2020-08"
-absolute_error_margin: 0
-input: 
-  persons:
-    student_1:
-      cesb__is_student_2019_2020: true
-      cesb__is_high_school_grad: false
-    student_2:
-      cesb__is_student_2019_2020: true
-      cesb__is_high_school_grad: false
-    student_3:
-      cesb__is_student_2019_2020: true
-      cesb__is_high_school_grad: true
-    student_4:
-      cesb__is_student_2019_2020: false
-      cesb__is_high_school_grad: false
-output:
-  cesb__is_eligible:
-    - true
-    - true
-    - true
-    - false
\ No newline at end of file
+- name: "is cesb benefit eligible"
+  period: "2020-08"
+  absolute_error_margin: 0
+  input: 
+    persons:
+      student_1:
+        cesb__is_student_2019_2020: true
+        cesb__is_high_school_grad: false
+      student_2:
+        cesb__is_student_2019_2020: true
+        cesb__is_high_school_grad: false
+      student_3:
+        cesb__is_student_2019_2020: true
+        cesb__is_high_school_grad: true
+      student_4:
+        cesb__is_student_2019_2020: false
+        cesb__is_high_school_grad: false
+  output:
+    cesb__is_eligible:
+      - true
+      - true
+      - true
+      - false
\ No newline at end of file
diff --git a/openfisca_canada/variables/benefitfinder/cesb/student_status.py b/openfisca_canada/variables/benefitfinder/cesb/student_status.py
index c1443db0..f0f6cda7 100644
--- a/openfisca_canada/variables/benefitfinder/cesb/student_status.py
+++ b/openfisca_canada/variables/benefitfinder/cesb/student_status.py
@@ -10,7 +10,7 @@ class cesb__is_student_2019_2020(Variable):
     definition_period = MONTH
 
     def formula(persons, period, parameters):
-        return persons("student_lost_job", period) + persons("has_no_income_before", period)
+        return persons("cesb__student_lost_job", period) + persons("cesb__has_no_income_before", period)
 
 class cesb__is_high_school_grad(Variable):
     value_type = bool
@@ -19,7 +19,7 @@ class cesb__is_high_school_grad(Variable):
     label = u"Is graduating from high school in the year of 2019-2020"
 
     def formula(persons, period, parameters):
-        return persons("has_no_income_before", period)
+        return persons("cesb__has_no_income_before", period)
     
 class cesb__student_lost_job(Variable):
     value_type = bool