diff --git a/Samples/Sample XML/StudentEnrollment.xml b/Samples/Sample XML/StudentEnrollment.xml
index 3d5603c..4c19d09 100644
--- a/Samples/Sample XML/StudentEnrollment.xml	
+++ b/Samples/Sample XML/StudentEnrollment.xml	
@@ -301,9 +301,9 @@
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
+		<SchoolChoice>1</SchoolChoice>
 		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#Federal</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
-		<SchoolChoice>1</SchoolChoice>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -1079,7 +1079,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1100,7 +1100,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1121,7 +1121,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1142,7 +1142,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1163,7 +1163,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1184,7 +1184,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1205,7 +1205,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1226,7 +1226,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1247,7 +1247,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1268,7 +1268,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1289,7 +1289,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1310,7 +1310,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1331,7 +1331,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1352,7 +1352,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1373,7 +1373,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1394,7 +1394,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1415,7 +1415,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1436,7 +1436,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1457,7 +1457,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1478,7 +1478,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>1</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1499,7 +1499,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>0</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1520,7 +1520,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>0</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1541,7 +1541,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>0</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1562,7 +1562,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>0</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1583,7 +1583,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>0</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1604,7 +1604,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>0</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1625,7 +1625,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>0</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1646,7 +1646,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>0</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1667,7 +1667,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>0</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Preregistered</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1688,7 +1688,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Sixth grade</NextYearGradeLevel>
 		<SchoolChoice>0</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Summer</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1709,7 +1709,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Second grade</NextYearGradeLevel>
 		<SchoolChoice>0</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Summer</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1730,7 +1730,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Second grade</NextYearGradeLevel>
 		<SchoolChoice>0</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Summer</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1751,7 +1751,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Second grade</NextYearGradeLevel>
 		<SchoolChoice>0</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Summer</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1772,7 +1772,7 @@
 		<NextYearSchoolReference ref="SCOL_255901044"/>
 		<NextYearGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Second grade</NextYearGradeLevel>
 		<SchoolChoice>0</SchoolChoice>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 		<EnrollmentType>uri://ed-fi.org/EnrollmentTypeDescriptor#Summer</EnrollmentType>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
@@ -1790,7 +1790,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -1807,7 +1807,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -1824,7 +1824,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -1841,7 +1841,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -1858,7 +1858,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -1875,7 +1875,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -1892,7 +1892,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -1909,7 +1909,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -1926,7 +1926,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -1943,7 +1943,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -1960,7 +1960,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -1977,7 +1977,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -1994,7 +1994,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2011,7 +2011,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2028,7 +2028,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2045,7 +2045,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2062,7 +2062,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2079,7 +2079,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2096,7 +2096,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2113,7 +2113,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Recommended-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2130,7 +2130,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2147,7 +2147,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2164,7 +2164,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2181,7 +2181,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2198,7 +2198,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2215,7 +2215,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2232,7 +2232,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2249,7 +2249,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2266,7 +2266,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2283,7 +2283,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Recommended-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2300,7 +2300,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2317,7 +2317,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2334,7 +2334,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2351,7 +2351,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2368,7 +2368,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2385,7 +2385,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2402,7 +2402,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2419,7 +2419,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2436,7 +2436,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2453,7 +2453,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2470,7 +2470,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2487,7 +2487,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2504,7 +2504,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Recommended-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2521,7 +2521,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2538,7 +2538,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2555,7 +2555,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2572,7 +2572,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2589,7 +2589,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2606,7 +2606,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>0.75</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2623,7 +2623,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2640,7 +2640,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2657,7 +2657,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2674,7 +2674,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2691,7 +2691,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2708,7 +2708,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2725,7 +2725,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2742,7 +2742,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Recommended-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2759,7 +2759,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2776,7 +2776,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2793,7 +2793,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2810,7 +2810,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2827,7 +2827,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2844,7 +2844,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2861,7 +2861,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Recommended-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2878,7 +2878,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>0.5</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2895,7 +2895,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2912,7 +2912,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2929,7 +2929,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2946,7 +2946,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2963,7 +2963,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2980,7 +2980,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Recommended-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -2997,7 +2997,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3014,7 +3014,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>0.75</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3031,7 +3031,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3048,7 +3048,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Recommended-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3065,7 +3065,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#First grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBES"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3082,7 +3082,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBHS"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3099,7 +3099,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBHS"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3116,7 +3116,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Recommended-GBHS"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3133,7 +3133,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBHS"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3150,7 +3150,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBHS"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3167,7 +3167,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBHS"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3184,7 +3184,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Recommended-GBHS"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3201,7 +3201,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBHS"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3218,7 +3218,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Recommended-GBHS"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3235,7 +3235,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBHS"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3252,7 +3252,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBHS"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3269,7 +3269,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBHS"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3286,7 +3286,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Recommended-GBHS"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3303,7 +3303,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBHS"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3320,7 +3320,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBHS"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3337,7 +3337,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBHS"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>
@@ -3354,7 +3354,7 @@
 		<EntryGradeLevel>uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade</EntryGradeLevel>
 		<GraduationPlanReference ref="GPLN_Minimum-GBHS"/>
 		<FullTimeEquivalency>1.00</FullTimeEquivalency>
-		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NLB Choice</SchoolChoiceBasis>
+		<SchoolChoiceBasis>uri://ed-fi.org/SchoolChoiceBasisDescriptor#NCLB choice</SchoolChoiceBasis>
 	</StudentSchoolAssociation>
 	<StudentSchoolAssociation>
 		<StudentReference>