diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
index 9400af4ae3..f8d1f92c41 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -15,7 +15,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.NameAggregate.Homograph.Name" table="Name" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.NameAggregate.Homograph.Name" table="Name" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="FirstName" column="FirstName" type="string" length="75" />
@@ -59,7 +59,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ParentAggregate.Homograph.Parent" table="Parent" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ParentAggregate.Homograph.Parent" table="Parent" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ParentFirstName" column="ParentFirstName" type="string" length="75" />
@@ -178,7 +178,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SchoolAggregate.Homograph.School" table="School" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SchoolAggregate.Homograph.School" table="School" lazy="false" schema="homograph" discriminator-value="null">
     <id name="SchoolName" column="SchoolName" type="string" length="100">
       <generator class="assigned" />
     </id>
@@ -254,7 +254,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SchoolYearTypeAggregate.Homograph.SchoolYearType" table="SchoolYearType" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SchoolYearTypeAggregate.Homograph.SchoolYearType" table="SchoolYearType" lazy="false" schema="homograph" discriminator-value="null">
     <id name="SchoolYear" column="SchoolYear" type="string" length="20">
       <generator class="assigned" />
     </id>
@@ -296,7 +296,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffAggregate.Homograph.Staff" table="Staff" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffAggregate.Homograph.Staff" table="Staff" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="StaffFirstName" column="StaffFirstName" type="string" length="75" />
@@ -417,7 +417,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAggregate.Homograph.Student" table="Student" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAggregate.Homograph.Student" table="Student" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="StudentFirstName" column="StudentFirstName" type="string" length="75" />
@@ -504,7 +504,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAssociationAggregate.Homograph.StudentSchoolAssociation" table="StudentSchoolAssociation" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAssociationAggregate.Homograph.StudentSchoolAssociation" table="StudentSchoolAssociation" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolName" column="SchoolName" type="string" length="100" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
index 9400af4ae3..f8d1f92c41 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -15,7 +15,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.NameAggregate.Homograph.Name" table="Name" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.NameAggregate.Homograph.Name" table="Name" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="FirstName" column="FirstName" type="string" length="75" />
@@ -59,7 +59,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ParentAggregate.Homograph.Parent" table="Parent" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ParentAggregate.Homograph.Parent" table="Parent" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ParentFirstName" column="ParentFirstName" type="string" length="75" />
@@ -178,7 +178,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SchoolAggregate.Homograph.School" table="School" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SchoolAggregate.Homograph.School" table="School" lazy="false" schema="homograph" discriminator-value="null">
     <id name="SchoolName" column="SchoolName" type="string" length="100">
       <generator class="assigned" />
     </id>
@@ -254,7 +254,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SchoolYearTypeAggregate.Homograph.SchoolYearType" table="SchoolYearType" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SchoolYearTypeAggregate.Homograph.SchoolYearType" table="SchoolYearType" lazy="false" schema="homograph" discriminator-value="null">
     <id name="SchoolYear" column="SchoolYear" type="string" length="20">
       <generator class="assigned" />
     </id>
@@ -296,7 +296,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffAggregate.Homograph.Staff" table="Staff" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffAggregate.Homograph.Staff" table="Staff" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="StaffFirstName" column="StaffFirstName" type="string" length="75" />
@@ -417,7 +417,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAggregate.Homograph.Student" table="Student" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAggregate.Homograph.Student" table="Student" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="StudentFirstName" column="StudentFirstName" type="string" length="75" />
@@ -504,7 +504,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAssociationAggregate.Homograph.StudentSchoolAssociation" table="StudentSchoolAssociation" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAssociationAggregate.Homograph.StudentSchoolAssociation" table="StudentSchoolAssociation" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolName" column="SchoolName" type="string" length="100" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
index fdb9c355ee..74fc2aaf13 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -13,7 +13,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.BusAggregate.Sample.Bus" table="Bus" lazy="false" schema="sample" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.BusAggregate.Sample.Bus" table="Bus" lazy="false" schema="sample" discriminator-value="null">
     <id name="BusId" column="BusId" type="string" length="60">
       <generator class="assigned" />
     </id>
@@ -55,7 +55,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.BusRouteAggregate.Sample.BusRoute" table="BusRoute" lazy="false" schema="sample" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.BusRouteAggregate.Sample.BusRoute" table="BusRoute" lazy="false" schema="sample" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BusId" column="BusId" type="string" length="60" />
@@ -1268,7 +1268,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentGraduationPlanAssociationAggregate.Sample.StudentGraduationPlanAssociation" table="StudentGraduationPlanAssociation" lazy="false" schema="sample" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentGraduationPlanAssociationAggregate.Sample.StudentGraduationPlanAssociation" table="StudentGraduationPlanAssociation" lazy="false" schema="sample" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
index 78ddead365..dcd5903d01 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -13,7 +13,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.BusAggregate.Sample.Bus" table="Bus" lazy="false" schema="sample" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.BusAggregate.Sample.Bus" table="Bus" lazy="false" schema="sample" discriminator-value="null">
     <id name="BusId" column="BusId" type="string" length="60">
       <generator class="assigned" />
     </id>
@@ -55,7 +55,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.BusRouteAggregate.Sample.BusRoute" table="BusRoute" lazy="false" schema="sample" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.BusRouteAggregate.Sample.BusRoute" table="BusRoute" lazy="false" schema="sample" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BusId" column="BusId" type="string" length="60" />
@@ -1268,7 +1268,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentGraduationPlanAssociationAggregate.Sample.StudentGraduationPlanAssociation" table="StudentGraduationPlanAssociation" lazy="false" schema="sample" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentGraduationPlanAssociationAggregate.Sample.StudentGraduationPlanAssociation" table="StudentGraduationPlanAssociation" lazy="false" schema="sample" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.SampleStudentTranscript.1.0.0_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.SampleStudentTranscript.1.0.0_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
index 2301c7b99e..2968f4dcd4 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.SampleStudentTranscript.1.0.0_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.SampleStudentTranscript.1.0.0_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -13,7 +13,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PostSecondaryOrganizationAggregate.SampleStudentTranscript.PostSecondaryOrganization" table="PostSecondaryOrganization" lazy="false" schema="samplestudenttranscript" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PostSecondaryOrganizationAggregate.SampleStudentTranscript.PostSecondaryOrganization" table="PostSecondaryOrganization" lazy="false" schema="samplestudenttranscript" discriminator-value="null">
     <id name="NameOfInstitution" column="NameOfInstitution" type="string" length="75">
       <generator class="assigned" />
     </id>
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.SampleStudentTranscript.1.0.0_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.SampleStudentTranscript.1.0.0_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
index 2301c7b99e..2968f4dcd4 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.SampleStudentTranscript.1.0.0_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.SampleStudentTranscript.1.0.0_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -13,7 +13,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PostSecondaryOrganizationAggregate.SampleStudentTranscript.PostSecondaryOrganization" table="PostSecondaryOrganization" lazy="false" schema="samplestudenttranscript" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PostSecondaryOrganizationAggregate.SampleStudentTranscript.PostSecondaryOrganization" table="PostSecondaryOrganization" lazy="false" schema="samplestudenttranscript" discriminator-value="null">
     <id name="NameOfInstitution" column="NameOfInstitution" type="string" length="75">
       <generator class="assigned" />
     </id>
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
index f43a353359..fb2aa10083 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -13,7 +13,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CandidateAggregate.TPDM.Candidate" table="Candidate" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CandidateAggregate.TPDM.Candidate" table="Candidate" lazy="false" schema="tpdm" discriminator-value="null">
     <id name="CandidateIdentifier" column="CandidateIdentifier" type="string" length="32">
       <generator class="assigned" />
     </id>
@@ -476,7 +476,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CandidateEducatorPreparationProgramAssociationAggregate.TPDM.CandidateEducatorPreparationProgramAssociation" table="CandidateEducatorPreparationProgramAssociation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CandidateEducatorPreparationProgramAssociationAggregate.TPDM.CandidateEducatorPreparationProgramAssociation" table="CandidateEducatorPreparationProgramAssociation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -690,7 +690,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducatorPreparationProgramAggregate.TPDM.EducatorPreparationProgram" table="EducatorPreparationProgram" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducatorPreparationProgramAggregate.TPDM.EducatorPreparationProgram" table="EducatorPreparationProgram" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -780,7 +780,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationAggregate.TPDM.Evaluation" table="Evaluation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationAggregate.TPDM.Evaluation" table="Evaluation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -894,7 +894,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationElementAggregate.TPDM.EvaluationElement" table="EvaluationElement" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationElementAggregate.TPDM.EvaluationElement" table="EvaluationElement" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -1018,7 +1018,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationElementRatingAggregate.TPDM.EvaluationElementRating" table="EvaluationElementRating" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationElementRatingAggregate.TPDM.EvaluationElementRating" table="EvaluationElementRating" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -1162,7 +1162,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationObjectiveAggregate.TPDM.EvaluationObjective" table="EvaluationObjective" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationObjectiveAggregate.TPDM.EvaluationObjective" table="EvaluationObjective" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -1282,7 +1282,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationObjectiveRatingAggregate.TPDM.EvaluationObjectiveRating" table="EvaluationObjectiveRating" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationObjectiveRatingAggregate.TPDM.EvaluationObjectiveRating" table="EvaluationObjectiveRating" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -1420,7 +1420,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationRatingAggregate.TPDM.EvaluationRating" table="EvaluationRating" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationRatingAggregate.TPDM.EvaluationRating" table="EvaluationRating" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -1667,7 +1667,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.FinancialAidAggregate.TPDM.FinancialAid" table="FinancialAid" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.FinancialAidAggregate.TPDM.FinancialAid" table="FinancialAid" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AidTypeDescriptorId" column="AidTypeDescriptorId" type="int" />
@@ -1723,7 +1723,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PerformanceEvaluationAggregate.TPDM.PerformanceEvaluation" table="PerformanceEvaluation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PerformanceEvaluationAggregate.TPDM.PerformanceEvaluation" table="PerformanceEvaluation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -1869,7 +1869,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PerformanceEvaluationRatingAggregate.TPDM.PerformanceEvaluationRating" table="PerformanceEvaluationRating" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PerformanceEvaluationRatingAggregate.TPDM.PerformanceEvaluationRating" table="PerformanceEvaluationRating" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -2097,7 +2097,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.RubricDimensionAggregate.TPDM.RubricDimension" table="RubricDimension" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.RubricDimensionAggregate.TPDM.RubricDimension" table="RubricDimension" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -2224,7 +2224,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponsePersonTargetAssociationAggregate.TPDM.SurveyResponsePersonTargetAssociation" table="SurveyResponsePersonTargetAssociation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponsePersonTargetAssociationAggregate.TPDM.SurveyResponsePersonTargetAssociation" table="SurveyResponsePersonTargetAssociation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -2284,7 +2284,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponsePersonTargetAssociationAggregate.TPDM.SurveySectionResponsePersonTargetAssociation" table="SurveySectionResponsePersonTargetAssociation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponsePersonTargetAssociationAggregate.TPDM.SurveySectionResponsePersonTargetAssociation" table="SurveySectionResponsePersonTargetAssociation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
index 18c956d2cc..d956467eee 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -13,7 +13,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CandidateAggregate.TPDM.Candidate" table="Candidate" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CandidateAggregate.TPDM.Candidate" table="Candidate" lazy="false" schema="tpdm" discriminator-value="null">
     <id name="CandidateIdentifier" column="CandidateIdentifier" type="string" length="32">
       <generator class="assigned" />
     </id>
@@ -476,7 +476,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CandidateEducatorPreparationProgramAssociationAggregate.TPDM.CandidateEducatorPreparationProgramAssociation" table="CandidateEducatorPreparationProgramAssociation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CandidateEducatorPreparationProgramAssociationAggregate.TPDM.CandidateEducatorPreparationProgramAssociation" table="CandidateEducatorPreparationProgramAssociation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -690,7 +690,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducatorPreparationProgramAggregate.TPDM.EducatorPreparationProgram" table="EducatorPreparationProgram" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducatorPreparationProgramAggregate.TPDM.EducatorPreparationProgram" table="EducatorPreparationProgram" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -780,7 +780,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationAggregate.TPDM.Evaluation" table="Evaluation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationAggregate.TPDM.Evaluation" table="Evaluation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -894,7 +894,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationElementAggregate.TPDM.EvaluationElement" table="EvaluationElement" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationElementAggregate.TPDM.EvaluationElement" table="EvaluationElement" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -1018,7 +1018,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationElementRatingAggregate.TPDM.EvaluationElementRating" table="EvaluationElementRating" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationElementRatingAggregate.TPDM.EvaluationElementRating" table="EvaluationElementRating" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -1162,7 +1162,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationObjectiveAggregate.TPDM.EvaluationObjective" table="EvaluationObjective" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationObjectiveAggregate.TPDM.EvaluationObjective" table="EvaluationObjective" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -1282,7 +1282,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationObjectiveRatingAggregate.TPDM.EvaluationObjectiveRating" table="EvaluationObjectiveRating" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationObjectiveRatingAggregate.TPDM.EvaluationObjectiveRating" table="EvaluationObjectiveRating" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -1420,7 +1420,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationRatingAggregate.TPDM.EvaluationRating" table="EvaluationRating" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationRatingAggregate.TPDM.EvaluationRating" table="EvaluationRating" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -1667,7 +1667,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.FinancialAidAggregate.TPDM.FinancialAid" table="FinancialAid" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.FinancialAidAggregate.TPDM.FinancialAid" table="FinancialAid" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AidTypeDescriptorId" column="AidTypeDescriptorId" type="int" />
@@ -1723,7 +1723,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PerformanceEvaluationAggregate.TPDM.PerformanceEvaluation" table="PerformanceEvaluation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PerformanceEvaluationAggregate.TPDM.PerformanceEvaluation" table="PerformanceEvaluation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -1869,7 +1869,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PerformanceEvaluationRatingAggregate.TPDM.PerformanceEvaluationRating" table="PerformanceEvaluationRating" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PerformanceEvaluationRatingAggregate.TPDM.PerformanceEvaluationRating" table="PerformanceEvaluationRating" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -2097,7 +2097,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.RubricDimensionAggregate.TPDM.RubricDimension" table="RubricDimension" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.RubricDimensionAggregate.TPDM.RubricDimension" table="RubricDimension" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -2224,7 +2224,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponsePersonTargetAssociationAggregate.TPDM.SurveyResponsePersonTargetAssociation" table="SurveyResponsePersonTargetAssociation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponsePersonTargetAssociationAggregate.TPDM.SurveyResponsePersonTargetAssociation" table="SurveyResponsePersonTargetAssociation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -2284,7 +2284,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponsePersonTargetAssociationAggregate.TPDM.SurveySectionResponsePersonTargetAssociation" table="SurveySectionResponsePersonTargetAssociation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponsePersonTargetAssociationAggregate.TPDM.SurveySectionResponsePersonTargetAssociation" table="SurveySectionResponsePersonTargetAssociation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
index a7636ce453..2717a2cde0 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -15,7 +15,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AcademicWeekAggregate.EdFi.AcademicWeek" table="AcademicWeek" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AcademicWeekAggregate.EdFi.AcademicWeek" table="AcademicWeek" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolId" column="SchoolId" type="int" />
@@ -66,7 +66,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AccountabilityRatingAggregate.EdFi.AccountabilityRating" table="AccountabilityRating" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AccountabilityRatingAggregate.EdFi.AccountabilityRating" table="AccountabilityRating" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -121,7 +121,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AssessmentAggregate.EdFi.Assessment" table="Assessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AssessmentAggregate.EdFi.Assessment" table="Assessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -617,7 +617,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AssessmentItemAggregate.EdFi.AssessmentItem" table="AssessmentItem" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AssessmentItemAggregate.EdFi.AssessmentItem" table="AssessmentItem" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -748,7 +748,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AssessmentScoreRangeLearningStandardAggregate.EdFi.AssessmentScoreRangeLearningStandard" table="AssessmentScoreRangeLearningStandard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AssessmentScoreRangeLearningStandardAggregate.EdFi.AssessmentScoreRangeLearningStandard" table="AssessmentScoreRangeLearningStandard" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -844,7 +844,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.BalanceSheetDimensionAggregate.EdFi.BalanceSheetDimension" table="BalanceSheetDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.BalanceSheetDimensionAggregate.EdFi.BalanceSheetDimension" table="BalanceSheetDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -922,7 +922,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.BellScheduleAggregate.EdFi.BellSchedule" table="BellSchedule" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.BellScheduleAggregate.EdFi.BellSchedule" table="BellSchedule" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BellScheduleName" column="BellScheduleName" type="string" length="60" />
@@ -1077,7 +1077,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CalendarAggregate.EdFi.Calendar" table="Calendar" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CalendarAggregate.EdFi.Calendar" table="Calendar" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -1166,7 +1166,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CalendarDateAggregate.EdFi.CalendarDate" table="CalendarDate" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CalendarDateAggregate.EdFi.CalendarDate" table="CalendarDate" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -1255,7 +1255,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ChartOfAccountAggregate.EdFi.ChartOfAccount" table="ChartOfAccount" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ChartOfAccountAggregate.EdFi.ChartOfAccount" table="ChartOfAccount" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -1381,7 +1381,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ClassPeriodAggregate.EdFi.ClassPeriod" table="ClassPeriod" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ClassPeriodAggregate.EdFi.ClassPeriod" table="ClassPeriod" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ClassPeriodName" column="ClassPeriodName" type="string" length="60" />
@@ -1463,7 +1463,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CohortAggregate.EdFi.Cohort" table="Cohort" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CohortAggregate.EdFi.Cohort" table="Cohort" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CohortIdentifier" column="CohortIdentifier" type="string" length="20" />
@@ -1555,7 +1555,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicense" table="CommunityProviderLicense" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicense" table="CommunityProviderLicense" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CommunityProviderId" column="CommunityProviderId" type="int" />
@@ -1612,7 +1612,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CompetencyObjectiveAggregate.EdFi.CompetencyObjective" table="CompetencyObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CompetencyObjectiveAggregate.EdFi.CompetencyObjective" table="CompetencyObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -1663,7 +1663,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CourseAggregate.EdFi.Course" table="Course" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CourseAggregate.EdFi.Course" table="Course" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseCode" column="CourseCode" type="string" length="60" />
@@ -1938,7 +1938,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CourseOfferingAggregate.EdFi.CourseOffering" table="CourseOffering" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CourseOfferingAggregate.EdFi.CourseOffering" table="CourseOffering" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -2116,7 +2116,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CourseTranscriptAggregate.EdFi.CourseTranscript" table="CourseTranscript" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CourseTranscriptAggregate.EdFi.CourseTranscript" table="CourseTranscript" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseAttemptResultDescriptorId" column="CourseAttemptResultDescriptorId" type="int" />
@@ -2419,7 +2419,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CredentialAggregate.EdFi.Credential" table="Credential" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CredentialAggregate.EdFi.Credential" table="Credential" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CredentialIdentifier" column="CredentialIdentifier" type="string" length="60" />
@@ -2557,7 +2557,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DescriptorAggregate.EdFi.Descriptor" table="Descriptor" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.DescriptorAggregate.EdFi.Descriptor" table="Descriptor" lazy="false" abstract="true" discriminator-value="null">
     <id name="DescriptorId" column="DescriptorId" type="int">
       <generator class="identity" />
     </id>
@@ -5632,7 +5632,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DescriptorMappingAggregate.EdFi.DescriptorMapping" table="DescriptorMapping" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.DescriptorMappingAggregate.EdFi.DescriptorMapping" table="DescriptorMapping" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="MappedNamespace" column="MappedNamespace" type="string" length="255" />
@@ -5716,7 +5716,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DisciplineActionAggregate.EdFi.DisciplineAction" table="DisciplineAction" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.DisciplineActionAggregate.EdFi.DisciplineAction" table="DisciplineAction" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="DisciplineActionIdentifier" column="DisciplineActionIdentifier" type="string" length="32" />
@@ -5935,7 +5935,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DisciplineIncidentAggregate.EdFi.DisciplineIncident" table="DisciplineIncident" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.DisciplineIncidentAggregate.EdFi.DisciplineIncident" table="DisciplineIncident" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="20" />
@@ -6095,7 +6095,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationContentAggregate.EdFi.EducationContent" table="EducationContent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationContentAggregate.EdFi.EducationContent" table="EducationContent" lazy="false" discriminator-value="null">
     <id name="ContentIdentifier" column="ContentIdentifier" type="string" length="225">
       <generator class="assigned" />
     </id>
@@ -6374,7 +6374,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationAggregate.EdFi.EducationOrganization" table="EducationOrganization" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationAggregate.EdFi.EducationOrganization" table="EducationOrganization" lazy="false" abstract="true" discriminator-value="null">
     <id name="EducationOrganizationId" column="EducationOrganizationId" type="int">
       <generator class="assigned" />
     </id>
@@ -6963,7 +6963,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationInterventionPrescriptionAssociationAggregate.EdFi.EducationOrganizationInterventionPrescriptionAssociation" table="EducationOrganizationInterventionPrescriptionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationInterventionPrescriptionAssociationAggregate.EdFi.EducationOrganizationInterventionPrescriptionAssociation" table="EducationOrganizationInterventionPrescriptionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -7017,7 +7017,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationNetworkAssociationAggregate.EdFi.EducationOrganizationNetworkAssociation" table="EducationOrganizationNetworkAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationNetworkAssociationAggregate.EdFi.EducationOrganizationNetworkAssociation" table="EducationOrganizationNetworkAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationNetworkId" column="EducationOrganizationNetworkId" type="int" />
@@ -7069,7 +7069,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationPeerAssociationAggregate.EdFi.EducationOrganizationPeerAssociation" table="EducationOrganizationPeerAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationPeerAssociationAggregate.EdFi.EducationOrganizationPeerAssociation" table="EducationOrganizationPeerAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -7120,7 +7120,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.FeederSchoolAssociationAggregate.EdFi.FeederSchoolAssociation" table="FeederSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.FeederSchoolAssociationAggregate.EdFi.FeederSchoolAssociation" table="FeederSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -7173,7 +7173,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.FunctionDimensionAggregate.EdFi.FunctionDimension" table="FunctionDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.FunctionDimensionAggregate.EdFi.FunctionDimension" table="FunctionDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -7251,7 +7251,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.FundDimensionAggregate.EdFi.FundDimension" table="FundDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.FundDimensionAggregate.EdFi.FundDimension" table="FundDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -7333,7 +7333,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociation" table="GeneralStudentProgramAssociation" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociation" table="GeneralStudentProgramAssociation" lazy="false" abstract="true" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -7940,7 +7940,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GradeAggregate.EdFi.Grade" table="Grade" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GradeAggregate.EdFi.Grade" table="Grade" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -8072,7 +8072,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GradebookEntryAggregate.EdFi.GradebookEntry" table="GradebookEntry" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GradebookEntryAggregate.EdFi.GradebookEntry" table="GradebookEntry" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradebookEntryIdentifier" column="GradebookEntryIdentifier" type="string" length="60" />
@@ -8182,7 +8182,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GradingPeriodAggregate.EdFi.GradingPeriod" table="GradingPeriod" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GradingPeriodAggregate.EdFi.GradingPeriod" table="GradingPeriod" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -8238,7 +8238,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GraduationPlanAggregate.EdFi.GraduationPlan" table="GraduationPlan" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GraduationPlanAggregate.EdFi.GraduationPlan" table="GraduationPlan" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -8577,7 +8577,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.InterventionAggregate.EdFi.Intervention" table="Intervention" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.InterventionAggregate.EdFi.Intervention" table="Intervention" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -8973,7 +8973,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.InterventionPrescriptionAggregate.EdFi.InterventionPrescription" table="InterventionPrescription" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.InterventionPrescriptionAggregate.EdFi.InterventionPrescription" table="InterventionPrescription" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -9259,7 +9259,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.InterventionStudyAggregate.EdFi.InterventionStudy" table="InterventionStudy" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.InterventionStudyAggregate.EdFi.InterventionStudy" table="InterventionStudy" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -9586,7 +9586,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LearningObjectiveAggregate.EdFi.LearningObjective" table="LearningObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LearningObjectiveAggregate.EdFi.LearningObjective" table="LearningObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LearningObjectiveId" column="LearningObjectiveId" type="string" length="60" />
@@ -9818,7 +9818,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LearningStandardAggregate.EdFi.LearningStandard" table="LearningStandard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LearningStandardAggregate.EdFi.LearningStandard" table="LearningStandard" lazy="false" discriminator-value="null">
     <id name="LearningStandardId" column="LearningStandardId" type="string" length="60">
       <generator class="assigned" />
     </id>
@@ -10075,7 +10075,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociation" table="LearningStandardEquivalenceAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociation" table="LearningStandardEquivalenceAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -10130,7 +10130,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalAccountAggregate.EdFi.LocalAccount" table="LocalAccount" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalAccountAggregate.EdFi.LocalAccount" table="LocalAccount" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10224,7 +10224,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalActualAggregate.EdFi.LocalActual" table="LocalActual" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalActualAggregate.EdFi.LocalActual" table="LocalActual" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10279,7 +10279,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalBudgetAggregate.EdFi.LocalBudget" table="LocalBudget" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalBudgetAggregate.EdFi.LocalBudget" table="LocalBudget" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10335,7 +10335,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalContractedStaffAggregate.EdFi.LocalContractedStaff" table="LocalContractedStaff" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalContractedStaffAggregate.EdFi.LocalContractedStaff" table="LocalContractedStaff" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10455,7 +10455,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalEncumbranceAggregate.EdFi.LocalEncumbrance" table="LocalEncumbrance" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalEncumbranceAggregate.EdFi.LocalEncumbrance" table="LocalEncumbrance" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10511,7 +10511,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalPayrollAggregate.EdFi.LocalPayroll" table="LocalPayroll" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalPayrollAggregate.EdFi.LocalPayroll" table="LocalPayroll" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10568,7 +10568,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocationAggregate.EdFi.Location" table="Location" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocationAggregate.EdFi.Location" table="Location" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ClassroomIdentificationCode" column="ClassroomIdentificationCode" type="string" length="60" />
@@ -10617,7 +10617,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ObjectDimensionAggregate.EdFi.ObjectDimension" table="ObjectDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ObjectDimensionAggregate.EdFi.ObjectDimension" table="ObjectDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -10696,7 +10696,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ObjectiveAssessmentAggregate.EdFi.ObjectiveAssessment" table="ObjectiveAssessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ObjectiveAssessmentAggregate.EdFi.ObjectiveAssessment" table="ObjectiveAssessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -10912,7 +10912,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.OpenStaffPositionAggregate.EdFi.OpenStaffPosition" table="OpenStaffPosition" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.OpenStaffPositionAggregate.EdFi.OpenStaffPosition" table="OpenStaffPosition" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -11032,7 +11032,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.OperationalUnitDimensionAggregate.EdFi.OperationalUnitDimension" table="OperationalUnitDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.OperationalUnitDimensionAggregate.EdFi.OperationalUnitDimension" table="OperationalUnitDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -11108,7 +11108,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ParentAggregate.EdFi.Parent" table="Parent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ParentAggregate.EdFi.Parent" table="Parent" lazy="false" discriminator-value="null">
     <id name="ParentUSI" column="ParentUSI" type="int">
       <generator class="identity" />
     </id>
@@ -11498,7 +11498,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PersonAggregate.EdFi.Person" table="Person" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PersonAggregate.EdFi.Person" table="Person" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="PersonId" column="PersonId" type="string" length="32" />
@@ -11543,7 +11543,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PostSecondaryEventAggregate.EdFi.PostSecondaryEvent" table="PostSecondaryEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PostSecondaryEventAggregate.EdFi.PostSecondaryEvent" table="PostSecondaryEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EventDate" column="EventDate" type="date" />
@@ -11620,7 +11620,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ProgramAggregate.EdFi.Program" table="Program" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ProgramAggregate.EdFi.Program" table="Program" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -11852,7 +11852,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ProgramDimensionAggregate.EdFi.ProgramDimension" table="ProgramDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ProgramDimensionAggregate.EdFi.ProgramDimension" table="ProgramDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -11930,7 +11930,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ProjectDimensionAggregate.EdFi.ProjectDimension" table="ProjectDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ProjectDimensionAggregate.EdFi.ProjectDimension" table="ProjectDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -12012,7 +12012,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ReportCardAggregate.EdFi.ReportCard" table="ReportCard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ReportCardAggregate.EdFi.ReportCard" table="ReportCard" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -12286,7 +12286,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.RestraintEventAggregate.EdFi.RestraintEvent" table="RestraintEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.RestraintEventAggregate.EdFi.RestraintEvent" table="RestraintEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="RestraintEventIdentifier" column="RestraintEventIdentifier" type="string" length="20" />
@@ -12506,7 +12506,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SectionAggregate.EdFi.Section" table="Section" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SectionAggregate.EdFi.Section" table="Section" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -12789,7 +12789,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SectionAttendanceTakenEventAggregate.EdFi.SectionAttendanceTakenEvent" table="SectionAttendanceTakenEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SectionAttendanceTakenEventAggregate.EdFi.SectionAttendanceTakenEvent" table="SectionAttendanceTakenEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -12857,7 +12857,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SessionAggregate.EdFi.Session" table="Session" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SessionAggregate.EdFi.Session" table="Session" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolId" column="SchoolId" type="int" />
@@ -12993,7 +12993,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SourceDimensionAggregate.EdFi.SourceDimension" table="SourceDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SourceDimensionAggregate.EdFi.SourceDimension" table="SourceDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -13069,7 +13069,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffAggregate.EdFi.Staff" table="Staff" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffAggregate.EdFi.Staff" table="Staff" lazy="false" discriminator-value="null">
     <id name="StaffUSI" column="StaffUSI" type="int">
       <generator class="identity" />
     </id>
@@ -13740,7 +13740,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEvent" table="StaffAbsenceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEvent" table="StaffAbsenceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AbsenceEventCategoryDescriptorId" column="AbsenceEventCategoryDescriptorId" type="int" />
@@ -13792,7 +13792,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffCohortAssociationAggregate.EdFi.StaffCohortAssociation" table="StaffCohortAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffCohortAssociationAggregate.EdFi.StaffCohortAssociation" table="StaffCohortAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -13848,7 +13848,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffDisciplineIncidentAssociationAggregate.EdFi.StaffDisciplineIncidentAssociation" table="StaffDisciplineIncidentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffDisciplineIncidentAssociationAggregate.EdFi.StaffDisciplineIncidentAssociation" table="StaffDisciplineIncidentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="20" />
@@ -13937,7 +13937,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociation" table="StaffEducationOrganizationAssignmentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociation" table="StaffEducationOrganizationAssignmentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -14009,7 +14009,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociation" table="StaffEducationOrganizationContactAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociation" table="StaffEducationOrganizationContactAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ContactTitle" column="ContactTitle" type="string" length="75" />
@@ -14188,7 +14188,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociation" table="StaffEducationOrganizationEmploymentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociation" table="StaffEducationOrganizationEmploymentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -14254,7 +14254,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffLeaveAggregate.EdFi.StaffLeave" table="StaffLeave" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffLeaveAggregate.EdFi.StaffLeave" table="StaffLeave" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -14308,7 +14308,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffProgramAssociationAggregate.EdFi.StaffProgramAssociation" table="StaffProgramAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffProgramAssociationAggregate.EdFi.StaffProgramAssociation" table="StaffProgramAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -14366,7 +14366,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociation" table="StaffSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociation" table="StaffSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramAssignmentDescriptorId" column="ProgramAssignmentDescriptorId" type="int" />
@@ -14501,7 +14501,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociation" table="StaffSectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociation" table="StaffSectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -14616,7 +14616,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAggregate.EdFi.Student" table="Student" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAggregate.EdFi.Student" table="Student" lazy="false" discriminator-value="null">
     <id name="StudentUSI" column="StudentUSI" type="int">
       <generator class="identity" />
     </id>
@@ -14823,7 +14823,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecord" table="StudentAcademicRecord" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecord" table="StudentAcademicRecord" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -15176,7 +15176,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAssessmentAggregate.EdFi.StudentAssessment" table="StudentAssessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAssessmentAggregate.EdFi.StudentAssessment" table="StudentAssessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -15585,7 +15585,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociation" table="StudentAssessmentEducationOrganizationAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociation" table="StudentAssessmentEducationOrganizationAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -15648,7 +15648,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentCohortAssociationAggregate.EdFi.StudentCohortAssociation" table="StudentCohortAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentCohortAssociationAggregate.EdFi.StudentCohortAssociation" table="StudentCohortAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -15756,7 +15756,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentCompetencyObjectiveAggregate.EdFi.StudentCompetencyObjective" table="StudentCompetencyObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentCompetencyObjectiveAggregate.EdFi.StudentCompetencyObjective" table="StudentCompetencyObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -16036,7 +16036,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentAssociationAggregate.EdFi.StudentDisciplineIncidentAssociation" table="StudentDisciplineIncidentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentAssociationAggregate.EdFi.StudentDisciplineIncidentAssociation" table="StudentDisciplineIncidentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="20" />
@@ -16127,7 +16127,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociation" table="StudentDisciplineIncidentBehaviorAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociation" table="StudentDisciplineIncidentBehaviorAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BehaviorDescriptorId" column="BehaviorDescriptorId" type="int" />
@@ -16219,7 +16219,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociation" table="StudentDisciplineIncidentNonOffenderAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociation" table="StudentDisciplineIncidentNonOffenderAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="20" />
@@ -16306,7 +16306,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociation" table="StudentEducationOrganizationAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociation" table="StudentEducationOrganizationAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -17100,7 +17100,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociation" table="StudentEducationOrganizationResponsibilityAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociation" table="StudentEducationOrganizationResponsibilityAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -17154,7 +17154,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntry" table="StudentGradebookEntry" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntry" table="StudentGradebookEntry" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradebookEntryIdentifier" column="GradebookEntryIdentifier" type="string" length="60" />
@@ -17248,7 +17248,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociation" table="StudentInterventionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociation" table="StudentInterventionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -17350,7 +17350,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentInterventionAttendanceEventAggregate.EdFi.StudentInterventionAttendanceEvent" table="StudentInterventionAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentInterventionAttendanceEventAggregate.EdFi.StudentInterventionAttendanceEvent" table="StudentInterventionAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -17481,7 +17481,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentLearningObjectiveAggregate.EdFi.StudentLearningObjective" table="StudentLearningObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentLearningObjectiveAggregate.EdFi.StudentLearningObjective" table="StudentLearningObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -17721,7 +17721,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentParentAssociationAggregate.EdFi.StudentParentAssociation" table="StudentParentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentParentAssociationAggregate.EdFi.StudentParentAssociation" table="StudentParentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ParentUSI" column="ParentUSI" type="int" />
@@ -17815,7 +17815,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentProgramAttendanceEventAggregate.EdFi.StudentProgramAttendanceEvent" table="StudentProgramAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentProgramAttendanceEventAggregate.EdFi.StudentProgramAttendanceEvent" table="StudentProgramAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -17880,7 +17880,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociation" table="StudentSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociation" table="StudentSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EntryDate" column="EntryDate" type="date" />
@@ -18046,7 +18046,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAttendanceEventAggregate.EdFi.StudentSchoolAttendanceEvent" table="StudentSchoolAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAttendanceEventAggregate.EdFi.StudentSchoolAttendanceEvent" table="StudentSchoolAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -18148,7 +18148,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociation" table="StudentSectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociation" table="StudentSectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -18218,7 +18218,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEvent" table="StudentSectionAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEvent" table="StudentSectionAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -18584,7 +18584,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyAggregate.EdFi.Survey" table="Survey" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyAggregate.EdFi.Survey" table="Survey" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -18648,7 +18648,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyCourseAssociationAggregate.EdFi.SurveyCourseAssociation" table="SurveyCourseAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyCourseAssociationAggregate.EdFi.SurveyCourseAssociation" table="SurveyCourseAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseCode" column="CourseCode" type="string" length="60" />
@@ -18705,7 +18705,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyProgramAssociationAggregate.EdFi.SurveyProgramAssociation" table="SurveyProgramAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyProgramAssociationAggregate.EdFi.SurveyProgramAssociation" table="SurveyProgramAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -18762,7 +18762,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyQuestionAggregate.EdFi.SurveyQuestion" table="SurveyQuestion" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyQuestionAggregate.EdFi.SurveyQuestion" table="SurveyQuestion" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -18895,7 +18895,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyQuestionResponseAggregate.EdFi.SurveyQuestionResponse" table="SurveyQuestionResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyQuestionResponseAggregate.EdFi.SurveyQuestionResponse" table="SurveyQuestionResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19035,7 +19035,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseAggregate.EdFi.SurveyResponse" table="SurveyResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseAggregate.EdFi.SurveyResponse" table="SurveyResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19138,7 +19138,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveyResponseEducationOrganizationTargetAssociation" table="SurveyResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveyResponseEducationOrganizationTargetAssociation" table="SurveyResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -19194,7 +19194,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseStaffTargetAssociationAggregate.EdFi.SurveyResponseStaffTargetAssociation" table="SurveyResponseStaffTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseStaffTargetAssociationAggregate.EdFi.SurveyResponseStaffTargetAssociation" table="SurveyResponseStaffTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19249,7 +19249,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionAggregate.EdFi.SurveySection" table="SurveySection" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionAggregate.EdFi.SurveySection" table="SurveySection" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19303,7 +19303,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionAssociationAggregate.EdFi.SurveySectionAssociation" table="SurveySectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionAssociationAggregate.EdFi.SurveySectionAssociation" table="SurveySectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -19365,7 +19365,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseAggregate.EdFi.SurveySectionResponse" table="SurveySectionResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseAggregate.EdFi.SurveySectionResponse" table="SurveySectionResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19425,7 +19425,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveySectionResponseEducationOrganizationTargetAssociation" table="SurveySectionResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveySectionResponseEducationOrganizationTargetAssociation" table="SurveySectionResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -19484,7 +19484,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseStaffTargetAssociationAggregate.EdFi.SurveySectionResponseStaffTargetAssociation" table="SurveySectionResponseStaffTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseStaffTargetAssociationAggregate.EdFi.SurveySectionResponseStaffTargetAssociation" table="SurveySectionResponseStaffTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
index 0994afe5e0..ecdf081740 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_MsSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
@@ -2,7 +2,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicWeekAggregate.EdFi.AcademicWeekQ" table="AcademicWeek" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicWeekAggregate.EdFi.AcademicWeekQ" table="AcademicWeek" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolId" column="SchoolId" type="int" />
@@ -49,7 +49,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AccountabilityRatingAggregate.EdFi.AccountabilityRatingQ" table="AccountabilityRating" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AccountabilityRatingAggregate.EdFi.AccountabilityRatingQ" table="AccountabilityRating" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -93,7 +93,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentAggregate.EdFi.AssessmentQ" table="Assessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentAggregate.EdFi.AssessmentQ" table="Assessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -650,7 +650,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemAggregate.EdFi.AssessmentItemQ" table="AssessmentItem" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemAggregate.EdFi.AssessmentItemQ" table="AssessmentItem" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -790,7 +790,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentScoreRangeLearningStandardAggregate.EdFi.AssessmentScoreRangeLearningStandardQ" table="AssessmentScoreRangeLearningStandard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentScoreRangeLearningStandardAggregate.EdFi.AssessmentScoreRangeLearningStandardQ" table="AssessmentScoreRangeLearningStandard" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -878,7 +878,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.BalanceSheetDimensionAggregate.EdFi.BalanceSheetDimensionQ" table="BalanceSheetDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.BalanceSheetDimensionAggregate.EdFi.BalanceSheetDimensionQ" table="BalanceSheetDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -956,7 +956,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.BellScheduleAggregate.EdFi.BellScheduleQ" table="BellSchedule" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.BellScheduleAggregate.EdFi.BellScheduleQ" table="BellSchedule" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BellScheduleName" column="BellScheduleName" type="string" length="60" />
@@ -1102,7 +1102,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarAggregate.EdFi.CalendarQ" table="Calendar" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarAggregate.EdFi.CalendarQ" table="Calendar" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -1211,7 +1211,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarDateAggregate.EdFi.CalendarDateQ" table="CalendarDate" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarDateAggregate.EdFi.CalendarDateQ" table="CalendarDate" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -1301,7 +1301,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ChartOfAccountAggregate.EdFi.ChartOfAccountQ" table="ChartOfAccount" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ChartOfAccountAggregate.EdFi.ChartOfAccountQ" table="ChartOfAccount" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -1431,7 +1431,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ClassPeriodAggregate.EdFi.ClassPeriodQ" table="ClassPeriod" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ClassPeriodAggregate.EdFi.ClassPeriodQ" table="ClassPeriod" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ClassPeriodName" column="ClassPeriodName" type="string" length="60" />
@@ -1526,7 +1526,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortAggregate.EdFi.CohortQ" table="Cohort" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortAggregate.EdFi.CohortQ" table="Cohort" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CohortIdentifier" column="CohortIdentifier" type="string" length="20" />
@@ -1639,7 +1639,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicenseQ" table="CommunityProviderLicense" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicenseQ" table="CommunityProviderLicense" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CommunityProviderId" column="CommunityProviderId" type="int" />
@@ -1690,7 +1690,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CompetencyObjectiveAggregate.EdFi.CompetencyObjectiveQ" table="CompetencyObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CompetencyObjectiveAggregate.EdFi.CompetencyObjectiveQ" table="CompetencyObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -1742,7 +1742,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAggregate.EdFi.CourseQ" table="Course" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAggregate.EdFi.CourseQ" table="Course" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseCode" column="CourseCode" type="string" length="60" />
@@ -2066,7 +2066,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseOfferingAggregate.EdFi.CourseOfferingQ" table="CourseOffering" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseOfferingAggregate.EdFi.CourseOfferingQ" table="CourseOffering" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -2247,7 +2247,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptQ" table="CourseTranscript" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptQ" table="CourseTranscript" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseAttemptResultDescriptorId" column="CourseAttemptResultDescriptorId" type="int" />
@@ -2572,7 +2572,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" table="Credential" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" table="Credential" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CredentialIdentifier" column="CredentialIdentifier" type="string" length="60" />
@@ -2757,7 +2757,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorAggregate.EdFi.DescriptorQ" table="Descriptor" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorAggregate.EdFi.DescriptorQ" table="Descriptor" lazy="false" abstract="true" discriminator-value="null">
     <id name="DescriptorId" column="DescriptorId" type="int">
       <generator class="identity" />
     </id>
@@ -8591,7 +8591,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorMappingAggregate.EdFi.DescriptorMappingQ" table="DescriptorMapping" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorMappingAggregate.EdFi.DescriptorMappingQ" table="DescriptorMapping" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="MappedNamespace" column="MappedNamespace" type="string" length="255" />
@@ -8666,7 +8666,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionAggregate.EdFi.DisciplineActionQ" table="DisciplineAction" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionAggregate.EdFi.DisciplineActionQ" table="DisciplineAction" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="DisciplineActionIdentifier" column="DisciplineActionIdentifier" type="string" length="32" />
@@ -8880,7 +8880,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentQ" table="DisciplineIncident" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentQ" table="DisciplineIncident" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="20" />
@@ -9078,7 +9078,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" table="EducationContent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" table="EducationContent" lazy="false" discriminator-value="null">
     <id name="ContentIdentifier" column="ContentIdentifier" type="string" length="225">
       <generator class="assigned" />
     </id>
@@ -9394,7 +9394,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationQ" table="EducationOrganization" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationQ" table="EducationOrganization" lazy="false" abstract="true" discriminator-value="null">
     <id name="EducationOrganizationId" column="EducationOrganizationId" type="int">
       <generator class="assigned" />
     </id>
@@ -10495,7 +10495,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationInterventionPrescriptionAssociationAggregate.EdFi.EducationOrganizationInterventionPrescriptionAssociationQ" table="EducationOrganizationInterventionPrescriptionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationInterventionPrescriptionAssociationAggregate.EdFi.EducationOrganizationInterventionPrescriptionAssociationQ" table="EducationOrganizationInterventionPrescriptionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -10538,7 +10538,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationNetworkAssociationAggregate.EdFi.EducationOrganizationNetworkAssociationQ" table="EducationOrganizationNetworkAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationNetworkAssociationAggregate.EdFi.EducationOrganizationNetworkAssociationQ" table="EducationOrganizationNetworkAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationNetworkId" column="EducationOrganizationNetworkId" type="int" />
@@ -10579,7 +10579,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationPeerAssociationAggregate.EdFi.EducationOrganizationPeerAssociationQ" table="EducationOrganizationPeerAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationPeerAssociationAggregate.EdFi.EducationOrganizationPeerAssociationQ" table="EducationOrganizationPeerAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -10618,7 +10618,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FeederSchoolAssociationAggregate.EdFi.FeederSchoolAssociationQ" table="FeederSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FeederSchoolAssociationAggregate.EdFi.FeederSchoolAssociationQ" table="FeederSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -10660,7 +10660,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FunctionDimensionAggregate.EdFi.FunctionDimensionQ" table="FunctionDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FunctionDimensionAggregate.EdFi.FunctionDimensionQ" table="FunctionDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -10738,7 +10738,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FundDimensionAggregate.EdFi.FundDimensionQ" table="FundDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FundDimensionAggregate.EdFi.FundDimensionQ" table="FundDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -10816,7 +10816,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociationQ" table="GeneralStudentProgramAssociation" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociationQ" table="GeneralStudentProgramAssociation" lazy="false" abstract="true" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -11462,7 +11462,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeAggregate.EdFi.GradeQ" table="Grade" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeAggregate.EdFi.GradeQ" table="Grade" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -11609,7 +11609,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryAggregate.EdFi.GradebookEntryQ" table="GradebookEntry" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryAggregate.EdFi.GradebookEntryQ" table="GradebookEntry" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradebookEntryIdentifier" column="GradebookEntryIdentifier" type="string" length="60" />
@@ -11717,7 +11717,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodAggregate.EdFi.GradingPeriodQ" table="GradingPeriod" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodAggregate.EdFi.GradingPeriodQ" table="GradingPeriod" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -11824,7 +11824,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanAggregate.EdFi.GraduationPlanQ" table="GraduationPlan" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanAggregate.EdFi.GraduationPlanQ" table="GraduationPlan" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -12200,7 +12200,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionAggregate.EdFi.InterventionQ" table="Intervention" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionAggregate.EdFi.InterventionQ" table="Intervention" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -12619,7 +12619,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionPrescriptionAggregate.EdFi.InterventionPrescriptionQ" table="InterventionPrescription" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionPrescriptionAggregate.EdFi.InterventionPrescriptionQ" table="InterventionPrescription" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -12936,7 +12936,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionStudyAggregate.EdFi.InterventionStudyQ" table="InterventionStudy" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionStudyAggregate.EdFi.InterventionStudyQ" table="InterventionStudy" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -13282,7 +13282,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningObjectiveAggregate.EdFi.LearningObjectiveQ" table="LearningObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningObjectiveAggregate.EdFi.LearningObjectiveQ" table="LearningObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LearningObjectiveId" column="LearningObjectiveId" type="string" length="60" />
@@ -13532,7 +13532,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardQ" table="LearningStandard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardQ" table="LearningStandard" lazy="false" discriminator-value="null">
     <id name="LearningStandardId" column="LearningStandardId" type="string" length="60">
       <generator class="assigned" />
     </id>
@@ -13871,7 +13871,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociationQ" table="LearningStandardEquivalenceAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociationQ" table="LearningStandardEquivalenceAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -13917,7 +13917,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalAccountAggregate.EdFi.LocalAccountQ" table="LocalAccount" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalAccountAggregate.EdFi.LocalAccountQ" table="LocalAccount" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14046,7 +14046,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalActualAggregate.EdFi.LocalActualQ" table="LocalActual" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalActualAggregate.EdFi.LocalActualQ" table="LocalActual" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14091,7 +14091,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalBudgetAggregate.EdFi.LocalBudgetQ" table="LocalBudget" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalBudgetAggregate.EdFi.LocalBudgetQ" table="LocalBudget" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14136,7 +14136,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalContractedStaffAggregate.EdFi.LocalContractedStaffQ" table="LocalContractedStaff" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalContractedStaffAggregate.EdFi.LocalContractedStaffQ" table="LocalContractedStaff" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14252,7 +14252,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEncumbranceAggregate.EdFi.LocalEncumbranceQ" table="LocalEncumbrance" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEncumbranceAggregate.EdFi.LocalEncumbranceQ" table="LocalEncumbrance" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14297,7 +14297,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalPayrollAggregate.EdFi.LocalPayrollQ" table="LocalPayroll" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalPayrollAggregate.EdFi.LocalPayrollQ" table="LocalPayroll" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14346,7 +14346,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocationAggregate.EdFi.LocationQ" table="Location" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocationAggregate.EdFi.LocationQ" table="Location" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ClassroomIdentificationCode" column="ClassroomIdentificationCode" type="string" length="60" />
@@ -14392,7 +14392,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ObjectDimensionAggregate.EdFi.ObjectDimensionQ" table="ObjectDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ObjectDimensionAggregate.EdFi.ObjectDimensionQ" table="ObjectDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -14470,7 +14470,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ObjectiveAssessmentAggregate.EdFi.ObjectiveAssessmentQ" table="ObjectiveAssessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ObjectiveAssessmentAggregate.EdFi.ObjectiveAssessmentQ" table="ObjectiveAssessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -14711,7 +14711,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.OpenStaffPositionAggregate.EdFi.OpenStaffPositionQ" table="OpenStaffPosition" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.OpenStaffPositionAggregate.EdFi.OpenStaffPositionQ" table="OpenStaffPosition" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -14838,7 +14838,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.OperationalUnitDimensionAggregate.EdFi.OperationalUnitDimensionQ" table="OperationalUnitDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.OperationalUnitDimensionAggregate.EdFi.OperationalUnitDimensionQ" table="OperationalUnitDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -14916,7 +14916,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ParentAggregate.EdFi.ParentQ" table="Parent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ParentAggregate.EdFi.ParentQ" table="Parent" lazy="false" discriminator-value="null">
     <id name="ParentUSI" column="ParentUSI" type="int">
       <generator class="identity" />
     </id>
@@ -15354,7 +15354,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.PersonAggregate.EdFi.PersonQ" table="Person" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.PersonAggregate.EdFi.PersonQ" table="Person" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="PersonId" column="PersonId" type="string" length="32" />
@@ -15414,7 +15414,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventAggregate.EdFi.PostSecondaryEventQ" table="PostSecondaryEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventAggregate.EdFi.PostSecondaryEventQ" table="PostSecondaryEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EventDate" column="EventDate" type="date" />
@@ -15485,7 +15485,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAggregate.EdFi.ProgramQ" table="Program" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAggregate.EdFi.ProgramQ" table="Program" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -15790,7 +15790,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramDimensionAggregate.EdFi.ProgramDimensionQ" table="ProgramDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramDimensionAggregate.EdFi.ProgramDimensionQ" table="ProgramDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -15868,7 +15868,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProjectDimensionAggregate.EdFi.ProjectDimensionQ" table="ProjectDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProjectDimensionAggregate.EdFi.ProjectDimensionQ" table="ProjectDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -15946,7 +15946,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ReportCardAggregate.EdFi.ReportCardQ" table="ReportCard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ReportCardAggregate.EdFi.ReportCardQ" table="ReportCard" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -16223,7 +16223,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventAggregate.EdFi.RestraintEventQ" table="RestraintEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventAggregate.EdFi.RestraintEventQ" table="RestraintEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="RestraintEventIdentifier" column="RestraintEventIdentifier" type="string" length="20" />
@@ -16551,7 +16551,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionQ" table="Section" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionQ" table="Section" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -16930,7 +16930,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAttendanceTakenEventAggregate.EdFi.SectionAttendanceTakenEventQ" table="SectionAttendanceTakenEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAttendanceTakenEventAggregate.EdFi.SectionAttendanceTakenEventQ" table="SectionAttendanceTakenEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -16986,7 +16986,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SessionAggregate.EdFi.SessionQ" table="Session" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SessionAggregate.EdFi.SessionQ" table="Session" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolId" column="SchoolId" type="int" />
@@ -17141,7 +17141,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SourceDimensionAggregate.EdFi.SourceDimensionQ" table="SourceDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SourceDimensionAggregate.EdFi.SourceDimensionQ" table="SourceDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -17219,7 +17219,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAggregate.EdFi.StaffQ" table="Staff" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAggregate.EdFi.StaffQ" table="Staff" lazy="false" discriminator-value="null">
     <id name="StaffUSI" column="StaffUSI" type="int">
       <generator class="identity" />
     </id>
@@ -18106,7 +18106,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEventQ" table="StaffAbsenceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEventQ" table="StaffAbsenceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AbsenceEventCategoryDescriptorId" column="AbsenceEventCategoryDescriptorId" type="int" />
@@ -18148,7 +18148,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffCohortAssociationAggregate.EdFi.StaffCohortAssociationQ" table="StaffCohortAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffCohortAssociationAggregate.EdFi.StaffCohortAssociationQ" table="StaffCohortAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -18192,7 +18192,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffDisciplineIncidentAssociationAggregate.EdFi.StaffDisciplineIncidentAssociationQ" table="StaffDisciplineIncidentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffDisciplineIncidentAssociationAggregate.EdFi.StaffDisciplineIncidentAssociationQ" table="StaffDisciplineIncidentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="20" />
@@ -18271,7 +18271,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociationQ" table="StaffEducationOrganizationAssignmentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociationQ" table="StaffEducationOrganizationAssignmentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -18334,7 +18334,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociationQ" table="StaffEducationOrganizationContactAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociationQ" table="StaffEducationOrganizationContactAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ContactTitle" column="ContactTitle" type="string" length="75" />
@@ -18508,7 +18508,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" table="StaffEducationOrganizationEmploymentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" table="StaffEducationOrganizationEmploymentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -18581,7 +18581,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveAggregate.EdFi.StaffLeaveQ" table="StaffLeave" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveAggregate.EdFi.StaffLeaveQ" table="StaffLeave" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -18624,7 +18624,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffProgramAssociationAggregate.EdFi.StaffProgramAssociationQ" table="StaffProgramAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffProgramAssociationAggregate.EdFi.StaffProgramAssociationQ" table="StaffProgramAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -18670,7 +18670,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociationQ" table="StaffSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociationQ" table="StaffSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramAssignmentDescriptorId" column="ProgramAssignmentDescriptorId" type="int" />
@@ -18799,7 +18799,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociationQ" table="StaffSectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociationQ" table="StaffSectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -18908,7 +18908,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentQ" table="Student" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentQ" table="Student" lazy="false" discriminator-value="null">
     <id name="StudentUSI" column="StudentUSI" type="int">
       <generator class="identity" />
     </id>
@@ -19313,7 +19313,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordQ" table="StudentAcademicRecord" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordQ" table="StudentAcademicRecord" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -19694,7 +19694,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" table="StudentAssessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" table="StudentAssessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -20147,7 +20147,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociationQ" table="StudentAssessmentEducationOrganizationAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociationQ" table="StudentAssessmentEducationOrganizationAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -20200,7 +20200,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCohortAssociationAggregate.EdFi.StudentCohortAssociationQ" table="StudentCohortAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCohortAssociationAggregate.EdFi.StudentCohortAssociationQ" table="StudentCohortAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -20291,7 +20291,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCompetencyObjectiveAggregate.EdFi.StudentCompetencyObjectiveQ" table="StudentCompetencyObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCompetencyObjectiveAggregate.EdFi.StudentCompetencyObjectiveQ" table="StudentCompetencyObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -20585,7 +20585,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentAssociationAggregate.EdFi.StudentDisciplineIncidentAssociationQ" table="StudentDisciplineIncidentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentAssociationAggregate.EdFi.StudentDisciplineIncidentAssociationQ" table="StudentDisciplineIncidentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="20" />
@@ -20678,7 +20678,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociationQ" table="StudentDisciplineIncidentBehaviorAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociationQ" table="StudentDisciplineIncidentBehaviorAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BehaviorDescriptorId" column="BehaviorDescriptorId" type="int" />
@@ -20774,7 +20774,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociationQ" table="StudentDisciplineIncidentNonOffenderAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociationQ" table="StudentDisciplineIncidentNonOffenderAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="20" />
@@ -20853,7 +20853,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" table="StudentEducationOrganizationAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" table="StudentEducationOrganizationAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -21724,7 +21724,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociationQ" table="StudentEducationOrganizationResponsibilityAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociationQ" table="StudentEducationOrganizationResponsibilityAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -21769,7 +21769,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntryQ" table="StudentGradebookEntry" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntryQ" table="StudentGradebookEntry" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradebookEntryIdentifier" column="GradebookEntryIdentifier" type="string" length="60" />
@@ -21863,7 +21863,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationQ" table="StudentInterventionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationQ" table="StudentInterventionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -21963,7 +21963,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAttendanceEventAggregate.EdFi.StudentInterventionAttendanceEventQ" table="StudentInterventionAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAttendanceEventAggregate.EdFi.StudentInterventionAttendanceEventQ" table="StudentInterventionAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -22099,7 +22099,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLearningObjectiveAggregate.EdFi.StudentLearningObjectiveQ" table="StudentLearningObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLearningObjectiveAggregate.EdFi.StudentLearningObjectiveQ" table="StudentLearningObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -22350,7 +22350,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentParentAssociationAggregate.EdFi.StudentParentAssociationQ" table="StudentParentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentParentAssociationAggregate.EdFi.StudentParentAssociationQ" table="StudentParentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ParentUSI" column="ParentUSI" type="int" />
@@ -22434,7 +22434,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentProgramAttendanceEventAggregate.EdFi.StudentProgramAttendanceEventQ" table="StudentProgramAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentProgramAttendanceEventAggregate.EdFi.StudentProgramAttendanceEventQ" table="StudentProgramAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -22493,7 +22493,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" table="StudentSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" table="StudentSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EntryDate" column="EntryDate" type="date" />
@@ -22662,7 +22662,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAttendanceEventAggregate.EdFi.StudentSchoolAttendanceEventQ" table="StudentSchoolAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAttendanceEventAggregate.EdFi.StudentSchoolAttendanceEventQ" table="StudentSchoolAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -22757,7 +22757,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociationQ" table="StudentSectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociationQ" table="StudentSectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -22855,7 +22855,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEventQ" table="StudentSectionAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEventQ" table="StudentSectionAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -23234,7 +23234,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyAggregate.EdFi.SurveyQ" table="Survey" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyAggregate.EdFi.SurveyQ" table="Survey" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -23336,7 +23336,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyCourseAssociationAggregate.EdFi.SurveyCourseAssociationQ" table="SurveyCourseAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyCourseAssociationAggregate.EdFi.SurveyCourseAssociationQ" table="SurveyCourseAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseCode" column="CourseCode" type="string" length="60" />
@@ -23379,7 +23379,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyProgramAssociationAggregate.EdFi.SurveyProgramAssociationQ" table="SurveyProgramAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyProgramAssociationAggregate.EdFi.SurveyProgramAssociationQ" table="SurveyProgramAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -23424,7 +23424,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionAggregate.EdFi.SurveyQuestionQ" table="SurveyQuestion" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionAggregate.EdFi.SurveyQuestionQ" table="SurveyQuestion" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -23556,7 +23556,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionResponseAggregate.EdFi.SurveyQuestionResponseQ" table="SurveyQuestionResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionResponseAggregate.EdFi.SurveyQuestionResponseQ" table="SurveyQuestionResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -23684,7 +23684,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseAggregate.EdFi.SurveyResponseQ" table="SurveyResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseAggregate.EdFi.SurveyResponseQ" table="SurveyResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -23813,7 +23813,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveyResponseEducationOrganizationTargetAssociationQ" table="SurveyResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveyResponseEducationOrganizationTargetAssociationQ" table="SurveyResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -23856,7 +23856,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseStaffTargetAssociationAggregate.EdFi.SurveyResponseStaffTargetAssociationQ" table="SurveyResponseStaffTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseStaffTargetAssociationAggregate.EdFi.SurveyResponseStaffTargetAssociationQ" table="SurveyResponseStaffTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -23899,7 +23899,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionAggregate.EdFi.SurveySectionQ" table="SurveySection" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionAggregate.EdFi.SurveySectionQ" table="SurveySection" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -23955,7 +23955,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionAssociationAggregate.EdFi.SurveySectionAssociationQ" table="SurveySectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionAssociationAggregate.EdFi.SurveySectionAssociationQ" table="SurveySectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -24004,7 +24004,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseAggregate.EdFi.SurveySectionResponseQ" table="SurveySectionResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseAggregate.EdFi.SurveySectionResponseQ" table="SurveySectionResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -24070,7 +24070,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveySectionResponseEducationOrganizationTargetAssociationQ" table="SurveySectionResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveySectionResponseEducationOrganizationTargetAssociationQ" table="SurveySectionResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -24115,7 +24115,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseStaffTargetAssociationAggregate.EdFi.SurveySectionResponseStaffTargetAssociationQ" table="SurveySectionResponseStaffTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseStaffTargetAssociationAggregate.EdFi.SurveySectionResponseStaffTargetAssociationQ" table="SurveySectionResponseStaffTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
index aa26a9f6ee..889a8311fe 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -15,7 +15,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AcademicWeekAggregate.EdFi.AcademicWeek" table="AcademicWeek" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AcademicWeekAggregate.EdFi.AcademicWeek" table="AcademicWeek" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolId" column="SchoolId" type="int" />
@@ -66,7 +66,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AccountabilityRatingAggregate.EdFi.AccountabilityRating" table="AccountabilityRating" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AccountabilityRatingAggregate.EdFi.AccountabilityRating" table="AccountabilityRating" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -121,7 +121,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AssessmentAggregate.EdFi.Assessment" table="Assessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AssessmentAggregate.EdFi.Assessment" table="Assessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -617,7 +617,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AssessmentItemAggregate.EdFi.AssessmentItem" table="AssessmentItem" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AssessmentItemAggregate.EdFi.AssessmentItem" table="AssessmentItem" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -748,7 +748,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AssessmentScoreRangeLearningStandardAggregate.EdFi.AssessmentScoreRangeLearningStandard" table="AssessmentScoreRangeLearningStandard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AssessmentScoreRangeLearningStandardAggregate.EdFi.AssessmentScoreRangeLearningStandard" table="AssessmentScoreRangeLearningStandard" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -844,7 +844,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.BalanceSheetDimensionAggregate.EdFi.BalanceSheetDimension" table="BalanceSheetDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.BalanceSheetDimensionAggregate.EdFi.BalanceSheetDimension" table="BalanceSheetDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -922,7 +922,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.BellScheduleAggregate.EdFi.BellSchedule" table="BellSchedule" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.BellScheduleAggregate.EdFi.BellSchedule" table="BellSchedule" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BellScheduleName" column="BellScheduleName" type="string" length="60" />
@@ -1077,7 +1077,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CalendarAggregate.EdFi.Calendar" table="Calendar" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CalendarAggregate.EdFi.Calendar" table="Calendar" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -1166,7 +1166,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CalendarDateAggregate.EdFi.CalendarDate" table="CalendarDate" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CalendarDateAggregate.EdFi.CalendarDate" table="CalendarDate" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -1255,7 +1255,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ChartOfAccountAggregate.EdFi.ChartOfAccount" table="ChartOfAccount" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ChartOfAccountAggregate.EdFi.ChartOfAccount" table="ChartOfAccount" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -1381,7 +1381,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ClassPeriodAggregate.EdFi.ClassPeriod" table="ClassPeriod" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ClassPeriodAggregate.EdFi.ClassPeriod" table="ClassPeriod" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ClassPeriodName" column="ClassPeriodName" type="string" length="60" />
@@ -1463,7 +1463,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CohortAggregate.EdFi.Cohort" table="Cohort" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CohortAggregate.EdFi.Cohort" table="Cohort" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CohortIdentifier" column="CohortIdentifier" type="string" length="20" />
@@ -1555,7 +1555,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicense" table="CommunityProviderLicense" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicense" table="CommunityProviderLicense" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CommunityProviderId" column="CommunityProviderId" type="int" />
@@ -1612,7 +1612,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CompetencyObjectiveAggregate.EdFi.CompetencyObjective" table="CompetencyObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CompetencyObjectiveAggregate.EdFi.CompetencyObjective" table="CompetencyObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -1663,7 +1663,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CourseAggregate.EdFi.Course" table="Course" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CourseAggregate.EdFi.Course" table="Course" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseCode" column="CourseCode" type="string" length="60" />
@@ -1938,7 +1938,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CourseOfferingAggregate.EdFi.CourseOffering" table="CourseOffering" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CourseOfferingAggregate.EdFi.CourseOffering" table="CourseOffering" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -2116,7 +2116,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CourseTranscriptAggregate.EdFi.CourseTranscript" table="CourseTranscript" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CourseTranscriptAggregate.EdFi.CourseTranscript" table="CourseTranscript" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseAttemptResultDescriptorId" column="CourseAttemptResultDescriptorId" type="int" />
@@ -2419,7 +2419,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CredentialAggregate.EdFi.Credential" table="Credential" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CredentialAggregate.EdFi.Credential" table="Credential" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CredentialIdentifier" column="CredentialIdentifier" type="string" length="60" />
@@ -2557,7 +2557,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DescriptorAggregate.EdFi.Descriptor" table="Descriptor" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.DescriptorAggregate.EdFi.Descriptor" table="Descriptor" lazy="false" abstract="true" discriminator-value="null">
     <id name="DescriptorId" column="DescriptorId" type="int">
       <generator class="identity" />
     </id>
@@ -5632,7 +5632,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DescriptorMappingAggregate.EdFi.DescriptorMapping" table="DescriptorMapping" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.DescriptorMappingAggregate.EdFi.DescriptorMapping" table="DescriptorMapping" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="MappedNamespace" column="MappedNamespace" type="string" length="255" />
@@ -5716,7 +5716,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DisciplineActionAggregate.EdFi.DisciplineAction" table="DisciplineAction" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.DisciplineActionAggregate.EdFi.DisciplineAction" table="DisciplineAction" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="DisciplineActionIdentifier" column="DisciplineActionIdentifier" type="string" length="32" />
@@ -5935,7 +5935,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DisciplineIncidentAggregate.EdFi.DisciplineIncident" table="DisciplineIncident" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.DisciplineIncidentAggregate.EdFi.DisciplineIncident" table="DisciplineIncident" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="20" />
@@ -6095,7 +6095,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationContentAggregate.EdFi.EducationContent" table="EducationContent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationContentAggregate.EdFi.EducationContent" table="EducationContent" lazy="false" discriminator-value="null">
     <id name="ContentIdentifier" column="ContentIdentifier" type="string" length="225">
       <generator class="assigned" />
     </id>
@@ -6374,7 +6374,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationAggregate.EdFi.EducationOrganization" table="EducationOrganization" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationAggregate.EdFi.EducationOrganization" table="EducationOrganization" lazy="false" abstract="true" discriminator-value="null">
     <id name="EducationOrganizationId" column="EducationOrganizationId" type="int">
       <generator class="assigned" />
     </id>
@@ -6963,7 +6963,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationInterventionPrescriptionAssociationAggregate.EdFi.EducationOrganizationInterventionPrescriptionAssociation" table="EducationOrganizationInterventionPrescriptionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationInterventionPrescriptionAssociationAggregate.EdFi.EducationOrganizationInterventionPrescriptionAssociation" table="EducationOrganizationInterventionPrescriptionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -7017,7 +7017,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationNetworkAssociationAggregate.EdFi.EducationOrganizationNetworkAssociation" table="EducationOrganizationNetworkAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationNetworkAssociationAggregate.EdFi.EducationOrganizationNetworkAssociation" table="EducationOrganizationNetworkAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationNetworkId" column="EducationOrganizationNetworkId" type="int" />
@@ -7069,7 +7069,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationPeerAssociationAggregate.EdFi.EducationOrganizationPeerAssociation" table="EducationOrganizationPeerAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationPeerAssociationAggregate.EdFi.EducationOrganizationPeerAssociation" table="EducationOrganizationPeerAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -7120,7 +7120,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.FeederSchoolAssociationAggregate.EdFi.FeederSchoolAssociation" table="FeederSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.FeederSchoolAssociationAggregate.EdFi.FeederSchoolAssociation" table="FeederSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -7173,7 +7173,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.FunctionDimensionAggregate.EdFi.FunctionDimension" table="FunctionDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.FunctionDimensionAggregate.EdFi.FunctionDimension" table="FunctionDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -7251,7 +7251,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.FundDimensionAggregate.EdFi.FundDimension" table="FundDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.FundDimensionAggregate.EdFi.FundDimension" table="FundDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -7333,7 +7333,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociation" table="GeneralStudentProgramAssociation" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociation" table="GeneralStudentProgramAssociation" lazy="false" abstract="true" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -7940,7 +7940,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GradeAggregate.EdFi.Grade" table="Grade" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GradeAggregate.EdFi.Grade" table="Grade" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -8072,7 +8072,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GradebookEntryAggregate.EdFi.GradebookEntry" table="GradebookEntry" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GradebookEntryAggregate.EdFi.GradebookEntry" table="GradebookEntry" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradebookEntryIdentifier" column="GradebookEntryIdentifier" type="string" length="60" />
@@ -8182,7 +8182,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GradingPeriodAggregate.EdFi.GradingPeriod" table="GradingPeriod" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GradingPeriodAggregate.EdFi.GradingPeriod" table="GradingPeriod" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -8238,7 +8238,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GraduationPlanAggregate.EdFi.GraduationPlan" table="GraduationPlan" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GraduationPlanAggregate.EdFi.GraduationPlan" table="GraduationPlan" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -8577,7 +8577,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.InterventionAggregate.EdFi.Intervention" table="Intervention" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.InterventionAggregate.EdFi.Intervention" table="Intervention" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -8973,7 +8973,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.InterventionPrescriptionAggregate.EdFi.InterventionPrescription" table="InterventionPrescription" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.InterventionPrescriptionAggregate.EdFi.InterventionPrescription" table="InterventionPrescription" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -9259,7 +9259,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.InterventionStudyAggregate.EdFi.InterventionStudy" table="InterventionStudy" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.InterventionStudyAggregate.EdFi.InterventionStudy" table="InterventionStudy" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -9586,7 +9586,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LearningObjectiveAggregate.EdFi.LearningObjective" table="LearningObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LearningObjectiveAggregate.EdFi.LearningObjective" table="LearningObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LearningObjectiveId" column="LearningObjectiveId" type="string" length="60" />
@@ -9818,7 +9818,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LearningStandardAggregate.EdFi.LearningStandard" table="LearningStandard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LearningStandardAggregate.EdFi.LearningStandard" table="LearningStandard" lazy="false" discriminator-value="null">
     <id name="LearningStandardId" column="LearningStandardId" type="string" length="60">
       <generator class="assigned" />
     </id>
@@ -10075,7 +10075,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociation" table="LearningStandardEquivalenceAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociation" table="LearningStandardEquivalenceAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -10130,7 +10130,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalAccountAggregate.EdFi.LocalAccount" table="LocalAccount" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalAccountAggregate.EdFi.LocalAccount" table="LocalAccount" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10224,7 +10224,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalActualAggregate.EdFi.LocalActual" table="LocalActual" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalActualAggregate.EdFi.LocalActual" table="LocalActual" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10279,7 +10279,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalBudgetAggregate.EdFi.LocalBudget" table="LocalBudget" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalBudgetAggregate.EdFi.LocalBudget" table="LocalBudget" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10335,7 +10335,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalContractedStaffAggregate.EdFi.LocalContractedStaff" table="LocalContractedStaff" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalContractedStaffAggregate.EdFi.LocalContractedStaff" table="LocalContractedStaff" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10455,7 +10455,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalEncumbranceAggregate.EdFi.LocalEncumbrance" table="LocalEncumbrance" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalEncumbranceAggregate.EdFi.LocalEncumbrance" table="LocalEncumbrance" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10511,7 +10511,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalPayrollAggregate.EdFi.LocalPayroll" table="LocalPayroll" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalPayrollAggregate.EdFi.LocalPayroll" table="LocalPayroll" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10568,7 +10568,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocationAggregate.EdFi.Location" table="Location" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocationAggregate.EdFi.Location" table="Location" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ClassroomIdentificationCode" column="ClassroomIdentificationCode" type="string" length="60" />
@@ -10617,7 +10617,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ObjectDimensionAggregate.EdFi.ObjectDimension" table="ObjectDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ObjectDimensionAggregate.EdFi.ObjectDimension" table="ObjectDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -10696,7 +10696,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ObjectiveAssessmentAggregate.EdFi.ObjectiveAssessment" table="ObjectiveAssessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ObjectiveAssessmentAggregate.EdFi.ObjectiveAssessment" table="ObjectiveAssessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -10912,7 +10912,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.OpenStaffPositionAggregate.EdFi.OpenStaffPosition" table="OpenStaffPosition" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.OpenStaffPositionAggregate.EdFi.OpenStaffPosition" table="OpenStaffPosition" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -11032,7 +11032,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.OperationalUnitDimensionAggregate.EdFi.OperationalUnitDimension" table="OperationalUnitDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.OperationalUnitDimensionAggregate.EdFi.OperationalUnitDimension" table="OperationalUnitDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -11108,7 +11108,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ParentAggregate.EdFi.Parent" table="Parent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ParentAggregate.EdFi.Parent" table="Parent" lazy="false" discriminator-value="null">
     <id name="ParentUSI" column="ParentUSI" type="int">
       <generator class="identity" />
     </id>
@@ -11498,7 +11498,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PersonAggregate.EdFi.Person" table="Person" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PersonAggregate.EdFi.Person" table="Person" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="PersonId" column="PersonId" type="string" length="32" />
@@ -11543,7 +11543,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PostSecondaryEventAggregate.EdFi.PostSecondaryEvent" table="PostSecondaryEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PostSecondaryEventAggregate.EdFi.PostSecondaryEvent" table="PostSecondaryEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EventDate" column="EventDate" type="date" />
@@ -11620,7 +11620,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ProgramAggregate.EdFi.Program" table="Program" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ProgramAggregate.EdFi.Program" table="Program" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -11852,7 +11852,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ProgramDimensionAggregate.EdFi.ProgramDimension" table="ProgramDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ProgramDimensionAggregate.EdFi.ProgramDimension" table="ProgramDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -11930,7 +11930,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ProjectDimensionAggregate.EdFi.ProjectDimension" table="ProjectDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ProjectDimensionAggregate.EdFi.ProjectDimension" table="ProjectDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -12012,7 +12012,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ReportCardAggregate.EdFi.ReportCard" table="ReportCard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ReportCardAggregate.EdFi.ReportCard" table="ReportCard" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -12286,7 +12286,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.RestraintEventAggregate.EdFi.RestraintEvent" table="RestraintEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.RestraintEventAggregate.EdFi.RestraintEvent" table="RestraintEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="RestraintEventIdentifier" column="RestraintEventIdentifier" type="string" length="20" />
@@ -12506,7 +12506,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SectionAggregate.EdFi.Section" table="Section" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SectionAggregate.EdFi.Section" table="Section" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -12789,7 +12789,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SectionAttendanceTakenEventAggregate.EdFi.SectionAttendanceTakenEvent" table="SectionAttendanceTakenEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SectionAttendanceTakenEventAggregate.EdFi.SectionAttendanceTakenEvent" table="SectionAttendanceTakenEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -12857,7 +12857,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SessionAggregate.EdFi.Session" table="Session" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SessionAggregate.EdFi.Session" table="Session" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolId" column="SchoolId" type="int" />
@@ -12993,7 +12993,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SourceDimensionAggregate.EdFi.SourceDimension" table="SourceDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SourceDimensionAggregate.EdFi.SourceDimension" table="SourceDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -13069,7 +13069,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffAggregate.EdFi.Staff" table="Staff" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffAggregate.EdFi.Staff" table="Staff" lazy="false" discriminator-value="null">
     <id name="StaffUSI" column="StaffUSI" type="int">
       <generator class="identity" />
     </id>
@@ -13740,7 +13740,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEvent" table="StaffAbsenceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEvent" table="StaffAbsenceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AbsenceEventCategoryDescriptorId" column="AbsenceEventCategoryDescriptorId" type="int" />
@@ -13792,7 +13792,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffCohortAssociationAggregate.EdFi.StaffCohortAssociation" table="StaffCohortAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffCohortAssociationAggregate.EdFi.StaffCohortAssociation" table="StaffCohortAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -13848,7 +13848,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffDisciplineIncidentAssociationAggregate.EdFi.StaffDisciplineIncidentAssociation" table="StaffDisciplineIncidentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffDisciplineIncidentAssociationAggregate.EdFi.StaffDisciplineIncidentAssociation" table="StaffDisciplineIncidentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="20" />
@@ -13937,7 +13937,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociation" table="StaffEducationOrganizationAssignmentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociation" table="StaffEducationOrganizationAssignmentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -14009,7 +14009,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociation" table="StaffEducationOrganizationContactAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociation" table="StaffEducationOrganizationContactAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ContactTitle" column="ContactTitle" type="string" length="75" />
@@ -14188,7 +14188,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociation" table="StaffEducationOrganizationEmploymentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociation" table="StaffEducationOrganizationEmploymentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -14254,7 +14254,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffLeaveAggregate.EdFi.StaffLeave" table="StaffLeave" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffLeaveAggregate.EdFi.StaffLeave" table="StaffLeave" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -14308,7 +14308,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffProgramAssociationAggregate.EdFi.StaffProgramAssociation" table="StaffProgramAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffProgramAssociationAggregate.EdFi.StaffProgramAssociation" table="StaffProgramAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -14366,7 +14366,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociation" table="StaffSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociation" table="StaffSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramAssignmentDescriptorId" column="ProgramAssignmentDescriptorId" type="int" />
@@ -14501,7 +14501,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociation" table="StaffSectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociation" table="StaffSectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -14616,7 +14616,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAggregate.EdFi.Student" table="Student" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAggregate.EdFi.Student" table="Student" lazy="false" discriminator-value="null">
     <id name="StudentUSI" column="StudentUSI" type="int">
       <generator class="identity" />
     </id>
@@ -14823,7 +14823,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecord" table="StudentAcademicRecord" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecord" table="StudentAcademicRecord" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -15176,7 +15176,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAssessmentAggregate.EdFi.StudentAssessment" table="StudentAssessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAssessmentAggregate.EdFi.StudentAssessment" table="StudentAssessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -15585,7 +15585,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociation" table="StudentAssessmentEducationOrganizationAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociation" table="StudentAssessmentEducationOrganizationAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -15648,7 +15648,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentCohortAssociationAggregate.EdFi.StudentCohortAssociation" table="StudentCohortAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentCohortAssociationAggregate.EdFi.StudentCohortAssociation" table="StudentCohortAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -15756,7 +15756,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentCompetencyObjectiveAggregate.EdFi.StudentCompetencyObjective" table="StudentCompetencyObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentCompetencyObjectiveAggregate.EdFi.StudentCompetencyObjective" table="StudentCompetencyObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -16036,7 +16036,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentAssociationAggregate.EdFi.StudentDisciplineIncidentAssociation" table="StudentDisciplineIncidentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentAssociationAggregate.EdFi.StudentDisciplineIncidentAssociation" table="StudentDisciplineIncidentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="20" />
@@ -16127,7 +16127,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociation" table="StudentDisciplineIncidentBehaviorAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociation" table="StudentDisciplineIncidentBehaviorAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BehaviorDescriptorId" column="BehaviorDescriptorId" type="int" />
@@ -16219,7 +16219,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociation" table="StudentDisciplineIncidentNonOffenderAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociation" table="StudentDisciplineIncidentNonOffenderAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="20" />
@@ -16306,7 +16306,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociation" table="StudentEducationOrganizationAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociation" table="StudentEducationOrganizationAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -17100,7 +17100,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociation" table="StudentEducationOrganizationResponsibilityAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociation" table="StudentEducationOrganizationResponsibilityAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -17154,7 +17154,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntry" table="StudentGradebookEntry" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntry" table="StudentGradebookEntry" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradebookEntryIdentifier" column="GradebookEntryIdentifier" type="string" length="60" />
@@ -17248,7 +17248,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociation" table="StudentInterventionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociation" table="StudentInterventionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -17350,7 +17350,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentInterventionAttendanceEventAggregate.EdFi.StudentInterventionAttendanceEvent" table="StudentInterventionAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentInterventionAttendanceEventAggregate.EdFi.StudentInterventionAttendanceEvent" table="StudentInterventionAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -17481,7 +17481,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentLearningObjectiveAggregate.EdFi.StudentLearningObjective" table="StudentLearningObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentLearningObjectiveAggregate.EdFi.StudentLearningObjective" table="StudentLearningObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -17721,7 +17721,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentParentAssociationAggregate.EdFi.StudentParentAssociation" table="StudentParentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentParentAssociationAggregate.EdFi.StudentParentAssociation" table="StudentParentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ParentUSI" column="ParentUSI" type="int" />
@@ -17815,7 +17815,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentProgramAttendanceEventAggregate.EdFi.StudentProgramAttendanceEvent" table="StudentProgramAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentProgramAttendanceEventAggregate.EdFi.StudentProgramAttendanceEvent" table="StudentProgramAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -17880,7 +17880,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociation" table="StudentSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociation" table="StudentSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EntryDate" column="EntryDate" type="date" />
@@ -18046,7 +18046,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAttendanceEventAggregate.EdFi.StudentSchoolAttendanceEvent" table="StudentSchoolAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAttendanceEventAggregate.EdFi.StudentSchoolAttendanceEvent" table="StudentSchoolAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -18148,7 +18148,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociation" table="StudentSectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociation" table="StudentSectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -18218,7 +18218,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEvent" table="StudentSectionAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEvent" table="StudentSectionAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -18584,7 +18584,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyAggregate.EdFi.Survey" table="Survey" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyAggregate.EdFi.Survey" table="Survey" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -18648,7 +18648,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyCourseAssociationAggregate.EdFi.SurveyCourseAssociation" table="SurveyCourseAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyCourseAssociationAggregate.EdFi.SurveyCourseAssociation" table="SurveyCourseAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseCode" column="CourseCode" type="string" length="60" />
@@ -18705,7 +18705,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyProgramAssociationAggregate.EdFi.SurveyProgramAssociation" table="SurveyProgramAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyProgramAssociationAggregate.EdFi.SurveyProgramAssociation" table="SurveyProgramAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -18762,7 +18762,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyQuestionAggregate.EdFi.SurveyQuestion" table="SurveyQuestion" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyQuestionAggregate.EdFi.SurveyQuestion" table="SurveyQuestion" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -18895,7 +18895,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyQuestionResponseAggregate.EdFi.SurveyQuestionResponse" table="SurveyQuestionResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyQuestionResponseAggregate.EdFi.SurveyQuestionResponse" table="SurveyQuestionResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19035,7 +19035,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseAggregate.EdFi.SurveyResponse" table="SurveyResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseAggregate.EdFi.SurveyResponse" table="SurveyResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19138,7 +19138,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveyResponseEducationOrganizationTargetAssociation" table="SurveyResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveyResponseEducationOrganizationTargetAssociation" table="SurveyResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -19194,7 +19194,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseStaffTargetAssociationAggregate.EdFi.SurveyResponseStaffTargetAssociation" table="SurveyResponseStaffTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseStaffTargetAssociationAggregate.EdFi.SurveyResponseStaffTargetAssociation" table="SurveyResponseStaffTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19249,7 +19249,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionAggregate.EdFi.SurveySection" table="SurveySection" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionAggregate.EdFi.SurveySection" table="SurveySection" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19303,7 +19303,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionAssociationAggregate.EdFi.SurveySectionAssociation" table="SurveySectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionAssociationAggregate.EdFi.SurveySectionAssociation" table="SurveySectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -19365,7 +19365,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseAggregate.EdFi.SurveySectionResponse" table="SurveySectionResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseAggregate.EdFi.SurveySectionResponse" table="SurveySectionResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19425,7 +19425,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveySectionResponseEducationOrganizationTargetAssociation" table="SurveySectionResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveySectionResponseEducationOrganizationTargetAssociation" table="SurveySectionResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -19484,7 +19484,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseStaffTargetAssociationAggregate.EdFi.SurveySectionResponseStaffTargetAssociation" table="SurveySectionResponseStaffTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseStaffTargetAssociationAggregate.EdFi.SurveySectionResponseStaffTargetAssociation" table="SurveySectionResponseStaffTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
index 73ffc27d77..6817c488de 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/4.0.0/DataStandard_400_ApprovalTests.Verify.Standard_Std_4.0.0_EntityOrmMappings_PgSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
@@ -2,7 +2,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicWeekAggregate.EdFi.AcademicWeekQ" table="AcademicWeek" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicWeekAggregate.EdFi.AcademicWeekQ" table="AcademicWeek" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolId" column="SchoolId" type="int" />
@@ -49,7 +49,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AccountabilityRatingAggregate.EdFi.AccountabilityRatingQ" table="AccountabilityRating" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AccountabilityRatingAggregate.EdFi.AccountabilityRatingQ" table="AccountabilityRating" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -93,7 +93,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentAggregate.EdFi.AssessmentQ" table="Assessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentAggregate.EdFi.AssessmentQ" table="Assessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -650,7 +650,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemAggregate.EdFi.AssessmentItemQ" table="AssessmentItem" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemAggregate.EdFi.AssessmentItemQ" table="AssessmentItem" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -790,7 +790,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentScoreRangeLearningStandardAggregate.EdFi.AssessmentScoreRangeLearningStandardQ" table="AssessmentScoreRangeLearningStandard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentScoreRangeLearningStandardAggregate.EdFi.AssessmentScoreRangeLearningStandardQ" table="AssessmentScoreRangeLearningStandard" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -878,7 +878,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.BalanceSheetDimensionAggregate.EdFi.BalanceSheetDimensionQ" table="BalanceSheetDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.BalanceSheetDimensionAggregate.EdFi.BalanceSheetDimensionQ" table="BalanceSheetDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -956,7 +956,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.BellScheduleAggregate.EdFi.BellScheduleQ" table="BellSchedule" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.BellScheduleAggregate.EdFi.BellScheduleQ" table="BellSchedule" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BellScheduleName" column="BellScheduleName" type="string" length="60" />
@@ -1102,7 +1102,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarAggregate.EdFi.CalendarQ" table="Calendar" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarAggregate.EdFi.CalendarQ" table="Calendar" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -1211,7 +1211,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarDateAggregate.EdFi.CalendarDateQ" table="CalendarDate" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarDateAggregate.EdFi.CalendarDateQ" table="CalendarDate" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -1301,7 +1301,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ChartOfAccountAggregate.EdFi.ChartOfAccountQ" table="ChartOfAccount" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ChartOfAccountAggregate.EdFi.ChartOfAccountQ" table="ChartOfAccount" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -1431,7 +1431,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ClassPeriodAggregate.EdFi.ClassPeriodQ" table="ClassPeriod" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ClassPeriodAggregate.EdFi.ClassPeriodQ" table="ClassPeriod" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ClassPeriodName" column="ClassPeriodName" type="string" length="60" />
@@ -1526,7 +1526,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortAggregate.EdFi.CohortQ" table="Cohort" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortAggregate.EdFi.CohortQ" table="Cohort" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CohortIdentifier" column="CohortIdentifier" type="string" length="20" />
@@ -1639,7 +1639,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicenseQ" table="CommunityProviderLicense" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicenseQ" table="CommunityProviderLicense" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CommunityProviderId" column="CommunityProviderId" type="int" />
@@ -1690,7 +1690,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CompetencyObjectiveAggregate.EdFi.CompetencyObjectiveQ" table="CompetencyObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CompetencyObjectiveAggregate.EdFi.CompetencyObjectiveQ" table="CompetencyObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -1742,7 +1742,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAggregate.EdFi.CourseQ" table="Course" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAggregate.EdFi.CourseQ" table="Course" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseCode" column="CourseCode" type="string" length="60" />
@@ -2066,7 +2066,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseOfferingAggregate.EdFi.CourseOfferingQ" table="CourseOffering" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseOfferingAggregate.EdFi.CourseOfferingQ" table="CourseOffering" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -2247,7 +2247,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptQ" table="CourseTranscript" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptQ" table="CourseTranscript" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseAttemptResultDescriptorId" column="CourseAttemptResultDescriptorId" type="int" />
@@ -2572,7 +2572,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" table="Credential" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" table="Credential" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CredentialIdentifier" column="CredentialIdentifier" type="string" length="60" />
@@ -2757,7 +2757,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorAggregate.EdFi.DescriptorQ" table="Descriptor" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorAggregate.EdFi.DescriptorQ" table="Descriptor" lazy="false" abstract="true" discriminator-value="null">
     <id name="DescriptorId" column="DescriptorId" type="int">
       <generator class="identity" />
     </id>
@@ -8591,7 +8591,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorMappingAggregate.EdFi.DescriptorMappingQ" table="DescriptorMapping" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorMappingAggregate.EdFi.DescriptorMappingQ" table="DescriptorMapping" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="MappedNamespace" column="MappedNamespace" type="string" length="255" />
@@ -8666,7 +8666,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionAggregate.EdFi.DisciplineActionQ" table="DisciplineAction" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionAggregate.EdFi.DisciplineActionQ" table="DisciplineAction" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="DisciplineActionIdentifier" column="DisciplineActionIdentifier" type="string" length="32" />
@@ -8880,7 +8880,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentQ" table="DisciplineIncident" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentQ" table="DisciplineIncident" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="20" />
@@ -9078,7 +9078,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" table="EducationContent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" table="EducationContent" lazy="false" discriminator-value="null">
     <id name="ContentIdentifier" column="ContentIdentifier" type="string" length="225">
       <generator class="assigned" />
     </id>
@@ -9394,7 +9394,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationQ" table="EducationOrganization" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationQ" table="EducationOrganization" lazy="false" abstract="true" discriminator-value="null">
     <id name="EducationOrganizationId" column="EducationOrganizationId" type="int">
       <generator class="assigned" />
     </id>
@@ -10495,7 +10495,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationInterventionPrescriptionAssociationAggregate.EdFi.EducationOrganizationInterventionPrescriptionAssociationQ" table="EducationOrganizationInterventionPrescriptionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationInterventionPrescriptionAssociationAggregate.EdFi.EducationOrganizationInterventionPrescriptionAssociationQ" table="EducationOrganizationInterventionPrescriptionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -10538,7 +10538,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationNetworkAssociationAggregate.EdFi.EducationOrganizationNetworkAssociationQ" table="EducationOrganizationNetworkAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationNetworkAssociationAggregate.EdFi.EducationOrganizationNetworkAssociationQ" table="EducationOrganizationNetworkAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationNetworkId" column="EducationOrganizationNetworkId" type="int" />
@@ -10579,7 +10579,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationPeerAssociationAggregate.EdFi.EducationOrganizationPeerAssociationQ" table="EducationOrganizationPeerAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationPeerAssociationAggregate.EdFi.EducationOrganizationPeerAssociationQ" table="EducationOrganizationPeerAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -10618,7 +10618,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FeederSchoolAssociationAggregate.EdFi.FeederSchoolAssociationQ" table="FeederSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FeederSchoolAssociationAggregate.EdFi.FeederSchoolAssociationQ" table="FeederSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -10660,7 +10660,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FunctionDimensionAggregate.EdFi.FunctionDimensionQ" table="FunctionDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FunctionDimensionAggregate.EdFi.FunctionDimensionQ" table="FunctionDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -10738,7 +10738,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FundDimensionAggregate.EdFi.FundDimensionQ" table="FundDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FundDimensionAggregate.EdFi.FundDimensionQ" table="FundDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -10816,7 +10816,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociationQ" table="GeneralStudentProgramAssociation" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociationQ" table="GeneralStudentProgramAssociation" lazy="false" abstract="true" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -11462,7 +11462,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeAggregate.EdFi.GradeQ" table="Grade" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeAggregate.EdFi.GradeQ" table="Grade" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -11609,7 +11609,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryAggregate.EdFi.GradebookEntryQ" table="GradebookEntry" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryAggregate.EdFi.GradebookEntryQ" table="GradebookEntry" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradebookEntryIdentifier" column="GradebookEntryIdentifier" type="string" length="60" />
@@ -11717,7 +11717,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodAggregate.EdFi.GradingPeriodQ" table="GradingPeriod" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodAggregate.EdFi.GradingPeriodQ" table="GradingPeriod" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -11824,7 +11824,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanAggregate.EdFi.GraduationPlanQ" table="GraduationPlan" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanAggregate.EdFi.GraduationPlanQ" table="GraduationPlan" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -12200,7 +12200,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionAggregate.EdFi.InterventionQ" table="Intervention" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionAggregate.EdFi.InterventionQ" table="Intervention" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -12619,7 +12619,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionPrescriptionAggregate.EdFi.InterventionPrescriptionQ" table="InterventionPrescription" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionPrescriptionAggregate.EdFi.InterventionPrescriptionQ" table="InterventionPrescription" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -12936,7 +12936,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionStudyAggregate.EdFi.InterventionStudyQ" table="InterventionStudy" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionStudyAggregate.EdFi.InterventionStudyQ" table="InterventionStudy" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -13282,7 +13282,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningObjectiveAggregate.EdFi.LearningObjectiveQ" table="LearningObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningObjectiveAggregate.EdFi.LearningObjectiveQ" table="LearningObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LearningObjectiveId" column="LearningObjectiveId" type="string" length="60" />
@@ -13532,7 +13532,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardQ" table="LearningStandard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardQ" table="LearningStandard" lazy="false" discriminator-value="null">
     <id name="LearningStandardId" column="LearningStandardId" type="string" length="60">
       <generator class="assigned" />
     </id>
@@ -13871,7 +13871,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociationQ" table="LearningStandardEquivalenceAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociationQ" table="LearningStandardEquivalenceAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -13917,7 +13917,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalAccountAggregate.EdFi.LocalAccountQ" table="LocalAccount" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalAccountAggregate.EdFi.LocalAccountQ" table="LocalAccount" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14046,7 +14046,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalActualAggregate.EdFi.LocalActualQ" table="LocalActual" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalActualAggregate.EdFi.LocalActualQ" table="LocalActual" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14091,7 +14091,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalBudgetAggregate.EdFi.LocalBudgetQ" table="LocalBudget" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalBudgetAggregate.EdFi.LocalBudgetQ" table="LocalBudget" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14136,7 +14136,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalContractedStaffAggregate.EdFi.LocalContractedStaffQ" table="LocalContractedStaff" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalContractedStaffAggregate.EdFi.LocalContractedStaffQ" table="LocalContractedStaff" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14252,7 +14252,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEncumbranceAggregate.EdFi.LocalEncumbranceQ" table="LocalEncumbrance" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEncumbranceAggregate.EdFi.LocalEncumbranceQ" table="LocalEncumbrance" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14297,7 +14297,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalPayrollAggregate.EdFi.LocalPayrollQ" table="LocalPayroll" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalPayrollAggregate.EdFi.LocalPayrollQ" table="LocalPayroll" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14346,7 +14346,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocationAggregate.EdFi.LocationQ" table="Location" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocationAggregate.EdFi.LocationQ" table="Location" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ClassroomIdentificationCode" column="ClassroomIdentificationCode" type="string" length="60" />
@@ -14392,7 +14392,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ObjectDimensionAggregate.EdFi.ObjectDimensionQ" table="ObjectDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ObjectDimensionAggregate.EdFi.ObjectDimensionQ" table="ObjectDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -14470,7 +14470,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ObjectiveAssessmentAggregate.EdFi.ObjectiveAssessmentQ" table="ObjectiveAssessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ObjectiveAssessmentAggregate.EdFi.ObjectiveAssessmentQ" table="ObjectiveAssessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -14711,7 +14711,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.OpenStaffPositionAggregate.EdFi.OpenStaffPositionQ" table="OpenStaffPosition" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.OpenStaffPositionAggregate.EdFi.OpenStaffPositionQ" table="OpenStaffPosition" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -14838,7 +14838,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.OperationalUnitDimensionAggregate.EdFi.OperationalUnitDimensionQ" table="OperationalUnitDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.OperationalUnitDimensionAggregate.EdFi.OperationalUnitDimensionQ" table="OperationalUnitDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -14916,7 +14916,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ParentAggregate.EdFi.ParentQ" table="Parent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ParentAggregate.EdFi.ParentQ" table="Parent" lazy="false" discriminator-value="null">
     <id name="ParentUSI" column="ParentUSI" type="int">
       <generator class="identity" />
     </id>
@@ -15354,7 +15354,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.PersonAggregate.EdFi.PersonQ" table="Person" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.PersonAggregate.EdFi.PersonQ" table="Person" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="PersonId" column="PersonId" type="string" length="32" />
@@ -15414,7 +15414,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventAggregate.EdFi.PostSecondaryEventQ" table="PostSecondaryEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventAggregate.EdFi.PostSecondaryEventQ" table="PostSecondaryEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EventDate" column="EventDate" type="date" />
@@ -15485,7 +15485,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAggregate.EdFi.ProgramQ" table="Program" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAggregate.EdFi.ProgramQ" table="Program" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -15790,7 +15790,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramDimensionAggregate.EdFi.ProgramDimensionQ" table="ProgramDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramDimensionAggregate.EdFi.ProgramDimensionQ" table="ProgramDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -15868,7 +15868,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProjectDimensionAggregate.EdFi.ProjectDimensionQ" table="ProjectDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProjectDimensionAggregate.EdFi.ProjectDimensionQ" table="ProjectDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -15946,7 +15946,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ReportCardAggregate.EdFi.ReportCardQ" table="ReportCard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ReportCardAggregate.EdFi.ReportCardQ" table="ReportCard" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -16223,7 +16223,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventAggregate.EdFi.RestraintEventQ" table="RestraintEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventAggregate.EdFi.RestraintEventQ" table="RestraintEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="RestraintEventIdentifier" column="RestraintEventIdentifier" type="string" length="20" />
@@ -16551,7 +16551,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionQ" table="Section" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionQ" table="Section" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -16930,7 +16930,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAttendanceTakenEventAggregate.EdFi.SectionAttendanceTakenEventQ" table="SectionAttendanceTakenEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAttendanceTakenEventAggregate.EdFi.SectionAttendanceTakenEventQ" table="SectionAttendanceTakenEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -16986,7 +16986,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SessionAggregate.EdFi.SessionQ" table="Session" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SessionAggregate.EdFi.SessionQ" table="Session" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolId" column="SchoolId" type="int" />
@@ -17141,7 +17141,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SourceDimensionAggregate.EdFi.SourceDimensionQ" table="SourceDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SourceDimensionAggregate.EdFi.SourceDimensionQ" table="SourceDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -17219,7 +17219,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAggregate.EdFi.StaffQ" table="Staff" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAggregate.EdFi.StaffQ" table="Staff" lazy="false" discriminator-value="null">
     <id name="StaffUSI" column="StaffUSI" type="int">
       <generator class="identity" />
     </id>
@@ -18106,7 +18106,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEventQ" table="StaffAbsenceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEventQ" table="StaffAbsenceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AbsenceEventCategoryDescriptorId" column="AbsenceEventCategoryDescriptorId" type="int" />
@@ -18148,7 +18148,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffCohortAssociationAggregate.EdFi.StaffCohortAssociationQ" table="StaffCohortAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffCohortAssociationAggregate.EdFi.StaffCohortAssociationQ" table="StaffCohortAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -18192,7 +18192,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffDisciplineIncidentAssociationAggregate.EdFi.StaffDisciplineIncidentAssociationQ" table="StaffDisciplineIncidentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffDisciplineIncidentAssociationAggregate.EdFi.StaffDisciplineIncidentAssociationQ" table="StaffDisciplineIncidentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="20" />
@@ -18271,7 +18271,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociationQ" table="StaffEducationOrganizationAssignmentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociationQ" table="StaffEducationOrganizationAssignmentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -18334,7 +18334,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociationQ" table="StaffEducationOrganizationContactAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociationQ" table="StaffEducationOrganizationContactAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ContactTitle" column="ContactTitle" type="string" length="75" />
@@ -18508,7 +18508,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" table="StaffEducationOrganizationEmploymentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" table="StaffEducationOrganizationEmploymentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -18581,7 +18581,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveAggregate.EdFi.StaffLeaveQ" table="StaffLeave" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveAggregate.EdFi.StaffLeaveQ" table="StaffLeave" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -18624,7 +18624,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffProgramAssociationAggregate.EdFi.StaffProgramAssociationQ" table="StaffProgramAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffProgramAssociationAggregate.EdFi.StaffProgramAssociationQ" table="StaffProgramAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -18670,7 +18670,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociationQ" table="StaffSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociationQ" table="StaffSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramAssignmentDescriptorId" column="ProgramAssignmentDescriptorId" type="int" />
@@ -18799,7 +18799,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociationQ" table="StaffSectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociationQ" table="StaffSectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -18908,7 +18908,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentQ" table="Student" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentQ" table="Student" lazy="false" discriminator-value="null">
     <id name="StudentUSI" column="StudentUSI" type="int">
       <generator class="identity" />
     </id>
@@ -19313,7 +19313,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordQ" table="StudentAcademicRecord" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordQ" table="StudentAcademicRecord" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -19694,7 +19694,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" table="StudentAssessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" table="StudentAssessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -20147,7 +20147,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociationQ" table="StudentAssessmentEducationOrganizationAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociationQ" table="StudentAssessmentEducationOrganizationAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -20200,7 +20200,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCohortAssociationAggregate.EdFi.StudentCohortAssociationQ" table="StudentCohortAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCohortAssociationAggregate.EdFi.StudentCohortAssociationQ" table="StudentCohortAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -20291,7 +20291,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCompetencyObjectiveAggregate.EdFi.StudentCompetencyObjectiveQ" table="StudentCompetencyObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCompetencyObjectiveAggregate.EdFi.StudentCompetencyObjectiveQ" table="StudentCompetencyObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -20585,7 +20585,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentAssociationAggregate.EdFi.StudentDisciplineIncidentAssociationQ" table="StudentDisciplineIncidentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentAssociationAggregate.EdFi.StudentDisciplineIncidentAssociationQ" table="StudentDisciplineIncidentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="20" />
@@ -20678,7 +20678,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociationQ" table="StudentDisciplineIncidentBehaviorAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociationQ" table="StudentDisciplineIncidentBehaviorAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BehaviorDescriptorId" column="BehaviorDescriptorId" type="int" />
@@ -20774,7 +20774,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociationQ" table="StudentDisciplineIncidentNonOffenderAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociationQ" table="StudentDisciplineIncidentNonOffenderAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="20" />
@@ -20853,7 +20853,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" table="StudentEducationOrganizationAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" table="StudentEducationOrganizationAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -21724,7 +21724,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociationQ" table="StudentEducationOrganizationResponsibilityAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociationQ" table="StudentEducationOrganizationResponsibilityAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -21769,7 +21769,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntryQ" table="StudentGradebookEntry" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntryQ" table="StudentGradebookEntry" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradebookEntryIdentifier" column="GradebookEntryIdentifier" type="string" length="60" />
@@ -21863,7 +21863,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationQ" table="StudentInterventionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationQ" table="StudentInterventionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -21963,7 +21963,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAttendanceEventAggregate.EdFi.StudentInterventionAttendanceEventQ" table="StudentInterventionAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAttendanceEventAggregate.EdFi.StudentInterventionAttendanceEventQ" table="StudentInterventionAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -22099,7 +22099,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLearningObjectiveAggregate.EdFi.StudentLearningObjectiveQ" table="StudentLearningObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentLearningObjectiveAggregate.EdFi.StudentLearningObjectiveQ" table="StudentLearningObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -22350,7 +22350,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentParentAssociationAggregate.EdFi.StudentParentAssociationQ" table="StudentParentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentParentAssociationAggregate.EdFi.StudentParentAssociationQ" table="StudentParentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ParentUSI" column="ParentUSI" type="int" />
@@ -22434,7 +22434,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentProgramAttendanceEventAggregate.EdFi.StudentProgramAttendanceEventQ" table="StudentProgramAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentProgramAttendanceEventAggregate.EdFi.StudentProgramAttendanceEventQ" table="StudentProgramAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -22493,7 +22493,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" table="StudentSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" table="StudentSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EntryDate" column="EntryDate" type="date" />
@@ -22662,7 +22662,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAttendanceEventAggregate.EdFi.StudentSchoolAttendanceEventQ" table="StudentSchoolAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAttendanceEventAggregate.EdFi.StudentSchoolAttendanceEventQ" table="StudentSchoolAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -22757,7 +22757,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociationQ" table="StudentSectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociationQ" table="StudentSectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -22855,7 +22855,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEventQ" table="StudentSectionAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEventQ" table="StudentSectionAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -23234,7 +23234,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyAggregate.EdFi.SurveyQ" table="Survey" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyAggregate.EdFi.SurveyQ" table="Survey" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -23336,7 +23336,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyCourseAssociationAggregate.EdFi.SurveyCourseAssociationQ" table="SurveyCourseAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyCourseAssociationAggregate.EdFi.SurveyCourseAssociationQ" table="SurveyCourseAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseCode" column="CourseCode" type="string" length="60" />
@@ -23379,7 +23379,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyProgramAssociationAggregate.EdFi.SurveyProgramAssociationQ" table="SurveyProgramAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyProgramAssociationAggregate.EdFi.SurveyProgramAssociationQ" table="SurveyProgramAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -23424,7 +23424,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionAggregate.EdFi.SurveyQuestionQ" table="SurveyQuestion" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionAggregate.EdFi.SurveyQuestionQ" table="SurveyQuestion" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -23556,7 +23556,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionResponseAggregate.EdFi.SurveyQuestionResponseQ" table="SurveyQuestionResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionResponseAggregate.EdFi.SurveyQuestionResponseQ" table="SurveyQuestionResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -23684,7 +23684,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseAggregate.EdFi.SurveyResponseQ" table="SurveyResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseAggregate.EdFi.SurveyResponseQ" table="SurveyResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -23813,7 +23813,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveyResponseEducationOrganizationTargetAssociationQ" table="SurveyResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveyResponseEducationOrganizationTargetAssociationQ" table="SurveyResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -23856,7 +23856,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseStaffTargetAssociationAggregate.EdFi.SurveyResponseStaffTargetAssociationQ" table="SurveyResponseStaffTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseStaffTargetAssociationAggregate.EdFi.SurveyResponseStaffTargetAssociationQ" table="SurveyResponseStaffTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -23899,7 +23899,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionAggregate.EdFi.SurveySectionQ" table="SurveySection" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionAggregate.EdFi.SurveySectionQ" table="SurveySection" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -23955,7 +23955,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionAssociationAggregate.EdFi.SurveySectionAssociationQ" table="SurveySectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionAssociationAggregate.EdFi.SurveySectionAssociationQ" table="SurveySectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -24004,7 +24004,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseAggregate.EdFi.SurveySectionResponseQ" table="SurveySectionResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseAggregate.EdFi.SurveySectionResponseQ" table="SurveySectionResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -24070,7 +24070,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveySectionResponseEducationOrganizationTargetAssociationQ" table="SurveySectionResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveySectionResponseEducationOrganizationTargetAssociationQ" table="SurveySectionResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="int" />
@@ -24115,7 +24115,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseStaffTargetAssociationAggregate.EdFi.SurveySectionResponseStaffTargetAssociationQ" table="SurveySectionResponseStaffTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseStaffTargetAssociationAggregate.EdFi.SurveySectionResponseStaffTargetAssociationQ" table="SurveySectionResponseStaffTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
index d7b2b0c5f0..3206f2ac54 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -15,7 +15,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ContactAggregate.Homograph.Contact" table="Contact" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ContactAggregate.Homograph.Contact" table="Contact" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ContactFirstName" column="ContactFirstName" type="string" length="75" />
@@ -136,7 +136,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.NameAggregate.Homograph.Name" table="Name" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.NameAggregate.Homograph.Name" table="Name" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="FirstName" column="FirstName" type="string" length="75" />
@@ -178,7 +178,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SchoolAggregate.Homograph.School" table="School" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SchoolAggregate.Homograph.School" table="School" lazy="false" schema="homograph" discriminator-value="null">
     <id name="SchoolName" column="SchoolName" type="string" length="100">
       <generator class="assigned" />
     </id>
@@ -254,7 +254,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SchoolYearTypeAggregate.Homograph.SchoolYearType" table="SchoolYearType" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SchoolYearTypeAggregate.Homograph.SchoolYearType" table="SchoolYearType" lazy="false" schema="homograph" discriminator-value="null">
     <id name="SchoolYear" column="SchoolYear" type="string" length="20">
       <generator class="assigned" />
     </id>
@@ -296,7 +296,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffAggregate.Homograph.Staff" table="Staff" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffAggregate.Homograph.Staff" table="Staff" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="StaffFirstName" column="StaffFirstName" type="string" length="75" />
@@ -417,7 +417,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAggregate.Homograph.Student" table="Student" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAggregate.Homograph.Student" table="Student" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="StudentFirstName" column="StudentFirstName" type="string" length="75" />
@@ -504,7 +504,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAssociationAggregate.Homograph.StudentSchoolAssociation" table="StudentSchoolAssociation" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAssociationAggregate.Homograph.StudentSchoolAssociation" table="StudentSchoolAssociation" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolName" column="SchoolName" type="string" length="100" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
index d7b2b0c5f0..3206f2ac54 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.Homograph.1.0.0_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -15,7 +15,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ContactAggregate.Homograph.Contact" table="Contact" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ContactAggregate.Homograph.Contact" table="Contact" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ContactFirstName" column="ContactFirstName" type="string" length="75" />
@@ -136,7 +136,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.NameAggregate.Homograph.Name" table="Name" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.NameAggregate.Homograph.Name" table="Name" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="FirstName" column="FirstName" type="string" length="75" />
@@ -178,7 +178,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SchoolAggregate.Homograph.School" table="School" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SchoolAggregate.Homograph.School" table="School" lazy="false" schema="homograph" discriminator-value="null">
     <id name="SchoolName" column="SchoolName" type="string" length="100">
       <generator class="assigned" />
     </id>
@@ -254,7 +254,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SchoolYearTypeAggregate.Homograph.SchoolYearType" table="SchoolYearType" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SchoolYearTypeAggregate.Homograph.SchoolYearType" table="SchoolYearType" lazy="false" schema="homograph" discriminator-value="null">
     <id name="SchoolYear" column="SchoolYear" type="string" length="20">
       <generator class="assigned" />
     </id>
@@ -296,7 +296,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffAggregate.Homograph.Staff" table="Staff" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffAggregate.Homograph.Staff" table="Staff" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="StaffFirstName" column="StaffFirstName" type="string" length="75" />
@@ -417,7 +417,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAggregate.Homograph.Student" table="Student" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAggregate.Homograph.Student" table="Student" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="StudentFirstName" column="StudentFirstName" type="string" length="75" />
@@ -504,7 +504,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAssociationAggregate.Homograph.StudentSchoolAssociation" table="StudentSchoolAssociation" lazy="false" schema="homograph" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAssociationAggregate.Homograph.StudentSchoolAssociation" table="StudentSchoolAssociation" lazy="false" schema="homograph" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolName" column="SchoolName" type="string" length="100" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
index f2448f97e1..74e348d0c6 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -13,7 +13,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.BusAggregate.Sample.Bus" table="Bus" lazy="false" schema="sample" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.BusAggregate.Sample.Bus" table="Bus" lazy="false" schema="sample" discriminator-value="null">
     <id name="BusId" column="BusId" type="string" length="60">
       <generator class="assigned" />
     </id>
@@ -55,7 +55,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.BusRouteAggregate.Sample.BusRoute" table="BusRoute" lazy="false" schema="sample" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.BusRouteAggregate.Sample.BusRoute" table="BusRoute" lazy="false" schema="sample" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BusId" column="BusId" type="string" length="60" />
@@ -1472,7 +1472,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentGraduationPlanAssociationAggregate.Sample.StudentGraduationPlanAssociation" table="StudentGraduationPlanAssociation" lazy="false" schema="sample" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentGraduationPlanAssociationAggregate.Sample.StudentGraduationPlanAssociation" table="StudentGraduationPlanAssociation" lazy="false" schema="sample" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
index cf65fa7139..0f70457662 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.Sample.1.0.0_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -13,7 +13,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.BusAggregate.Sample.Bus" table="Bus" lazy="false" schema="sample" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.BusAggregate.Sample.Bus" table="Bus" lazy="false" schema="sample" discriminator-value="null">
     <id name="BusId" column="BusId" type="string" length="60">
       <generator class="assigned" />
     </id>
@@ -55,7 +55,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.BusRouteAggregate.Sample.BusRoute" table="BusRoute" lazy="false" schema="sample" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.BusRouteAggregate.Sample.BusRoute" table="BusRoute" lazy="false" schema="sample" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BusId" column="BusId" type="string" length="60" />
@@ -1472,7 +1472,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentGraduationPlanAssociationAggregate.Sample.StudentGraduationPlanAssociation" table="StudentGraduationPlanAssociation" lazy="false" schema="sample" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentGraduationPlanAssociationAggregate.Sample.StudentGraduationPlanAssociation" table="StudentGraduationPlanAssociation" lazy="false" schema="sample" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.SampleStudentTranscript.1.0.0_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.SampleStudentTranscript.1.0.0_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
index 2301c7b99e..2968f4dcd4 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.SampleStudentTranscript.1.0.0_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.SampleStudentTranscript.1.0.0_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -13,7 +13,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PostSecondaryOrganizationAggregate.SampleStudentTranscript.PostSecondaryOrganization" table="PostSecondaryOrganization" lazy="false" schema="samplestudenttranscript" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PostSecondaryOrganizationAggregate.SampleStudentTranscript.PostSecondaryOrganization" table="PostSecondaryOrganization" lazy="false" schema="samplestudenttranscript" discriminator-value="null">
     <id name="NameOfInstitution" column="NameOfInstitution" type="string" length="75">
       <generator class="assigned" />
     </id>
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.SampleStudentTranscript.1.0.0_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.SampleStudentTranscript.1.0.0_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
index 2301c7b99e..2968f4dcd4 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.SampleStudentTranscript.1.0.0_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.SampleStudentTranscript.1.0.0_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -13,7 +13,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PostSecondaryOrganizationAggregate.SampleStudentTranscript.PostSecondaryOrganization" table="PostSecondaryOrganization" lazy="false" schema="samplestudenttranscript" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PostSecondaryOrganizationAggregate.SampleStudentTranscript.PostSecondaryOrganization" table="PostSecondaryOrganization" lazy="false" schema="samplestudenttranscript" discriminator-value="null">
     <id name="NameOfInstitution" column="NameOfInstitution" type="string" length="75">
       <generator class="assigned" />
     </id>
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
index 9fb7a333fb..db90e2f790 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -13,7 +13,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CandidateAggregate.TPDM.Candidate" table="Candidate" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CandidateAggregate.TPDM.Candidate" table="Candidate" lazy="false" schema="tpdm" discriminator-value="null">
     <id name="CandidateIdentifier" column="CandidateIdentifier" type="string" length="32">
       <generator class="assigned" />
     </id>
@@ -478,7 +478,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CandidateEducatorPreparationProgramAssociationAggregate.TPDM.CandidateEducatorPreparationProgramAssociation" table="CandidateEducatorPreparationProgramAssociation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CandidateEducatorPreparationProgramAssociationAggregate.TPDM.CandidateEducatorPreparationProgramAssociation" table="CandidateEducatorPreparationProgramAssociation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -692,7 +692,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducatorPreparationProgramAggregate.TPDM.EducatorPreparationProgram" table="EducatorPreparationProgram" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducatorPreparationProgramAggregate.TPDM.EducatorPreparationProgram" table="EducatorPreparationProgram" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -782,7 +782,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationAggregate.TPDM.Evaluation" table="Evaluation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationAggregate.TPDM.Evaluation" table="Evaluation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -896,7 +896,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationElementAggregate.TPDM.EvaluationElement" table="EvaluationElement" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationElementAggregate.TPDM.EvaluationElement" table="EvaluationElement" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -1020,7 +1020,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationElementRatingAggregate.TPDM.EvaluationElementRating" table="EvaluationElementRating" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationElementRatingAggregate.TPDM.EvaluationElementRating" table="EvaluationElementRating" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -1164,7 +1164,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationObjectiveAggregate.TPDM.EvaluationObjective" table="EvaluationObjective" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationObjectiveAggregate.TPDM.EvaluationObjective" table="EvaluationObjective" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -1284,7 +1284,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationObjectiveRatingAggregate.TPDM.EvaluationObjectiveRating" table="EvaluationObjectiveRating" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationObjectiveRatingAggregate.TPDM.EvaluationObjectiveRating" table="EvaluationObjectiveRating" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -1422,7 +1422,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationRatingAggregate.TPDM.EvaluationRating" table="EvaluationRating" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationRatingAggregate.TPDM.EvaluationRating" table="EvaluationRating" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -1669,7 +1669,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.FinancialAidAggregate.TPDM.FinancialAid" table="FinancialAid" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.FinancialAidAggregate.TPDM.FinancialAid" table="FinancialAid" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AidTypeDescriptorId" column="AidTypeDescriptorId" type="int" />
@@ -1725,7 +1725,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PerformanceEvaluationAggregate.TPDM.PerformanceEvaluation" table="PerformanceEvaluation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PerformanceEvaluationAggregate.TPDM.PerformanceEvaluation" table="PerformanceEvaluation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -1871,7 +1871,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PerformanceEvaluationRatingAggregate.TPDM.PerformanceEvaluationRating" table="PerformanceEvaluationRating" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PerformanceEvaluationRatingAggregate.TPDM.PerformanceEvaluationRating" table="PerformanceEvaluationRating" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -2099,7 +2099,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.RubricDimensionAggregate.TPDM.RubricDimension" table="RubricDimension" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.RubricDimensionAggregate.TPDM.RubricDimension" table="RubricDimension" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -2226,7 +2226,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponsePersonTargetAssociationAggregate.TPDM.SurveyResponsePersonTargetAssociation" table="SurveyResponsePersonTargetAssociation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponsePersonTargetAssociationAggregate.TPDM.SurveyResponsePersonTargetAssociation" table="SurveyResponsePersonTargetAssociation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -2286,7 +2286,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponsePersonTargetAssociationAggregate.TPDM.SurveySectionResponsePersonTargetAssociation" table="SurveySectionResponsePersonTargetAssociation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponsePersonTargetAssociationAggregate.TPDM.SurveySectionResponsePersonTargetAssociation" table="SurveySectionResponsePersonTargetAssociation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
index a0dae9095a..bb2b432803 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Extensions.TPDM.1.1.0_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -13,7 +13,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CandidateAggregate.TPDM.Candidate" table="Candidate" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CandidateAggregate.TPDM.Candidate" table="Candidate" lazy="false" schema="tpdm" discriminator-value="null">
     <id name="CandidateIdentifier" column="CandidateIdentifier" type="string" length="32">
       <generator class="assigned" />
     </id>
@@ -478,7 +478,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CandidateEducatorPreparationProgramAssociationAggregate.TPDM.CandidateEducatorPreparationProgramAssociation" table="CandidateEducatorPreparationProgramAssociation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CandidateEducatorPreparationProgramAssociationAggregate.TPDM.CandidateEducatorPreparationProgramAssociation" table="CandidateEducatorPreparationProgramAssociation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -692,7 +692,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducatorPreparationProgramAggregate.TPDM.EducatorPreparationProgram" table="EducatorPreparationProgram" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducatorPreparationProgramAggregate.TPDM.EducatorPreparationProgram" table="EducatorPreparationProgram" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -782,7 +782,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationAggregate.TPDM.Evaluation" table="Evaluation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationAggregate.TPDM.Evaluation" table="Evaluation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -896,7 +896,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationElementAggregate.TPDM.EvaluationElement" table="EvaluationElement" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationElementAggregate.TPDM.EvaluationElement" table="EvaluationElement" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -1020,7 +1020,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationElementRatingAggregate.TPDM.EvaluationElementRating" table="EvaluationElementRating" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationElementRatingAggregate.TPDM.EvaluationElementRating" table="EvaluationElementRating" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -1164,7 +1164,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationObjectiveAggregate.TPDM.EvaluationObjective" table="EvaluationObjective" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationObjectiveAggregate.TPDM.EvaluationObjective" table="EvaluationObjective" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -1284,7 +1284,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationObjectiveRatingAggregate.TPDM.EvaluationObjectiveRating" table="EvaluationObjectiveRating" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationObjectiveRatingAggregate.TPDM.EvaluationObjectiveRating" table="EvaluationObjectiveRating" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -1422,7 +1422,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationRatingAggregate.TPDM.EvaluationRating" table="EvaluationRating" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationRatingAggregate.TPDM.EvaluationRating" table="EvaluationRating" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -1669,7 +1669,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.FinancialAidAggregate.TPDM.FinancialAid" table="FinancialAid" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.FinancialAidAggregate.TPDM.FinancialAid" table="FinancialAid" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AidTypeDescriptorId" column="AidTypeDescriptorId" type="int" />
@@ -1725,7 +1725,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PerformanceEvaluationAggregate.TPDM.PerformanceEvaluation" table="PerformanceEvaluation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PerformanceEvaluationAggregate.TPDM.PerformanceEvaluation" table="PerformanceEvaluation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -1871,7 +1871,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PerformanceEvaluationRatingAggregate.TPDM.PerformanceEvaluationRating" table="PerformanceEvaluationRating" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PerformanceEvaluationRatingAggregate.TPDM.PerformanceEvaluationRating" table="PerformanceEvaluationRating" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -2099,7 +2099,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.RubricDimensionAggregate.TPDM.RubricDimension" table="RubricDimension" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.RubricDimensionAggregate.TPDM.RubricDimension" table="RubricDimension" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -2226,7 +2226,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponsePersonTargetAssociationAggregate.TPDM.SurveyResponsePersonTargetAssociation" table="SurveyResponsePersonTargetAssociation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponsePersonTargetAssociationAggregate.TPDM.SurveyResponsePersonTargetAssociation" table="SurveyResponsePersonTargetAssociation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -2286,7 +2286,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponsePersonTargetAssociationAggregate.TPDM.SurveySectionResponsePersonTargetAssociation" table="SurveySectionResponsePersonTargetAssociation" lazy="false" schema="tpdm" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponsePersonTargetAssociationAggregate.TPDM.SurveySectionResponsePersonTargetAssociation" table="SurveySectionResponsePersonTargetAssociation" lazy="false" schema="tpdm" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
index ad3d7561fc..5fdaa0e029 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -15,7 +15,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AcademicWeekAggregate.EdFi.AcademicWeek" table="AcademicWeek" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AcademicWeekAggregate.EdFi.AcademicWeek" table="AcademicWeek" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolId" column="SchoolId" type="long" />
@@ -66,7 +66,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AccountabilityRatingAggregate.EdFi.AccountabilityRating" table="AccountabilityRating" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AccountabilityRatingAggregate.EdFi.AccountabilityRating" table="AccountabilityRating" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -121,7 +121,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AssessmentAggregate.EdFi.Assessment" table="Assessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AssessmentAggregate.EdFi.Assessment" table="Assessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -617,7 +617,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AssessmentItemAggregate.EdFi.AssessmentItem" table="AssessmentItem" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AssessmentItemAggregate.EdFi.AssessmentItem" table="AssessmentItem" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -748,7 +748,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AssessmentScoreRangeLearningStandardAggregate.EdFi.AssessmentScoreRangeLearningStandard" table="AssessmentScoreRangeLearningStandard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AssessmentScoreRangeLearningStandardAggregate.EdFi.AssessmentScoreRangeLearningStandard" table="AssessmentScoreRangeLearningStandard" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -844,7 +844,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.BalanceSheetDimensionAggregate.EdFi.BalanceSheetDimension" table="BalanceSheetDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.BalanceSheetDimensionAggregate.EdFi.BalanceSheetDimension" table="BalanceSheetDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -922,7 +922,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.BellScheduleAggregate.EdFi.BellSchedule" table="BellSchedule" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.BellScheduleAggregate.EdFi.BellSchedule" table="BellSchedule" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BellScheduleName" column="BellScheduleName" type="string" length="60" />
@@ -1077,7 +1077,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CalendarAggregate.EdFi.Calendar" table="Calendar" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CalendarAggregate.EdFi.Calendar" table="Calendar" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -1166,7 +1166,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CalendarDateAggregate.EdFi.CalendarDate" table="CalendarDate" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CalendarDateAggregate.EdFi.CalendarDate" table="CalendarDate" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -1255,7 +1255,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ChartOfAccountAggregate.EdFi.ChartOfAccount" table="ChartOfAccount" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ChartOfAccountAggregate.EdFi.ChartOfAccount" table="ChartOfAccount" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -1381,7 +1381,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ClassPeriodAggregate.EdFi.ClassPeriod" table="ClassPeriod" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ClassPeriodAggregate.EdFi.ClassPeriod" table="ClassPeriod" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ClassPeriodName" column="ClassPeriodName" type="string" length="60" />
@@ -1463,7 +1463,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CohortAggregate.EdFi.Cohort" table="Cohort" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CohortAggregate.EdFi.Cohort" table="Cohort" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CohortIdentifier" column="CohortIdentifier" type="string" length="36" />
@@ -1555,7 +1555,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicense" table="CommunityProviderLicense" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicense" table="CommunityProviderLicense" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CommunityProviderId" column="CommunityProviderId" type="long" />
@@ -1612,7 +1612,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CompetencyObjectiveAggregate.EdFi.CompetencyObjective" table="CompetencyObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CompetencyObjectiveAggregate.EdFi.CompetencyObjective" table="CompetencyObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -1661,7 +1661,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ContactAggregate.EdFi.Contact" table="Contact" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ContactAggregate.EdFi.Contact" table="Contact" lazy="false" discriminator-value="null">
     <id name="ContactUSI" column="ContactUSI" type="int">
       <generator class="identity" />
     </id>
@@ -2054,7 +2054,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CourseAggregate.EdFi.Course" table="Course" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CourseAggregate.EdFi.Course" table="Course" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseCode" column="CourseCode" type="string" length="60" />
@@ -2323,7 +2323,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CourseOfferingAggregate.EdFi.CourseOffering" table="CourseOffering" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CourseOfferingAggregate.EdFi.CourseOffering" table="CourseOffering" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -2501,7 +2501,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CourseTranscriptAggregate.EdFi.CourseTranscript" table="CourseTranscript" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CourseTranscriptAggregate.EdFi.CourseTranscript" table="CourseTranscript" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseAttemptResultDescriptorId" column="CourseAttemptResultDescriptorId" type="int" />
@@ -2909,7 +2909,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CredentialAggregate.EdFi.Credential" table="Credential" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CredentialAggregate.EdFi.Credential" table="Credential" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CredentialIdentifier" column="CredentialIdentifier" type="string" length="60" />
@@ -3058,7 +3058,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CrisisEventAggregate.EdFi.CrisisEvent" table="CrisisEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CrisisEventAggregate.EdFi.CrisisEvent" table="CrisisEvent" lazy="false" discriminator-value="null">
     <id name="CrisisEventName" column="CrisisEventName" type="string" length="100">
       <generator class="assigned" />
     </id>
@@ -3091,7 +3091,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DescriptorAggregate.EdFi.Descriptor" table="Descriptor" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.DescriptorAggregate.EdFi.Descriptor" table="Descriptor" lazy="false" abstract="true" discriminator-value="null">
     <id name="DescriptorId" column="DescriptorId" type="int">
       <generator class="identity" />
     </id>
@@ -6486,7 +6486,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DescriptorMappingAggregate.EdFi.DescriptorMapping" table="DescriptorMapping" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.DescriptorMappingAggregate.EdFi.DescriptorMapping" table="DescriptorMapping" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="MappedNamespace" column="MappedNamespace" type="string" length="255" />
@@ -6570,7 +6570,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DisciplineActionAggregate.EdFi.DisciplineAction" table="DisciplineAction" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.DisciplineActionAggregate.EdFi.DisciplineAction" table="DisciplineAction" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="DisciplineActionIdentifier" column="DisciplineActionIdentifier" type="string" length="36" />
@@ -6747,7 +6747,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DisciplineIncidentAggregate.EdFi.DisciplineIncident" table="DisciplineIncident" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.DisciplineIncidentAggregate.EdFi.DisciplineIncident" table="DisciplineIncident" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="36" />
@@ -6903,7 +6903,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationContentAggregate.EdFi.EducationContent" table="EducationContent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationContentAggregate.EdFi.EducationContent" table="EducationContent" lazy="false" discriminator-value="null">
     <id name="ContentIdentifier" column="ContentIdentifier" type="string" length="225">
       <generator class="assigned" />
     </id>
@@ -7182,7 +7182,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationAggregate.EdFi.EducationOrganization" table="EducationOrganization" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationAggregate.EdFi.EducationOrganization" table="EducationOrganization" lazy="false" abstract="true" discriminator-value="null">
     <id name="EducationOrganizationId" column="EducationOrganizationId" type="long">
       <generator class="assigned" />
     </id>
@@ -7771,7 +7771,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationInterventionPrescriptionAssociationAggregate.EdFi.EducationOrganizationInterventionPrescriptionAssociation" table="EducationOrganizationInterventionPrescriptionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationInterventionPrescriptionAssociationAggregate.EdFi.EducationOrganizationInterventionPrescriptionAssociation" table="EducationOrganizationInterventionPrescriptionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -7825,7 +7825,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationNetworkAssociationAggregate.EdFi.EducationOrganizationNetworkAssociation" table="EducationOrganizationNetworkAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationNetworkAssociationAggregate.EdFi.EducationOrganizationNetworkAssociation" table="EducationOrganizationNetworkAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationNetworkId" column="EducationOrganizationNetworkId" type="long" />
@@ -7877,7 +7877,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationPeerAssociationAggregate.EdFi.EducationOrganizationPeerAssociation" table="EducationOrganizationPeerAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationPeerAssociationAggregate.EdFi.EducationOrganizationPeerAssociation" table="EducationOrganizationPeerAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -7933,7 +7933,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationRubricDimensionAggregate.EdFi.EvaluationRubricDimension" table="EvaluationRubricDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationRubricDimensionAggregate.EdFi.EvaluationRubricDimension" table="EvaluationRubricDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EvaluationRubricRating" column="EvaluationRubricRating" type="int" />
@@ -7996,7 +7996,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.FeederSchoolAssociationAggregate.EdFi.FeederSchoolAssociation" table="FeederSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.FeederSchoolAssociationAggregate.EdFi.FeederSchoolAssociation" table="FeederSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -8049,7 +8049,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.FunctionDimensionAggregate.EdFi.FunctionDimension" table="FunctionDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.FunctionDimensionAggregate.EdFi.FunctionDimension" table="FunctionDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -8127,7 +8127,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.FundDimensionAggregate.EdFi.FundDimension" table="FundDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.FundDimensionAggregate.EdFi.FundDimension" table="FundDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -8209,7 +8209,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociation" table="GeneralStudentProgramAssociation" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociation" table="GeneralStudentProgramAssociation" lazy="false" abstract="true" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -8738,7 +8738,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GradeAggregate.EdFi.Grade" table="Grade" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GradeAggregate.EdFi.Grade" table="Grade" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -8871,7 +8871,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GradebookEntryAggregate.EdFi.GradebookEntry" table="GradebookEntry" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GradebookEntryAggregate.EdFi.GradebookEntry" table="GradebookEntry" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradebookEntryIdentifier" column="GradebookEntryIdentifier" type="string" length="60" />
@@ -8981,7 +8981,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GradingPeriodAggregate.EdFi.GradingPeriod" table="GradingPeriod" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GradingPeriodAggregate.EdFi.GradingPeriod" table="GradingPeriod" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -9038,7 +9038,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GraduationPlanAggregate.EdFi.GraduationPlan" table="GraduationPlan" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GraduationPlanAggregate.EdFi.GraduationPlan" table="GraduationPlan" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -9377,7 +9377,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.InterventionAggregate.EdFi.Intervention" table="Intervention" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.InterventionAggregate.EdFi.Intervention" table="Intervention" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -9773,7 +9773,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.InterventionPrescriptionAggregate.EdFi.InterventionPrescription" table="InterventionPrescription" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.InterventionPrescriptionAggregate.EdFi.InterventionPrescription" table="InterventionPrescription" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -10059,7 +10059,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.InterventionStudyAggregate.EdFi.InterventionStudy" table="InterventionStudy" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.InterventionStudyAggregate.EdFi.InterventionStudy" table="InterventionStudy" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -10384,7 +10384,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LearningStandardAggregate.EdFi.LearningStandard" table="LearningStandard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LearningStandardAggregate.EdFi.LearningStandard" table="LearningStandard" lazy="false" discriminator-value="null">
     <id name="LearningStandardId" column="LearningStandardId" type="string" length="60">
       <generator class="assigned" />
     </id>
@@ -10607,7 +10607,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociation" table="LearningStandardEquivalenceAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociation" table="LearningStandardEquivalenceAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -10662,7 +10662,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalAccountAggregate.EdFi.LocalAccount" table="LocalAccount" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalAccountAggregate.EdFi.LocalAccount" table="LocalAccount" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10756,7 +10756,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalActualAggregate.EdFi.LocalActual" table="LocalActual" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalActualAggregate.EdFi.LocalActual" table="LocalActual" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10811,7 +10811,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalBudgetAggregate.EdFi.LocalBudget" table="LocalBudget" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalBudgetAggregate.EdFi.LocalBudget" table="LocalBudget" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10867,7 +10867,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalContractedStaffAggregate.EdFi.LocalContractedStaff" table="LocalContractedStaff" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalContractedStaffAggregate.EdFi.LocalContractedStaff" table="LocalContractedStaff" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10987,7 +10987,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalEncumbranceAggregate.EdFi.LocalEncumbrance" table="LocalEncumbrance" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalEncumbranceAggregate.EdFi.LocalEncumbrance" table="LocalEncumbrance" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -11043,7 +11043,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalPayrollAggregate.EdFi.LocalPayroll" table="LocalPayroll" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalPayrollAggregate.EdFi.LocalPayroll" table="LocalPayroll" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -11100,7 +11100,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocationAggregate.EdFi.Location" table="Location" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocationAggregate.EdFi.Location" table="Location" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ClassroomIdentificationCode" column="ClassroomIdentificationCode" type="string" length="60" />
@@ -11149,7 +11149,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ObjectDimensionAggregate.EdFi.ObjectDimension" table="ObjectDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ObjectDimensionAggregate.EdFi.ObjectDimension" table="ObjectDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -11228,7 +11228,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ObjectiveAssessmentAggregate.EdFi.ObjectiveAssessment" table="ObjectiveAssessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ObjectiveAssessmentAggregate.EdFi.ObjectiveAssessment" table="ObjectiveAssessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -11444,7 +11444,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.OpenStaffPositionAggregate.EdFi.OpenStaffPosition" table="OpenStaffPosition" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.OpenStaffPositionAggregate.EdFi.OpenStaffPosition" table="OpenStaffPosition" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -11564,7 +11564,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.OperationalUnitDimensionAggregate.EdFi.OperationalUnitDimension" table="OperationalUnitDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.OperationalUnitDimensionAggregate.EdFi.OperationalUnitDimension" table="OperationalUnitDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -11642,7 +11642,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PersonAggregate.EdFi.Person" table="Person" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PersonAggregate.EdFi.Person" table="Person" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="PersonId" column="PersonId" type="string" length="32" />
@@ -11687,7 +11687,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PostSecondaryEventAggregate.EdFi.PostSecondaryEvent" table="PostSecondaryEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PostSecondaryEventAggregate.EdFi.PostSecondaryEvent" table="PostSecondaryEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EventDate" column="EventDate" type="date" />
@@ -11764,7 +11764,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ProgramAggregate.EdFi.Program" table="Program" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ProgramAggregate.EdFi.Program" table="Program" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -11921,7 +11921,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ProgramDimensionAggregate.EdFi.ProgramDimension" table="ProgramDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ProgramDimensionAggregate.EdFi.ProgramDimension" table="ProgramDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -12003,7 +12003,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationAggregate.EdFi.ProgramEvaluation" table="ProgramEvaluation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationAggregate.EdFi.ProgramEvaluation" table="ProgramEvaluation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramEducationOrganizationId" column="ProgramEducationOrganizationId" type="long" />
@@ -12107,7 +12107,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationElementAggregate.EdFi.ProgramEvaluationElement" table="ProgramEvaluationElement" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationElementAggregate.EdFi.ProgramEvaluationElement" table="ProgramEvaluationElement" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramEducationOrganizationId" column="ProgramEducationOrganizationId" type="long" />
@@ -12228,7 +12228,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationObjectiveAggregate.EdFi.ProgramEvaluationObjective" table="ProgramEvaluationObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationObjectiveAggregate.EdFi.ProgramEvaluationObjective" table="ProgramEvaluationObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramEducationOrganizationId" column="ProgramEducationOrganizationId" type="long" />
@@ -12334,7 +12334,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ProjectDimensionAggregate.EdFi.ProjectDimension" table="ProjectDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ProjectDimensionAggregate.EdFi.ProjectDimension" table="ProjectDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -12416,7 +12416,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ReportCardAggregate.EdFi.ReportCard" table="ReportCard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ReportCardAggregate.EdFi.ReportCard" table="ReportCard" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -12637,7 +12637,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.RestraintEventAggregate.EdFi.RestraintEvent" table="RestraintEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.RestraintEventAggregate.EdFi.RestraintEvent" table="RestraintEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="RestraintEventIdentifier" column="RestraintEventIdentifier" type="string" length="36" />
@@ -12857,7 +12857,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SectionAggregate.EdFi.Section" table="Section" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SectionAggregate.EdFi.Section" table="Section" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -13141,7 +13141,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SectionAttendanceTakenEventAggregate.EdFi.SectionAttendanceTakenEvent" table="SectionAttendanceTakenEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SectionAttendanceTakenEventAggregate.EdFi.SectionAttendanceTakenEvent" table="SectionAttendanceTakenEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -13209,7 +13209,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SessionAggregate.EdFi.Session" table="Session" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SessionAggregate.EdFi.Session" table="Session" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolId" column="SchoolId" type="long" />
@@ -13345,7 +13345,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SourceDimensionAggregate.EdFi.SourceDimension" table="SourceDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SourceDimensionAggregate.EdFi.SourceDimension" table="SourceDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -13421,7 +13421,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffAggregate.EdFi.Staff" table="Staff" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffAggregate.EdFi.Staff" table="Staff" lazy="false" discriminator-value="null">
     <id name="StaffUSI" column="StaffUSI" type="int">
       <generator class="identity" />
     </id>
@@ -14094,7 +14094,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEvent" table="StaffAbsenceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEvent" table="StaffAbsenceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AbsenceEventCategoryDescriptorId" column="AbsenceEventCategoryDescriptorId" type="int" />
@@ -14146,7 +14146,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffCohortAssociationAggregate.EdFi.StaffCohortAssociation" table="StaffCohortAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffCohortAssociationAggregate.EdFi.StaffCohortAssociation" table="StaffCohortAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -14202,7 +14202,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffDisciplineIncidentAssociationAggregate.EdFi.StaffDisciplineIncidentAssociation" table="StaffDisciplineIncidentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffDisciplineIncidentAssociationAggregate.EdFi.StaffDisciplineIncidentAssociation" table="StaffDisciplineIncidentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="36" />
@@ -14291,7 +14291,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociation" table="StaffEducationOrganizationAssignmentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociation" table="StaffEducationOrganizationAssignmentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -14363,7 +14363,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociation" table="StaffEducationOrganizationContactAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociation" table="StaffEducationOrganizationContactAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ContactTitle" column="ContactTitle" type="string" length="75" />
@@ -14542,7 +14542,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociation" table="StaffEducationOrganizationEmploymentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociation" table="StaffEducationOrganizationEmploymentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -14609,7 +14609,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffLeaveAggregate.EdFi.StaffLeave" table="StaffLeave" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffLeaveAggregate.EdFi.StaffLeave" table="StaffLeave" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -14663,7 +14663,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffProgramAssociationAggregate.EdFi.StaffProgramAssociation" table="StaffProgramAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffProgramAssociationAggregate.EdFi.StaffProgramAssociation" table="StaffProgramAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -14721,7 +14721,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociation" table="StaffSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociation" table="StaffSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramAssignmentDescriptorId" column="ProgramAssignmentDescriptorId" type="int" />
@@ -14857,7 +14857,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociation" table="StaffSectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociation" table="StaffSectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -14972,7 +14972,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAggregate.EdFi.Student" table="Student" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAggregate.EdFi.Student" table="Student" lazy="false" discriminator-value="null">
     <id name="StudentUSI" column="StudentUSI" type="int">
       <generator class="identity" />
     </id>
@@ -15181,7 +15181,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecord" table="StudentAcademicRecord" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecord" table="StudentAcademicRecord" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -15529,7 +15529,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAssessmentAggregate.EdFi.StudentAssessment" table="StudentAssessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAssessmentAggregate.EdFi.StudentAssessment" table="StudentAssessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -15938,7 +15938,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociation" table="StudentAssessmentEducationOrganizationAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociation" table="StudentAssessmentEducationOrganizationAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -16001,7 +16001,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentCohortAssociationAggregate.EdFi.StudentCohortAssociation" table="StudentCohortAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentCohortAssociationAggregate.EdFi.StudentCohortAssociation" table="StudentCohortAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -16109,7 +16109,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentCompetencyObjectiveAggregate.EdFi.StudentCompetencyObjective" table="StudentCompetencyObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentCompetencyObjectiveAggregate.EdFi.StudentCompetencyObjective" table="StudentCompetencyObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -16291,7 +16291,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentContactAssociationAggregate.EdFi.StudentContactAssociation" table="StudentContactAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentContactAssociationAggregate.EdFi.StudentContactAssociation" table="StudentContactAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ContactUSI" column="ContactUSI" type="int" />
@@ -16383,7 +16383,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociation" table="StudentDisciplineIncidentBehaviorAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociation" table="StudentDisciplineIncidentBehaviorAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BehaviorDescriptorId" column="BehaviorDescriptorId" type="int" />
@@ -16475,7 +16475,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociation" table="StudentDisciplineIncidentNonOffenderAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociation" table="StudentDisciplineIncidentNonOffenderAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="36" />
@@ -16562,7 +16562,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociation" table="StudentEducationOrganizationAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociation" table="StudentEducationOrganizationAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -17326,7 +17326,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociation" table="StudentEducationOrganizationResponsibilityAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociation" table="StudentEducationOrganizationResponsibilityAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -17380,7 +17380,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntry" table="StudentGradebookEntry" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntry" table="StudentGradebookEntry" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradebookEntryIdentifier" column="GradebookEntryIdentifier" type="string" length="60" />
@@ -17441,7 +17441,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentHealthAggregate.EdFi.StudentHealth" table="StudentHealth" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentHealthAggregate.EdFi.StudentHealth" table="StudentHealth" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -17665,7 +17665,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociation" table="StudentInterventionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociation" table="StudentInterventionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -17767,7 +17767,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentInterventionAttendanceEventAggregate.EdFi.StudentInterventionAttendanceEvent" table="StudentInterventionAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentInterventionAttendanceEventAggregate.EdFi.StudentInterventionAttendanceEvent" table="StudentInterventionAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -17994,7 +17994,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentProgramAttendanceEventAggregate.EdFi.StudentProgramAttendanceEvent" table="StudentProgramAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentProgramAttendanceEventAggregate.EdFi.StudentProgramAttendanceEvent" table="StudentProgramAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -18064,7 +18064,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentProgramEvaluationAggregate.EdFi.StudentProgramEvaluation" table="StudentProgramEvaluation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentProgramEvaluationAggregate.EdFi.StudentProgramEvaluation" table="StudentProgramEvaluation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EvaluationDate" column="EvaluationDate" type="date" />
@@ -18295,7 +18295,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociation" table="StudentSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociation" table="StudentSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EntryDate" column="EntryDate" type="date" />
@@ -18469,7 +18469,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAttendanceEventAggregate.EdFi.StudentSchoolAttendanceEvent" table="StudentSchoolAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAttendanceEventAggregate.EdFi.StudentSchoolAttendanceEvent" table="StudentSchoolAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -18571,7 +18571,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociation" table="StudentSectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociation" table="StudentSectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -18691,7 +18691,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEvent" table="StudentSectionAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEvent" table="StudentSectionAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -18996,7 +18996,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSpecialEducationProgramEligibilityAssociationAggregate.EdFi.StudentSpecialEducationProgramEligibilityAssociation" table="StudentSpecialEducationProgramEligibilityAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSpecialEducationProgramEligibilityAssociationAggregate.EdFi.StudentSpecialEducationProgramEligibilityAssociation" table="StudentSpecialEducationProgramEligibilityAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ConsentToEvaluationReceivedDate" column="ConsentToEvaluationReceivedDate" type="date" />
@@ -19101,7 +19101,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentTransportationAggregate.EdFi.StudentTransportation" table="StudentTransportation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentTransportationAggregate.EdFi.StudentTransportation" table="StudentTransportation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="StudentUSI" column="StudentUSI" type="int" />
@@ -19256,7 +19256,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyAggregate.EdFi.Survey" table="Survey" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyAggregate.EdFi.Survey" table="Survey" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19320,7 +19320,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyCourseAssociationAggregate.EdFi.SurveyCourseAssociation" table="SurveyCourseAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyCourseAssociationAggregate.EdFi.SurveyCourseAssociation" table="SurveyCourseAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseCode" column="CourseCode" type="string" length="60" />
@@ -19377,7 +19377,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyProgramAssociationAggregate.EdFi.SurveyProgramAssociation" table="SurveyProgramAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyProgramAssociationAggregate.EdFi.SurveyProgramAssociation" table="SurveyProgramAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -19434,7 +19434,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyQuestionAggregate.EdFi.SurveyQuestion" table="SurveyQuestion" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyQuestionAggregate.EdFi.SurveyQuestion" table="SurveyQuestion" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19567,7 +19567,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyQuestionResponseAggregate.EdFi.SurveyQuestionResponse" table="SurveyQuestionResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyQuestionResponseAggregate.EdFi.SurveyQuestionResponse" table="SurveyQuestionResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19707,7 +19707,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseAggregate.EdFi.SurveyResponse" table="SurveyResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseAggregate.EdFi.SurveyResponse" table="SurveyResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19810,7 +19810,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveyResponseEducationOrganizationTargetAssociation" table="SurveyResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveyResponseEducationOrganizationTargetAssociation" table="SurveyResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -19866,7 +19866,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseStaffTargetAssociationAggregate.EdFi.SurveyResponseStaffTargetAssociation" table="SurveyResponseStaffTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseStaffTargetAssociationAggregate.EdFi.SurveyResponseStaffTargetAssociation" table="SurveyResponseStaffTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19921,7 +19921,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionAggregate.EdFi.SurveySection" table="SurveySection" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionAggregate.EdFi.SurveySection" table="SurveySection" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19975,7 +19975,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionAssociationAggregate.EdFi.SurveySectionAssociation" table="SurveySectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionAssociationAggregate.EdFi.SurveySectionAssociation" table="SurveySectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -20037,7 +20037,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseAggregate.EdFi.SurveySectionResponse" table="SurveySectionResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseAggregate.EdFi.SurveySectionResponse" table="SurveySectionResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -20097,7 +20097,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveySectionResponseEducationOrganizationTargetAssociation" table="SurveySectionResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveySectionResponseEducationOrganizationTargetAssociation" table="SurveySectionResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -20156,7 +20156,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseStaffTargetAssociationAggregate.EdFi.SurveySectionResponseStaffTargetAssociation" table="SurveySectionResponseStaffTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseStaffTargetAssociationAggregate.EdFi.SurveySectionResponseStaffTargetAssociation" table="SurveySectionResponseStaffTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
index bcf9b0c6e5..e26d3f1107 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_MsSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
@@ -2,7 +2,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicWeekAggregate.EdFi.AcademicWeekQ" table="AcademicWeek" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicWeekAggregate.EdFi.AcademicWeekQ" table="AcademicWeek" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolId" column="SchoolId" type="long" />
@@ -49,7 +49,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AccountabilityRatingAggregate.EdFi.AccountabilityRatingQ" table="AccountabilityRating" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AccountabilityRatingAggregate.EdFi.AccountabilityRatingQ" table="AccountabilityRating" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -93,7 +93,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentAggregate.EdFi.AssessmentQ" table="Assessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentAggregate.EdFi.AssessmentQ" table="Assessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -650,7 +650,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemAggregate.EdFi.AssessmentItemQ" table="AssessmentItem" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemAggregate.EdFi.AssessmentItemQ" table="AssessmentItem" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -790,7 +790,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentScoreRangeLearningStandardAggregate.EdFi.AssessmentScoreRangeLearningStandardQ" table="AssessmentScoreRangeLearningStandard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentScoreRangeLearningStandardAggregate.EdFi.AssessmentScoreRangeLearningStandardQ" table="AssessmentScoreRangeLearningStandard" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -878,7 +878,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.BalanceSheetDimensionAggregate.EdFi.BalanceSheetDimensionQ" table="BalanceSheetDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.BalanceSheetDimensionAggregate.EdFi.BalanceSheetDimensionQ" table="BalanceSheetDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -956,7 +956,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.BellScheduleAggregate.EdFi.BellScheduleQ" table="BellSchedule" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.BellScheduleAggregate.EdFi.BellScheduleQ" table="BellSchedule" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BellScheduleName" column="BellScheduleName" type="string" length="60" />
@@ -1102,7 +1102,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarAggregate.EdFi.CalendarQ" table="Calendar" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarAggregate.EdFi.CalendarQ" table="Calendar" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -1211,7 +1211,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarDateAggregate.EdFi.CalendarDateQ" table="CalendarDate" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarDateAggregate.EdFi.CalendarDateQ" table="CalendarDate" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -1301,7 +1301,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ChartOfAccountAggregate.EdFi.ChartOfAccountQ" table="ChartOfAccount" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ChartOfAccountAggregate.EdFi.ChartOfAccountQ" table="ChartOfAccount" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -1431,7 +1431,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ClassPeriodAggregate.EdFi.ClassPeriodQ" table="ClassPeriod" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ClassPeriodAggregate.EdFi.ClassPeriodQ" table="ClassPeriod" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ClassPeriodName" column="ClassPeriodName" type="string" length="60" />
@@ -1526,7 +1526,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortAggregate.EdFi.CohortQ" table="Cohort" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortAggregate.EdFi.CohortQ" table="Cohort" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CohortIdentifier" column="CohortIdentifier" type="string" length="36" />
@@ -1639,7 +1639,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicenseQ" table="CommunityProviderLicense" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicenseQ" table="CommunityProviderLicense" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CommunityProviderId" column="CommunityProviderId" type="long" />
@@ -1690,7 +1690,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CompetencyObjectiveAggregate.EdFi.CompetencyObjectiveQ" table="CompetencyObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CompetencyObjectiveAggregate.EdFi.CompetencyObjectiveQ" table="CompetencyObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -1742,7 +1742,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ContactAggregate.EdFi.ContactQ" table="Contact" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ContactAggregate.EdFi.ContactQ" table="Contact" lazy="false" discriminator-value="null">
     <id name="ContactUSI" column="ContactUSI" type="int">
       <generator class="identity" />
     </id>
@@ -2183,7 +2183,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAggregate.EdFi.CourseQ" table="Course" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAggregate.EdFi.CourseQ" table="Course" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseCode" column="CourseCode" type="string" length="60" />
@@ -2501,7 +2501,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseOfferingAggregate.EdFi.CourseOfferingQ" table="CourseOffering" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseOfferingAggregate.EdFi.CourseOfferingQ" table="CourseOffering" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -2682,7 +2682,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptQ" table="CourseTranscript" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptQ" table="CourseTranscript" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseAttemptResultDescriptorId" column="CourseAttemptResultDescriptorId" type="int" />
@@ -3112,7 +3112,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" table="Credential" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" table="Credential" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CredentialIdentifier" column="CredentialIdentifier" type="string" length="60" />
@@ -3297,7 +3297,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CrisisEventAggregate.EdFi.CrisisEventQ" table="CrisisEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CrisisEventAggregate.EdFi.CrisisEventQ" table="CrisisEvent" lazy="false" discriminator-value="null">
     <id name="CrisisEventName" column="CrisisEventName" type="string" length="100">
       <generator class="assigned" />
     </id>
@@ -3342,7 +3342,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorAggregate.EdFi.DescriptorQ" table="Descriptor" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorAggregate.EdFi.DescriptorQ" table="Descriptor" lazy="false" abstract="true" discriminator-value="null">
     <id name="DescriptorId" column="DescriptorId" type="int">
       <generator class="identity" />
     </id>
@@ -9587,7 +9587,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorMappingAggregate.EdFi.DescriptorMappingQ" table="DescriptorMapping" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorMappingAggregate.EdFi.DescriptorMappingQ" table="DescriptorMapping" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="MappedNamespace" column="MappedNamespace" type="string" length="255" />
@@ -9662,7 +9662,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionAggregate.EdFi.DisciplineActionQ" table="DisciplineAction" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionAggregate.EdFi.DisciplineActionQ" table="DisciplineAction" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="DisciplineActionIdentifier" column="DisciplineActionIdentifier" type="string" length="36" />
@@ -9834,7 +9834,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentQ" table="DisciplineIncident" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentQ" table="DisciplineIncident" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="36" />
@@ -10020,7 +10020,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" table="EducationContent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" table="EducationContent" lazy="false" discriminator-value="null">
     <id name="ContentIdentifier" column="ContentIdentifier" type="string" length="225">
       <generator class="assigned" />
     </id>
@@ -10336,7 +10336,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationQ" table="EducationOrganization" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationQ" table="EducationOrganization" lazy="false" abstract="true" discriminator-value="null">
     <id name="EducationOrganizationId" column="EducationOrganizationId" type="long">
       <generator class="assigned" />
     </id>
@@ -11465,7 +11465,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationInterventionPrescriptionAssociationAggregate.EdFi.EducationOrganizationInterventionPrescriptionAssociationQ" table="EducationOrganizationInterventionPrescriptionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationInterventionPrescriptionAssociationAggregate.EdFi.EducationOrganizationInterventionPrescriptionAssociationQ" table="EducationOrganizationInterventionPrescriptionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -11508,7 +11508,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationNetworkAssociationAggregate.EdFi.EducationOrganizationNetworkAssociationQ" table="EducationOrganizationNetworkAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationNetworkAssociationAggregate.EdFi.EducationOrganizationNetworkAssociationQ" table="EducationOrganizationNetworkAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationNetworkId" column="EducationOrganizationNetworkId" type="long" />
@@ -11549,7 +11549,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationPeerAssociationAggregate.EdFi.EducationOrganizationPeerAssociationQ" table="EducationOrganizationPeerAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationPeerAssociationAggregate.EdFi.EducationOrganizationPeerAssociationQ" table="EducationOrganizationPeerAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -11588,7 +11588,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EvaluationRubricDimensionAggregate.EdFi.EvaluationRubricDimensionQ" table="EvaluationRubricDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EvaluationRubricDimensionAggregate.EdFi.EvaluationRubricDimensionQ" table="EvaluationRubricDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EvaluationRubricRating" column="EvaluationRubricRating" type="int" />
@@ -11642,7 +11642,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FeederSchoolAssociationAggregate.EdFi.FeederSchoolAssociationQ" table="FeederSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FeederSchoolAssociationAggregate.EdFi.FeederSchoolAssociationQ" table="FeederSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -11684,7 +11684,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FunctionDimensionAggregate.EdFi.FunctionDimensionQ" table="FunctionDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FunctionDimensionAggregate.EdFi.FunctionDimensionQ" table="FunctionDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -11762,7 +11762,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FundDimensionAggregate.EdFi.FundDimensionQ" table="FundDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FundDimensionAggregate.EdFi.FundDimensionQ" table="FundDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -11840,7 +11840,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociationQ" table="GeneralStudentProgramAssociation" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociationQ" table="GeneralStudentProgramAssociation" lazy="false" abstract="true" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -12406,7 +12406,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeAggregate.EdFi.GradeQ" table="Grade" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeAggregate.EdFi.GradeQ" table="Grade" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -12554,7 +12554,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryAggregate.EdFi.GradebookEntryQ" table="GradebookEntry" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryAggregate.EdFi.GradebookEntryQ" table="GradebookEntry" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradebookEntryIdentifier" column="GradebookEntryIdentifier" type="string" length="60" />
@@ -12662,7 +12662,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodAggregate.EdFi.GradingPeriodQ" table="GradingPeriod" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodAggregate.EdFi.GradingPeriodQ" table="GradingPeriod" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -12760,7 +12760,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanAggregate.EdFi.GraduationPlanQ" table="GraduationPlan" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanAggregate.EdFi.GraduationPlanQ" table="GraduationPlan" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -13136,7 +13136,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionAggregate.EdFi.InterventionQ" table="Intervention" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionAggregate.EdFi.InterventionQ" table="Intervention" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -13555,7 +13555,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionPrescriptionAggregate.EdFi.InterventionPrescriptionQ" table="InterventionPrescription" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionPrescriptionAggregate.EdFi.InterventionPrescriptionQ" table="InterventionPrescription" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -13872,7 +13872,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionStudyAggregate.EdFi.InterventionStudyQ" table="InterventionStudy" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionStudyAggregate.EdFi.InterventionStudyQ" table="InterventionStudy" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -14218,7 +14218,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardQ" table="LearningStandard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardQ" table="LearningStandard" lazy="false" discriminator-value="null">
     <id name="LearningStandardId" column="LearningStandardId" type="string" length="60">
       <generator class="assigned" />
     </id>
@@ -14509,7 +14509,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociationQ" table="LearningStandardEquivalenceAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociationQ" table="LearningStandardEquivalenceAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -14555,7 +14555,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalAccountAggregate.EdFi.LocalAccountQ" table="LocalAccount" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalAccountAggregate.EdFi.LocalAccountQ" table="LocalAccount" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14684,7 +14684,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalActualAggregate.EdFi.LocalActualQ" table="LocalActual" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalActualAggregate.EdFi.LocalActualQ" table="LocalActual" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14729,7 +14729,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalBudgetAggregate.EdFi.LocalBudgetQ" table="LocalBudget" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalBudgetAggregate.EdFi.LocalBudgetQ" table="LocalBudget" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14774,7 +14774,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalContractedStaffAggregate.EdFi.LocalContractedStaffQ" table="LocalContractedStaff" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalContractedStaffAggregate.EdFi.LocalContractedStaffQ" table="LocalContractedStaff" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14890,7 +14890,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEncumbranceAggregate.EdFi.LocalEncumbranceQ" table="LocalEncumbrance" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEncumbranceAggregate.EdFi.LocalEncumbranceQ" table="LocalEncumbrance" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14935,7 +14935,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalPayrollAggregate.EdFi.LocalPayrollQ" table="LocalPayroll" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalPayrollAggregate.EdFi.LocalPayrollQ" table="LocalPayroll" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14984,7 +14984,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocationAggregate.EdFi.LocationQ" table="Location" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocationAggregate.EdFi.LocationQ" table="Location" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ClassroomIdentificationCode" column="ClassroomIdentificationCode" type="string" length="60" />
@@ -15030,7 +15030,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ObjectDimensionAggregate.EdFi.ObjectDimensionQ" table="ObjectDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ObjectDimensionAggregate.EdFi.ObjectDimensionQ" table="ObjectDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -15108,7 +15108,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ObjectiveAssessmentAggregate.EdFi.ObjectiveAssessmentQ" table="ObjectiveAssessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ObjectiveAssessmentAggregate.EdFi.ObjectiveAssessmentQ" table="ObjectiveAssessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -15349,7 +15349,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.OpenStaffPositionAggregate.EdFi.OpenStaffPositionQ" table="OpenStaffPosition" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.OpenStaffPositionAggregate.EdFi.OpenStaffPositionQ" table="OpenStaffPosition" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -15476,7 +15476,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.OperationalUnitDimensionAggregate.EdFi.OperationalUnitDimensionQ" table="OperationalUnitDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.OperationalUnitDimensionAggregate.EdFi.OperationalUnitDimensionQ" table="OperationalUnitDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -15554,7 +15554,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.PersonAggregate.EdFi.PersonQ" table="Person" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.PersonAggregate.EdFi.PersonQ" table="Person" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="PersonId" column="PersonId" type="string" length="32" />
@@ -15614,7 +15614,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventAggregate.EdFi.PostSecondaryEventQ" table="PostSecondaryEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventAggregate.EdFi.PostSecondaryEventQ" table="PostSecondaryEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EventDate" column="EventDate" type="date" />
@@ -15685,7 +15685,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAggregate.EdFi.ProgramQ" table="Program" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAggregate.EdFi.ProgramQ" table="Program" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -15948,7 +15948,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramDimensionAggregate.EdFi.ProgramDimensionQ" table="ProgramDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramDimensionAggregate.EdFi.ProgramDimensionQ" table="ProgramDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -16026,7 +16026,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationAggregate.EdFi.ProgramEvaluationQ" table="ProgramEvaluation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationAggregate.EdFi.ProgramEvaluationQ" table="ProgramEvaluation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramEducationOrganizationId" column="ProgramEducationOrganizationId" type="long" />
@@ -16159,7 +16159,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationElementAggregate.EdFi.ProgramEvaluationElementQ" table="ProgramEvaluationElement" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationElementAggregate.EdFi.ProgramEvaluationElementQ" table="ProgramEvaluationElement" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramEducationOrganizationId" column="ProgramEducationOrganizationId" type="long" />
@@ -16293,7 +16293,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationObjectiveAggregate.EdFi.ProgramEvaluationObjectiveQ" table="ProgramEvaluationObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationObjectiveAggregate.EdFi.ProgramEvaluationObjectiveQ" table="ProgramEvaluationObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramEducationOrganizationId" column="ProgramEducationOrganizationId" type="long" />
@@ -16417,7 +16417,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProjectDimensionAggregate.EdFi.ProjectDimensionQ" table="ProjectDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProjectDimensionAggregate.EdFi.ProjectDimensionQ" table="ProjectDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -16495,7 +16495,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ReportCardAggregate.EdFi.ReportCardQ" table="ReportCard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ReportCardAggregate.EdFi.ReportCardQ" table="ReportCard" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -16719,7 +16719,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventAggregate.EdFi.RestraintEventQ" table="RestraintEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventAggregate.EdFi.RestraintEventQ" table="RestraintEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="RestraintEventIdentifier" column="RestraintEventIdentifier" type="string" length="36" />
@@ -17047,7 +17047,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionQ" table="Section" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionQ" table="Section" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -17441,7 +17441,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAttendanceTakenEventAggregate.EdFi.SectionAttendanceTakenEventQ" table="SectionAttendanceTakenEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAttendanceTakenEventAggregate.EdFi.SectionAttendanceTakenEventQ" table="SectionAttendanceTakenEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -17497,7 +17497,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SessionAggregate.EdFi.SessionQ" table="Session" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SessionAggregate.EdFi.SessionQ" table="Session" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolId" column="SchoolId" type="long" />
@@ -17652,7 +17652,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SourceDimensionAggregate.EdFi.SourceDimensionQ" table="SourceDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SourceDimensionAggregate.EdFi.SourceDimensionQ" table="SourceDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -17730,7 +17730,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAggregate.EdFi.StaffQ" table="Staff" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAggregate.EdFi.StaffQ" table="Staff" lazy="false" discriminator-value="null">
     <id name="StaffUSI" column="StaffUSI" type="int">
       <generator class="identity" />
     </id>
@@ -18623,7 +18623,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEventQ" table="StaffAbsenceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEventQ" table="StaffAbsenceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AbsenceEventCategoryDescriptorId" column="AbsenceEventCategoryDescriptorId" type="int" />
@@ -18665,7 +18665,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffCohortAssociationAggregate.EdFi.StaffCohortAssociationQ" table="StaffCohortAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffCohortAssociationAggregate.EdFi.StaffCohortAssociationQ" table="StaffCohortAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -18709,7 +18709,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffDisciplineIncidentAssociationAggregate.EdFi.StaffDisciplineIncidentAssociationQ" table="StaffDisciplineIncidentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffDisciplineIncidentAssociationAggregate.EdFi.StaffDisciplineIncidentAssociationQ" table="StaffDisciplineIncidentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="36" />
@@ -18788,7 +18788,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociationQ" table="StaffEducationOrganizationAssignmentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociationQ" table="StaffEducationOrganizationAssignmentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -18851,7 +18851,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociationQ" table="StaffEducationOrganizationContactAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociationQ" table="StaffEducationOrganizationContactAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ContactTitle" column="ContactTitle" type="string" length="75" />
@@ -19025,7 +19025,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" table="StaffEducationOrganizationEmploymentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" table="StaffEducationOrganizationEmploymentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -19099,7 +19099,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveAggregate.EdFi.StaffLeaveQ" table="StaffLeave" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveAggregate.EdFi.StaffLeaveQ" table="StaffLeave" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -19142,7 +19142,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffProgramAssociationAggregate.EdFi.StaffProgramAssociationQ" table="StaffProgramAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffProgramAssociationAggregate.EdFi.StaffProgramAssociationQ" table="StaffProgramAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -19188,7 +19188,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociationQ" table="StaffSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociationQ" table="StaffSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramAssignmentDescriptorId" column="ProgramAssignmentDescriptorId" type="int" />
@@ -19317,7 +19317,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociationQ" table="StaffSectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociationQ" table="StaffSectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -19426,7 +19426,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentQ" table="Student" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentQ" table="Student" lazy="false" discriminator-value="null">
     <id name="StudentUSI" column="StudentUSI" type="int">
       <generator class="identity" />
     </id>
@@ -19847,7 +19847,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordQ" table="StudentAcademicRecord" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordQ" table="StudentAcademicRecord" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -20223,7 +20223,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" table="StudentAssessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" table="StudentAssessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -20676,7 +20676,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociationQ" table="StudentAssessmentEducationOrganizationAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociationQ" table="StudentAssessmentEducationOrganizationAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -20729,7 +20729,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCohortAssociationAggregate.EdFi.StudentCohortAssociationQ" table="StudentCohortAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCohortAssociationAggregate.EdFi.StudentCohortAssociationQ" table="StudentCohortAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -20820,7 +20820,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCompetencyObjectiveAggregate.EdFi.StudentCompetencyObjectiveQ" table="StudentCompetencyObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCompetencyObjectiveAggregate.EdFi.StudentCompetencyObjectiveQ" table="StudentCompetencyObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -21008,7 +21008,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentContactAssociationAggregate.EdFi.StudentContactAssociationQ" table="StudentContactAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentContactAssociationAggregate.EdFi.StudentContactAssociationQ" table="StudentContactAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ContactUSI" column="ContactUSI" type="int" />
@@ -21093,7 +21093,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociationQ" table="StudentDisciplineIncidentBehaviorAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociationQ" table="StudentDisciplineIncidentBehaviorAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BehaviorDescriptorId" column="BehaviorDescriptorId" type="int" />
@@ -21189,7 +21189,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociationQ" table="StudentDisciplineIncidentNonOffenderAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociationQ" table="StudentDisciplineIncidentNonOffenderAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="36" />
@@ -21268,7 +21268,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" table="StudentEducationOrganizationAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" table="StudentEducationOrganizationAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -22106,7 +22106,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociationQ" table="StudentEducationOrganizationResponsibilityAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociationQ" table="StudentEducationOrganizationResponsibilityAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -22151,7 +22151,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntryQ" table="StudentGradebookEntry" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntryQ" table="StudentGradebookEntry" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradebookEntryIdentifier" column="GradebookEntryIdentifier" type="string" length="60" />
@@ -22210,7 +22210,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentHealthAggregate.EdFi.StudentHealthQ" table="StudentHealth" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentHealthAggregate.EdFi.StudentHealthQ" table="StudentHealth" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -22431,7 +22431,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationQ" table="StudentInterventionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationQ" table="StudentInterventionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -22531,7 +22531,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAttendanceEventAggregate.EdFi.StudentInterventionAttendanceEventQ" table="StudentInterventionAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAttendanceEventAggregate.EdFi.StudentInterventionAttendanceEventQ" table="StudentInterventionAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -22772,7 +22772,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentProgramAttendanceEventAggregate.EdFi.StudentProgramAttendanceEventQ" table="StudentProgramAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentProgramAttendanceEventAggregate.EdFi.StudentProgramAttendanceEventQ" table="StudentProgramAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -22831,7 +22831,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentProgramEvaluationAggregate.EdFi.StudentProgramEvaluationQ" table="StudentProgramEvaluation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentProgramEvaluationAggregate.EdFi.StudentProgramEvaluationQ" table="StudentProgramEvaluation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EvaluationDate" column="EvaluationDate" type="date" />
@@ -23059,7 +23059,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" table="StudentSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" table="StudentSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EntryDate" column="EntryDate" type="date" />
@@ -23245,7 +23245,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAttendanceEventAggregate.EdFi.StudentSchoolAttendanceEventQ" table="StudentSchoolAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAttendanceEventAggregate.EdFi.StudentSchoolAttendanceEventQ" table="StudentSchoolAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -23340,7 +23340,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociationQ" table="StudentSectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociationQ" table="StudentSectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -23475,7 +23475,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEventQ" table="StudentSectionAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEventQ" table="StudentSectionAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -23784,7 +23784,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramEligibilityAssociationAggregate.EdFi.StudentSpecialEducationProgramEligibilityAssociationQ" table="StudentSpecialEducationProgramEligibilityAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramEligibilityAssociationAggregate.EdFi.StudentSpecialEducationProgramEligibilityAssociationQ" table="StudentSpecialEducationProgramEligibilityAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ConsentToEvaluationReceivedDate" column="ConsentToEvaluationReceivedDate" type="date" />
@@ -23893,7 +23893,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTransportationAggregate.EdFi.StudentTransportationQ" table="StudentTransportation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTransportationAggregate.EdFi.StudentTransportationQ" table="StudentTransportation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="StudentUSI" column="StudentUSI" type="int" />
@@ -24046,7 +24046,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyAggregate.EdFi.SurveyQ" table="Survey" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyAggregate.EdFi.SurveyQ" table="Survey" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -24148,7 +24148,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyCourseAssociationAggregate.EdFi.SurveyCourseAssociationQ" table="SurveyCourseAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyCourseAssociationAggregate.EdFi.SurveyCourseAssociationQ" table="SurveyCourseAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseCode" column="CourseCode" type="string" length="60" />
@@ -24191,7 +24191,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyProgramAssociationAggregate.EdFi.SurveyProgramAssociationQ" table="SurveyProgramAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyProgramAssociationAggregate.EdFi.SurveyProgramAssociationQ" table="SurveyProgramAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -24236,7 +24236,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionAggregate.EdFi.SurveyQuestionQ" table="SurveyQuestion" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionAggregate.EdFi.SurveyQuestionQ" table="SurveyQuestion" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -24368,7 +24368,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionResponseAggregate.EdFi.SurveyQuestionResponseQ" table="SurveyQuestionResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionResponseAggregate.EdFi.SurveyQuestionResponseQ" table="SurveyQuestionResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -24496,7 +24496,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseAggregate.EdFi.SurveyResponseQ" table="SurveyResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseAggregate.EdFi.SurveyResponseQ" table="SurveyResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -24625,7 +24625,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveyResponseEducationOrganizationTargetAssociationQ" table="SurveyResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveyResponseEducationOrganizationTargetAssociationQ" table="SurveyResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -24668,7 +24668,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseStaffTargetAssociationAggregate.EdFi.SurveyResponseStaffTargetAssociationQ" table="SurveyResponseStaffTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseStaffTargetAssociationAggregate.EdFi.SurveyResponseStaffTargetAssociationQ" table="SurveyResponseStaffTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -24711,7 +24711,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionAggregate.EdFi.SurveySectionQ" table="SurveySection" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionAggregate.EdFi.SurveySectionQ" table="SurveySection" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -24767,7 +24767,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionAssociationAggregate.EdFi.SurveySectionAssociationQ" table="SurveySectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionAssociationAggregate.EdFi.SurveySectionAssociationQ" table="SurveySectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -24816,7 +24816,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseAggregate.EdFi.SurveySectionResponseQ" table="SurveySectionResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseAggregate.EdFi.SurveySectionResponseQ" table="SurveySectionResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -24882,7 +24882,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveySectionResponseEducationOrganizationTargetAssociationQ" table="SurveySectionResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveySectionResponseEducationOrganizationTargetAssociationQ" table="SurveySectionResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -24927,7 +24927,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseStaffTargetAssociationAggregate.EdFi.SurveySectionResponseStaffTargetAssociationQ" table="SurveySectionResponseStaffTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseStaffTargetAssociationAggregate.EdFi.SurveySectionResponseStaffTargetAssociationQ" table="SurveySectionResponseStaffTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
index bcc5cd5f50..445cca01a5 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappings.generated.hbm.approved.xml
@@ -15,7 +15,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AcademicWeekAggregate.EdFi.AcademicWeek" table="AcademicWeek" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AcademicWeekAggregate.EdFi.AcademicWeek" table="AcademicWeek" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolId" column="SchoolId" type="long" />
@@ -66,7 +66,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AccountabilityRatingAggregate.EdFi.AccountabilityRating" table="AccountabilityRating" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AccountabilityRatingAggregate.EdFi.AccountabilityRating" table="AccountabilityRating" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -121,7 +121,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AssessmentAggregate.EdFi.Assessment" table="Assessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AssessmentAggregate.EdFi.Assessment" table="Assessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -617,7 +617,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AssessmentItemAggregate.EdFi.AssessmentItem" table="AssessmentItem" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AssessmentItemAggregate.EdFi.AssessmentItem" table="AssessmentItem" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -748,7 +748,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.AssessmentScoreRangeLearningStandardAggregate.EdFi.AssessmentScoreRangeLearningStandard" table="AssessmentScoreRangeLearningStandard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.AssessmentScoreRangeLearningStandardAggregate.EdFi.AssessmentScoreRangeLearningStandard" table="AssessmentScoreRangeLearningStandard" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -844,7 +844,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.BalanceSheetDimensionAggregate.EdFi.BalanceSheetDimension" table="BalanceSheetDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.BalanceSheetDimensionAggregate.EdFi.BalanceSheetDimension" table="BalanceSheetDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -922,7 +922,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.BellScheduleAggregate.EdFi.BellSchedule" table="BellSchedule" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.BellScheduleAggregate.EdFi.BellSchedule" table="BellSchedule" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BellScheduleName" column="BellScheduleName" type="string" length="60" />
@@ -1077,7 +1077,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CalendarAggregate.EdFi.Calendar" table="Calendar" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CalendarAggregate.EdFi.Calendar" table="Calendar" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -1166,7 +1166,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CalendarDateAggregate.EdFi.CalendarDate" table="CalendarDate" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CalendarDateAggregate.EdFi.CalendarDate" table="CalendarDate" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -1255,7 +1255,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ChartOfAccountAggregate.EdFi.ChartOfAccount" table="ChartOfAccount" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ChartOfAccountAggregate.EdFi.ChartOfAccount" table="ChartOfAccount" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -1381,7 +1381,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ClassPeriodAggregate.EdFi.ClassPeriod" table="ClassPeriod" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ClassPeriodAggregate.EdFi.ClassPeriod" table="ClassPeriod" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ClassPeriodName" column="ClassPeriodName" type="string" length="60" />
@@ -1463,7 +1463,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CohortAggregate.EdFi.Cohort" table="Cohort" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CohortAggregate.EdFi.Cohort" table="Cohort" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CohortIdentifier" column="CohortIdentifier" type="string" length="36" />
@@ -1555,7 +1555,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicense" table="CommunityProviderLicense" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicense" table="CommunityProviderLicense" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CommunityProviderId" column="CommunityProviderId" type="long" />
@@ -1612,7 +1612,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CompetencyObjectiveAggregate.EdFi.CompetencyObjective" table="CompetencyObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CompetencyObjectiveAggregate.EdFi.CompetencyObjective" table="CompetencyObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -1661,7 +1661,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ContactAggregate.EdFi.Contact" table="Contact" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ContactAggregate.EdFi.Contact" table="Contact" lazy="false" discriminator-value="null">
     <id name="ContactUSI" column="ContactUSI" type="int">
       <generator class="identity" />
     </id>
@@ -2054,7 +2054,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CourseAggregate.EdFi.Course" table="Course" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CourseAggregate.EdFi.Course" table="Course" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseCode" column="CourseCode" type="string" length="60" />
@@ -2323,7 +2323,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CourseOfferingAggregate.EdFi.CourseOffering" table="CourseOffering" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CourseOfferingAggregate.EdFi.CourseOffering" table="CourseOffering" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -2501,7 +2501,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CourseTranscriptAggregate.EdFi.CourseTranscript" table="CourseTranscript" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CourseTranscriptAggregate.EdFi.CourseTranscript" table="CourseTranscript" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseAttemptResultDescriptorId" column="CourseAttemptResultDescriptorId" type="int" />
@@ -2909,7 +2909,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CredentialAggregate.EdFi.Credential" table="Credential" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CredentialAggregate.EdFi.Credential" table="Credential" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CredentialIdentifier" column="CredentialIdentifier" type="string" length="60" />
@@ -3058,7 +3058,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.CrisisEventAggregate.EdFi.CrisisEvent" table="CrisisEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.CrisisEventAggregate.EdFi.CrisisEvent" table="CrisisEvent" lazy="false" discriminator-value="null">
     <id name="CrisisEventName" column="CrisisEventName" type="string" length="100">
       <generator class="assigned" />
     </id>
@@ -3091,7 +3091,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DescriptorAggregate.EdFi.Descriptor" table="Descriptor" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.DescriptorAggregate.EdFi.Descriptor" table="Descriptor" lazy="false" abstract="true" discriminator-value="null">
     <id name="DescriptorId" column="DescriptorId" type="int">
       <generator class="identity" />
     </id>
@@ -6486,7 +6486,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DescriptorMappingAggregate.EdFi.DescriptorMapping" table="DescriptorMapping" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.DescriptorMappingAggregate.EdFi.DescriptorMapping" table="DescriptorMapping" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="MappedNamespace" column="MappedNamespace" type="string" length="255" />
@@ -6570,7 +6570,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DisciplineActionAggregate.EdFi.DisciplineAction" table="DisciplineAction" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.DisciplineActionAggregate.EdFi.DisciplineAction" table="DisciplineAction" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="DisciplineActionIdentifier" column="DisciplineActionIdentifier" type="string" length="36" />
@@ -6747,7 +6747,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.DisciplineIncidentAggregate.EdFi.DisciplineIncident" table="DisciplineIncident" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.DisciplineIncidentAggregate.EdFi.DisciplineIncident" table="DisciplineIncident" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="36" />
@@ -6903,7 +6903,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationContentAggregate.EdFi.EducationContent" table="EducationContent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationContentAggregate.EdFi.EducationContent" table="EducationContent" lazy="false" discriminator-value="null">
     <id name="ContentIdentifier" column="ContentIdentifier" type="string" length="225">
       <generator class="assigned" />
     </id>
@@ -7182,7 +7182,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationAggregate.EdFi.EducationOrganization" table="EducationOrganization" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationAggregate.EdFi.EducationOrganization" table="EducationOrganization" lazy="false" abstract="true" discriminator-value="null">
     <id name="EducationOrganizationId" column="EducationOrganizationId" type="long">
       <generator class="assigned" />
     </id>
@@ -7771,7 +7771,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationInterventionPrescriptionAssociationAggregate.EdFi.EducationOrganizationInterventionPrescriptionAssociation" table="EducationOrganizationInterventionPrescriptionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationInterventionPrescriptionAssociationAggregate.EdFi.EducationOrganizationInterventionPrescriptionAssociation" table="EducationOrganizationInterventionPrescriptionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -7825,7 +7825,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationNetworkAssociationAggregate.EdFi.EducationOrganizationNetworkAssociation" table="EducationOrganizationNetworkAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationNetworkAssociationAggregate.EdFi.EducationOrganizationNetworkAssociation" table="EducationOrganizationNetworkAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationNetworkId" column="EducationOrganizationNetworkId" type="long" />
@@ -7877,7 +7877,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationPeerAssociationAggregate.EdFi.EducationOrganizationPeerAssociation" table="EducationOrganizationPeerAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EducationOrganizationPeerAssociationAggregate.EdFi.EducationOrganizationPeerAssociation" table="EducationOrganizationPeerAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -7933,7 +7933,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.EvaluationRubricDimensionAggregate.EdFi.EvaluationRubricDimension" table="EvaluationRubricDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.EvaluationRubricDimensionAggregate.EdFi.EvaluationRubricDimension" table="EvaluationRubricDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EvaluationRubricRating" column="EvaluationRubricRating" type="int" />
@@ -7996,7 +7996,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.FeederSchoolAssociationAggregate.EdFi.FeederSchoolAssociation" table="FeederSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.FeederSchoolAssociationAggregate.EdFi.FeederSchoolAssociation" table="FeederSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -8049,7 +8049,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.FunctionDimensionAggregate.EdFi.FunctionDimension" table="FunctionDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.FunctionDimensionAggregate.EdFi.FunctionDimension" table="FunctionDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -8127,7 +8127,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.FundDimensionAggregate.EdFi.FundDimension" table="FundDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.FundDimensionAggregate.EdFi.FundDimension" table="FundDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -8209,7 +8209,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociation" table="GeneralStudentProgramAssociation" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociation" table="GeneralStudentProgramAssociation" lazy="false" abstract="true" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -8738,7 +8738,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GradeAggregate.EdFi.Grade" table="Grade" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GradeAggregate.EdFi.Grade" table="Grade" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -8871,7 +8871,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GradebookEntryAggregate.EdFi.GradebookEntry" table="GradebookEntry" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GradebookEntryAggregate.EdFi.GradebookEntry" table="GradebookEntry" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradebookEntryIdentifier" column="GradebookEntryIdentifier" type="string" length="60" />
@@ -8981,7 +8981,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GradingPeriodAggregate.EdFi.GradingPeriod" table="GradingPeriod" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GradingPeriodAggregate.EdFi.GradingPeriod" table="GradingPeriod" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -9038,7 +9038,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.GraduationPlanAggregate.EdFi.GraduationPlan" table="GraduationPlan" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.GraduationPlanAggregate.EdFi.GraduationPlan" table="GraduationPlan" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -9377,7 +9377,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.InterventionAggregate.EdFi.Intervention" table="Intervention" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.InterventionAggregate.EdFi.Intervention" table="Intervention" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -9773,7 +9773,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.InterventionPrescriptionAggregate.EdFi.InterventionPrescription" table="InterventionPrescription" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.InterventionPrescriptionAggregate.EdFi.InterventionPrescription" table="InterventionPrescription" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -10059,7 +10059,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.InterventionStudyAggregate.EdFi.InterventionStudy" table="InterventionStudy" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.InterventionStudyAggregate.EdFi.InterventionStudy" table="InterventionStudy" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -10384,7 +10384,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LearningStandardAggregate.EdFi.LearningStandard" table="LearningStandard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LearningStandardAggregate.EdFi.LearningStandard" table="LearningStandard" lazy="false" discriminator-value="null">
     <id name="LearningStandardId" column="LearningStandardId" type="string" length="60">
       <generator class="assigned" />
     </id>
@@ -10607,7 +10607,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociation" table="LearningStandardEquivalenceAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociation" table="LearningStandardEquivalenceAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -10662,7 +10662,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalAccountAggregate.EdFi.LocalAccount" table="LocalAccount" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalAccountAggregate.EdFi.LocalAccount" table="LocalAccount" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10756,7 +10756,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalActualAggregate.EdFi.LocalActual" table="LocalActual" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalActualAggregate.EdFi.LocalActual" table="LocalActual" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10811,7 +10811,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalBudgetAggregate.EdFi.LocalBudget" table="LocalBudget" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalBudgetAggregate.EdFi.LocalBudget" table="LocalBudget" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10867,7 +10867,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalContractedStaffAggregate.EdFi.LocalContractedStaff" table="LocalContractedStaff" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalContractedStaffAggregate.EdFi.LocalContractedStaff" table="LocalContractedStaff" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -10987,7 +10987,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalEncumbranceAggregate.EdFi.LocalEncumbrance" table="LocalEncumbrance" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalEncumbranceAggregate.EdFi.LocalEncumbrance" table="LocalEncumbrance" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -11043,7 +11043,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocalPayrollAggregate.EdFi.LocalPayroll" table="LocalPayroll" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocalPayrollAggregate.EdFi.LocalPayroll" table="LocalPayroll" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -11100,7 +11100,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.LocationAggregate.EdFi.Location" table="Location" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.LocationAggregate.EdFi.Location" table="Location" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ClassroomIdentificationCode" column="ClassroomIdentificationCode" type="string" length="60" />
@@ -11149,7 +11149,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ObjectDimensionAggregate.EdFi.ObjectDimension" table="ObjectDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ObjectDimensionAggregate.EdFi.ObjectDimension" table="ObjectDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -11228,7 +11228,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ObjectiveAssessmentAggregate.EdFi.ObjectiveAssessment" table="ObjectiveAssessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ObjectiveAssessmentAggregate.EdFi.ObjectiveAssessment" table="ObjectiveAssessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -11444,7 +11444,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.OpenStaffPositionAggregate.EdFi.OpenStaffPosition" table="OpenStaffPosition" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.OpenStaffPositionAggregate.EdFi.OpenStaffPosition" table="OpenStaffPosition" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -11564,7 +11564,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.OperationalUnitDimensionAggregate.EdFi.OperationalUnitDimension" table="OperationalUnitDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.OperationalUnitDimensionAggregate.EdFi.OperationalUnitDimension" table="OperationalUnitDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -11642,7 +11642,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PersonAggregate.EdFi.Person" table="Person" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PersonAggregate.EdFi.Person" table="Person" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="PersonId" column="PersonId" type="string" length="32" />
@@ -11687,7 +11687,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.PostSecondaryEventAggregate.EdFi.PostSecondaryEvent" table="PostSecondaryEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.PostSecondaryEventAggregate.EdFi.PostSecondaryEvent" table="PostSecondaryEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EventDate" column="EventDate" type="date" />
@@ -11764,7 +11764,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ProgramAggregate.EdFi.Program" table="Program" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ProgramAggregate.EdFi.Program" table="Program" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -11921,7 +11921,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ProgramDimensionAggregate.EdFi.ProgramDimension" table="ProgramDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ProgramDimensionAggregate.EdFi.ProgramDimension" table="ProgramDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -12003,7 +12003,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationAggregate.EdFi.ProgramEvaluation" table="ProgramEvaluation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationAggregate.EdFi.ProgramEvaluation" table="ProgramEvaluation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramEducationOrganizationId" column="ProgramEducationOrganizationId" type="long" />
@@ -12107,7 +12107,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationElementAggregate.EdFi.ProgramEvaluationElement" table="ProgramEvaluationElement" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationElementAggregate.EdFi.ProgramEvaluationElement" table="ProgramEvaluationElement" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramEducationOrganizationId" column="ProgramEducationOrganizationId" type="long" />
@@ -12228,7 +12228,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationObjectiveAggregate.EdFi.ProgramEvaluationObjective" table="ProgramEvaluationObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ProgramEvaluationObjectiveAggregate.EdFi.ProgramEvaluationObjective" table="ProgramEvaluationObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramEducationOrganizationId" column="ProgramEducationOrganizationId" type="long" />
@@ -12334,7 +12334,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ProjectDimensionAggregate.EdFi.ProjectDimension" table="ProjectDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ProjectDimensionAggregate.EdFi.ProjectDimension" table="ProjectDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -12416,7 +12416,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.ReportCardAggregate.EdFi.ReportCard" table="ReportCard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.ReportCardAggregate.EdFi.ReportCard" table="ReportCard" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -12637,7 +12637,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.RestraintEventAggregate.EdFi.RestraintEvent" table="RestraintEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.RestraintEventAggregate.EdFi.RestraintEvent" table="RestraintEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="RestraintEventIdentifier" column="RestraintEventIdentifier" type="string" length="36" />
@@ -12857,7 +12857,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SectionAggregate.EdFi.Section" table="Section" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SectionAggregate.EdFi.Section" table="Section" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -13141,7 +13141,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SectionAttendanceTakenEventAggregate.EdFi.SectionAttendanceTakenEvent" table="SectionAttendanceTakenEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SectionAttendanceTakenEventAggregate.EdFi.SectionAttendanceTakenEvent" table="SectionAttendanceTakenEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -13209,7 +13209,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SessionAggregate.EdFi.Session" table="Session" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SessionAggregate.EdFi.Session" table="Session" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolId" column="SchoolId" type="long" />
@@ -13345,7 +13345,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SourceDimensionAggregate.EdFi.SourceDimension" table="SourceDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SourceDimensionAggregate.EdFi.SourceDimension" table="SourceDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -13421,7 +13421,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffAggregate.EdFi.Staff" table="Staff" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffAggregate.EdFi.Staff" table="Staff" lazy="false" discriminator-value="null">
     <id name="StaffUSI" column="StaffUSI" type="int">
       <generator class="identity" />
     </id>
@@ -14094,7 +14094,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEvent" table="StaffAbsenceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEvent" table="StaffAbsenceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AbsenceEventCategoryDescriptorId" column="AbsenceEventCategoryDescriptorId" type="int" />
@@ -14146,7 +14146,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffCohortAssociationAggregate.EdFi.StaffCohortAssociation" table="StaffCohortAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffCohortAssociationAggregate.EdFi.StaffCohortAssociation" table="StaffCohortAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -14202,7 +14202,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffDisciplineIncidentAssociationAggregate.EdFi.StaffDisciplineIncidentAssociation" table="StaffDisciplineIncidentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffDisciplineIncidentAssociationAggregate.EdFi.StaffDisciplineIncidentAssociation" table="StaffDisciplineIncidentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="36" />
@@ -14291,7 +14291,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociation" table="StaffEducationOrganizationAssignmentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociation" table="StaffEducationOrganizationAssignmentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -14363,7 +14363,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociation" table="StaffEducationOrganizationContactAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociation" table="StaffEducationOrganizationContactAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ContactTitle" column="ContactTitle" type="string" length="75" />
@@ -14542,7 +14542,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociation" table="StaffEducationOrganizationEmploymentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociation" table="StaffEducationOrganizationEmploymentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -14609,7 +14609,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffLeaveAggregate.EdFi.StaffLeave" table="StaffLeave" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffLeaveAggregate.EdFi.StaffLeave" table="StaffLeave" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -14663,7 +14663,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffProgramAssociationAggregate.EdFi.StaffProgramAssociation" table="StaffProgramAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffProgramAssociationAggregate.EdFi.StaffProgramAssociation" table="StaffProgramAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -14721,7 +14721,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociation" table="StaffSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociation" table="StaffSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramAssignmentDescriptorId" column="ProgramAssignmentDescriptorId" type="int" />
@@ -14857,7 +14857,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociation" table="StaffSectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociation" table="StaffSectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -14972,7 +14972,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAggregate.EdFi.Student" table="Student" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAggregate.EdFi.Student" table="Student" lazy="false" discriminator-value="null">
     <id name="StudentUSI" column="StudentUSI" type="int">
       <generator class="identity" />
     </id>
@@ -15181,7 +15181,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecord" table="StudentAcademicRecord" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecord" table="StudentAcademicRecord" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -15529,7 +15529,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAssessmentAggregate.EdFi.StudentAssessment" table="StudentAssessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAssessmentAggregate.EdFi.StudentAssessment" table="StudentAssessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -15938,7 +15938,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociation" table="StudentAssessmentEducationOrganizationAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociation" table="StudentAssessmentEducationOrganizationAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -16001,7 +16001,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentCohortAssociationAggregate.EdFi.StudentCohortAssociation" table="StudentCohortAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentCohortAssociationAggregate.EdFi.StudentCohortAssociation" table="StudentCohortAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -16109,7 +16109,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentCompetencyObjectiveAggregate.EdFi.StudentCompetencyObjective" table="StudentCompetencyObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentCompetencyObjectiveAggregate.EdFi.StudentCompetencyObjective" table="StudentCompetencyObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -16291,7 +16291,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentContactAssociationAggregate.EdFi.StudentContactAssociation" table="StudentContactAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentContactAssociationAggregate.EdFi.StudentContactAssociation" table="StudentContactAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ContactUSI" column="ContactUSI" type="int" />
@@ -16383,7 +16383,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociation" table="StudentDisciplineIncidentBehaviorAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociation" table="StudentDisciplineIncidentBehaviorAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BehaviorDescriptorId" column="BehaviorDescriptorId" type="int" />
@@ -16475,7 +16475,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociation" table="StudentDisciplineIncidentNonOffenderAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociation" table="StudentDisciplineIncidentNonOffenderAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="36" />
@@ -16562,7 +16562,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociation" table="StudentEducationOrganizationAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociation" table="StudentEducationOrganizationAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -17326,7 +17326,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociation" table="StudentEducationOrganizationResponsibilityAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociation" table="StudentEducationOrganizationResponsibilityAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -17380,7 +17380,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntry" table="StudentGradebookEntry" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntry" table="StudentGradebookEntry" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradebookEntryIdentifier" column="GradebookEntryIdentifier" type="string" length="60" />
@@ -17441,7 +17441,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentHealthAggregate.EdFi.StudentHealth" table="StudentHealth" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentHealthAggregate.EdFi.StudentHealth" table="StudentHealth" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -17665,7 +17665,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociation" table="StudentInterventionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociation" table="StudentInterventionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -17767,7 +17767,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentInterventionAttendanceEventAggregate.EdFi.StudentInterventionAttendanceEvent" table="StudentInterventionAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentInterventionAttendanceEventAggregate.EdFi.StudentInterventionAttendanceEvent" table="StudentInterventionAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -17994,7 +17994,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentProgramAttendanceEventAggregate.EdFi.StudentProgramAttendanceEvent" table="StudentProgramAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentProgramAttendanceEventAggregate.EdFi.StudentProgramAttendanceEvent" table="StudentProgramAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -18064,7 +18064,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentProgramEvaluationAggregate.EdFi.StudentProgramEvaluation" table="StudentProgramEvaluation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentProgramEvaluationAggregate.EdFi.StudentProgramEvaluation" table="StudentProgramEvaluation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EvaluationDate" column="EvaluationDate" type="date" />
@@ -18295,7 +18295,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociation" table="StudentSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociation" table="StudentSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EntryDate" column="EntryDate" type="date" />
@@ -18469,7 +18469,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAttendanceEventAggregate.EdFi.StudentSchoolAttendanceEvent" table="StudentSchoolAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSchoolAttendanceEventAggregate.EdFi.StudentSchoolAttendanceEvent" table="StudentSchoolAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -18571,7 +18571,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociation" table="StudentSectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociation" table="StudentSectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -18691,7 +18691,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEvent" table="StudentSectionAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEvent" table="StudentSectionAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -18996,7 +18996,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentSpecialEducationProgramEligibilityAssociationAggregate.EdFi.StudentSpecialEducationProgramEligibilityAssociation" table="StudentSpecialEducationProgramEligibilityAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentSpecialEducationProgramEligibilityAssociationAggregate.EdFi.StudentSpecialEducationProgramEligibilityAssociation" table="StudentSpecialEducationProgramEligibilityAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ConsentToEvaluationReceivedDate" column="ConsentToEvaluationReceivedDate" type="date" />
@@ -19101,7 +19101,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.StudentTransportationAggregate.EdFi.StudentTransportation" table="StudentTransportation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.StudentTransportationAggregate.EdFi.StudentTransportation" table="StudentTransportation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="StudentUSI" column="StudentUSI" type="int" />
@@ -19256,7 +19256,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyAggregate.EdFi.Survey" table="Survey" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyAggregate.EdFi.Survey" table="Survey" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19320,7 +19320,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyCourseAssociationAggregate.EdFi.SurveyCourseAssociation" table="SurveyCourseAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyCourseAssociationAggregate.EdFi.SurveyCourseAssociation" table="SurveyCourseAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseCode" column="CourseCode" type="string" length="60" />
@@ -19377,7 +19377,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyProgramAssociationAggregate.EdFi.SurveyProgramAssociation" table="SurveyProgramAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyProgramAssociationAggregate.EdFi.SurveyProgramAssociation" table="SurveyProgramAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -19434,7 +19434,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyQuestionAggregate.EdFi.SurveyQuestion" table="SurveyQuestion" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyQuestionAggregate.EdFi.SurveyQuestion" table="SurveyQuestion" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19567,7 +19567,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyQuestionResponseAggregate.EdFi.SurveyQuestionResponse" table="SurveyQuestionResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyQuestionResponseAggregate.EdFi.SurveyQuestionResponse" table="SurveyQuestionResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19707,7 +19707,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseAggregate.EdFi.SurveyResponse" table="SurveyResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseAggregate.EdFi.SurveyResponse" table="SurveyResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19810,7 +19810,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveyResponseEducationOrganizationTargetAssociation" table="SurveyResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveyResponseEducationOrganizationTargetAssociation" table="SurveyResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -19866,7 +19866,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseStaffTargetAssociationAggregate.EdFi.SurveyResponseStaffTargetAssociation" table="SurveyResponseStaffTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveyResponseStaffTargetAssociationAggregate.EdFi.SurveyResponseStaffTargetAssociation" table="SurveyResponseStaffTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19921,7 +19921,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionAggregate.EdFi.SurveySection" table="SurveySection" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionAggregate.EdFi.SurveySection" table="SurveySection" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -19975,7 +19975,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionAssociationAggregate.EdFi.SurveySectionAssociation" table="SurveySectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionAssociationAggregate.EdFi.SurveySectionAssociation" table="SurveySectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -20037,7 +20037,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseAggregate.EdFi.SurveySectionResponse" table="SurveySectionResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseAggregate.EdFi.SurveySectionResponse" table="SurveySectionResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -20097,7 +20097,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveySectionResponseEducationOrganizationTargetAssociation" table="SurveySectionResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveySectionResponseEducationOrganizationTargetAssociation" table="SurveySectionResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -20156,7 +20156,7 @@
     </class>
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseStaffTargetAssociationAggregate.EdFi.SurveySectionResponseStaffTargetAssociation" table="SurveySectionResponseStaffTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.SurveySectionResponseStaffTargetAssociationAggregate.EdFi.SurveySectionResponseStaffTargetAssociation" table="SurveySectionResponseStaffTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
index 61531d84db..ec60309c3c 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/5.1.0/DataStandard_510_ApprovalTests.Verify.Standard_Std_5.1.0_EntityOrmMappings_PgSql_EntityOrmMappingsForQueries.generated.hbm.approved.xml
@@ -2,7 +2,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicWeekAggregate.EdFi.AcademicWeekQ" table="AcademicWeek" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AcademicWeekAggregate.EdFi.AcademicWeekQ" table="AcademicWeek" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolId" column="SchoolId" type="long" />
@@ -49,7 +49,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AccountabilityRatingAggregate.EdFi.AccountabilityRatingQ" table="AccountabilityRating" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AccountabilityRatingAggregate.EdFi.AccountabilityRatingQ" table="AccountabilityRating" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -93,7 +93,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentAggregate.EdFi.AssessmentQ" table="Assessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentAggregate.EdFi.AssessmentQ" table="Assessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -650,7 +650,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemAggregate.EdFi.AssessmentItemQ" table="AssessmentItem" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentItemAggregate.EdFi.AssessmentItemQ" table="AssessmentItem" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -790,7 +790,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentScoreRangeLearningStandardAggregate.EdFi.AssessmentScoreRangeLearningStandardQ" table="AssessmentScoreRangeLearningStandard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.AssessmentScoreRangeLearningStandardAggregate.EdFi.AssessmentScoreRangeLearningStandardQ" table="AssessmentScoreRangeLearningStandard" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -878,7 +878,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.BalanceSheetDimensionAggregate.EdFi.BalanceSheetDimensionQ" table="BalanceSheetDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.BalanceSheetDimensionAggregate.EdFi.BalanceSheetDimensionQ" table="BalanceSheetDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -956,7 +956,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.BellScheduleAggregate.EdFi.BellScheduleQ" table="BellSchedule" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.BellScheduleAggregate.EdFi.BellScheduleQ" table="BellSchedule" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BellScheduleName" column="BellScheduleName" type="string" length="60" />
@@ -1102,7 +1102,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarAggregate.EdFi.CalendarQ" table="Calendar" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarAggregate.EdFi.CalendarQ" table="Calendar" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -1211,7 +1211,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarDateAggregate.EdFi.CalendarDateQ" table="CalendarDate" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CalendarDateAggregate.EdFi.CalendarDateQ" table="CalendarDate" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -1301,7 +1301,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ChartOfAccountAggregate.EdFi.ChartOfAccountQ" table="ChartOfAccount" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ChartOfAccountAggregate.EdFi.ChartOfAccountQ" table="ChartOfAccount" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -1431,7 +1431,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ClassPeriodAggregate.EdFi.ClassPeriodQ" table="ClassPeriod" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ClassPeriodAggregate.EdFi.ClassPeriodQ" table="ClassPeriod" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ClassPeriodName" column="ClassPeriodName" type="string" length="60" />
@@ -1526,7 +1526,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortAggregate.EdFi.CohortQ" table="Cohort" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CohortAggregate.EdFi.CohortQ" table="Cohort" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CohortIdentifier" column="CohortIdentifier" type="string" length="36" />
@@ -1639,7 +1639,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicenseQ" table="CommunityProviderLicense" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CommunityProviderLicenseAggregate.EdFi.CommunityProviderLicenseQ" table="CommunityProviderLicense" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CommunityProviderId" column="CommunityProviderId" type="long" />
@@ -1690,7 +1690,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CompetencyObjectiveAggregate.EdFi.CompetencyObjectiveQ" table="CompetencyObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CompetencyObjectiveAggregate.EdFi.CompetencyObjectiveQ" table="CompetencyObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -1742,7 +1742,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ContactAggregate.EdFi.ContactQ" table="Contact" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ContactAggregate.EdFi.ContactQ" table="Contact" lazy="false" discriminator-value="null">
     <id name="ContactUSI" column="ContactUSI" type="int">
       <generator class="identity" />
     </id>
@@ -2183,7 +2183,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAggregate.EdFi.CourseQ" table="Course" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseAggregate.EdFi.CourseQ" table="Course" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseCode" column="CourseCode" type="string" length="60" />
@@ -2501,7 +2501,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseOfferingAggregate.EdFi.CourseOfferingQ" table="CourseOffering" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseOfferingAggregate.EdFi.CourseOfferingQ" table="CourseOffering" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -2682,7 +2682,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptQ" table="CourseTranscript" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CourseTranscriptAggregate.EdFi.CourseTranscriptQ" table="CourseTranscript" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseAttemptResultDescriptorId" column="CourseAttemptResultDescriptorId" type="int" />
@@ -3112,7 +3112,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" table="Credential" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CredentialAggregate.EdFi.CredentialQ" table="Credential" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CredentialIdentifier" column="CredentialIdentifier" type="string" length="60" />
@@ -3297,7 +3297,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CrisisEventAggregate.EdFi.CrisisEventQ" table="CrisisEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.CrisisEventAggregate.EdFi.CrisisEventQ" table="CrisisEvent" lazy="false" discriminator-value="null">
     <id name="CrisisEventName" column="CrisisEventName" type="string" length="100">
       <generator class="assigned" />
     </id>
@@ -3342,7 +3342,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorAggregate.EdFi.DescriptorQ" table="Descriptor" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorAggregate.EdFi.DescriptorQ" table="Descriptor" lazy="false" abstract="true" discriminator-value="null">
     <id name="DescriptorId" column="DescriptorId" type="int">
       <generator class="identity" />
     </id>
@@ -9587,7 +9587,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorMappingAggregate.EdFi.DescriptorMappingQ" table="DescriptorMapping" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DescriptorMappingAggregate.EdFi.DescriptorMappingQ" table="DescriptorMapping" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="MappedNamespace" column="MappedNamespace" type="string" length="255" />
@@ -9662,7 +9662,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionAggregate.EdFi.DisciplineActionQ" table="DisciplineAction" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineActionAggregate.EdFi.DisciplineActionQ" table="DisciplineAction" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="DisciplineActionIdentifier" column="DisciplineActionIdentifier" type="string" length="36" />
@@ -9834,7 +9834,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentQ" table="DisciplineIncident" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.DisciplineIncidentAggregate.EdFi.DisciplineIncidentQ" table="DisciplineIncident" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="36" />
@@ -10020,7 +10020,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" table="EducationContent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationContentAggregate.EdFi.EducationContentQ" table="EducationContent" lazy="false" discriminator-value="null">
     <id name="ContentIdentifier" column="ContentIdentifier" type="string" length="225">
       <generator class="assigned" />
     </id>
@@ -10336,7 +10336,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationQ" table="EducationOrganization" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationAggregate.EdFi.EducationOrganizationQ" table="EducationOrganization" lazy="false" abstract="true" discriminator-value="null">
     <id name="EducationOrganizationId" column="EducationOrganizationId" type="long">
       <generator class="assigned" />
     </id>
@@ -11465,7 +11465,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationInterventionPrescriptionAssociationAggregate.EdFi.EducationOrganizationInterventionPrescriptionAssociationQ" table="EducationOrganizationInterventionPrescriptionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationInterventionPrescriptionAssociationAggregate.EdFi.EducationOrganizationInterventionPrescriptionAssociationQ" table="EducationOrganizationInterventionPrescriptionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -11508,7 +11508,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationNetworkAssociationAggregate.EdFi.EducationOrganizationNetworkAssociationQ" table="EducationOrganizationNetworkAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationNetworkAssociationAggregate.EdFi.EducationOrganizationNetworkAssociationQ" table="EducationOrganizationNetworkAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationNetworkId" column="EducationOrganizationNetworkId" type="long" />
@@ -11549,7 +11549,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationPeerAssociationAggregate.EdFi.EducationOrganizationPeerAssociationQ" table="EducationOrganizationPeerAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EducationOrganizationPeerAssociationAggregate.EdFi.EducationOrganizationPeerAssociationQ" table="EducationOrganizationPeerAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -11588,7 +11588,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EvaluationRubricDimensionAggregate.EdFi.EvaluationRubricDimensionQ" table="EvaluationRubricDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.EvaluationRubricDimensionAggregate.EdFi.EvaluationRubricDimensionQ" table="EvaluationRubricDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EvaluationRubricRating" column="EvaluationRubricRating" type="int" />
@@ -11642,7 +11642,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FeederSchoolAssociationAggregate.EdFi.FeederSchoolAssociationQ" table="FeederSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FeederSchoolAssociationAggregate.EdFi.FeederSchoolAssociationQ" table="FeederSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -11684,7 +11684,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FunctionDimensionAggregate.EdFi.FunctionDimensionQ" table="FunctionDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FunctionDimensionAggregate.EdFi.FunctionDimensionQ" table="FunctionDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -11762,7 +11762,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FundDimensionAggregate.EdFi.FundDimensionQ" table="FundDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.FundDimensionAggregate.EdFi.FundDimensionQ" table="FundDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -11840,7 +11840,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociationQ" table="GeneralStudentProgramAssociation" lazy="false" abstract="true" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GeneralStudentProgramAssociationAggregate.EdFi.GeneralStudentProgramAssociationQ" table="GeneralStudentProgramAssociation" lazy="false" abstract="true" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -12406,7 +12406,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeAggregate.EdFi.GradeQ" table="Grade" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradeAggregate.EdFi.GradeQ" table="Grade" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -12554,7 +12554,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryAggregate.EdFi.GradebookEntryQ" table="GradebookEntry" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradebookEntryAggregate.EdFi.GradebookEntryQ" table="GradebookEntry" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradebookEntryIdentifier" column="GradebookEntryIdentifier" type="string" length="60" />
@@ -12662,7 +12662,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodAggregate.EdFi.GradingPeriodQ" table="GradingPeriod" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GradingPeriodAggregate.EdFi.GradingPeriodQ" table="GradingPeriod" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -12760,7 +12760,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanAggregate.EdFi.GraduationPlanQ" table="GraduationPlan" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.GraduationPlanAggregate.EdFi.GraduationPlanQ" table="GraduationPlan" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -13136,7 +13136,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionAggregate.EdFi.InterventionQ" table="Intervention" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionAggregate.EdFi.InterventionQ" table="Intervention" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -13555,7 +13555,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionPrescriptionAggregate.EdFi.InterventionPrescriptionQ" table="InterventionPrescription" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionPrescriptionAggregate.EdFi.InterventionPrescriptionQ" table="InterventionPrescription" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -13872,7 +13872,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionStudyAggregate.EdFi.InterventionStudyQ" table="InterventionStudy" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.InterventionStudyAggregate.EdFi.InterventionStudyQ" table="InterventionStudy" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -14218,7 +14218,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardQ" table="LearningStandard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardAggregate.EdFi.LearningStandardQ" table="LearningStandard" lazy="false" discriminator-value="null">
     <id name="LearningStandardId" column="LearningStandardId" type="string" length="60">
       <generator class="assigned" />
     </id>
@@ -14509,7 +14509,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociationQ" table="LearningStandardEquivalenceAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LearningStandardEquivalenceAssociationAggregate.EdFi.LearningStandardEquivalenceAssociationQ" table="LearningStandardEquivalenceAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -14555,7 +14555,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalAccountAggregate.EdFi.LocalAccountQ" table="LocalAccount" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalAccountAggregate.EdFi.LocalAccountQ" table="LocalAccount" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14684,7 +14684,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalActualAggregate.EdFi.LocalActualQ" table="LocalActual" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalActualAggregate.EdFi.LocalActualQ" table="LocalActual" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14729,7 +14729,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalBudgetAggregate.EdFi.LocalBudgetQ" table="LocalBudget" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalBudgetAggregate.EdFi.LocalBudgetQ" table="LocalBudget" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14774,7 +14774,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalContractedStaffAggregate.EdFi.LocalContractedStaffQ" table="LocalContractedStaff" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalContractedStaffAggregate.EdFi.LocalContractedStaffQ" table="LocalContractedStaff" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14890,7 +14890,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEncumbranceAggregate.EdFi.LocalEncumbranceQ" table="LocalEncumbrance" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalEncumbranceAggregate.EdFi.LocalEncumbranceQ" table="LocalEncumbrance" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14935,7 +14935,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalPayrollAggregate.EdFi.LocalPayrollQ" table="LocalPayroll" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocalPayrollAggregate.EdFi.LocalPayrollQ" table="LocalPayroll" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AccountIdentifier" column="AccountIdentifier" type="string" length="50" />
@@ -14984,7 +14984,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocationAggregate.EdFi.LocationQ" table="Location" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.LocationAggregate.EdFi.LocationQ" table="Location" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ClassroomIdentificationCode" column="ClassroomIdentificationCode" type="string" length="60" />
@@ -15030,7 +15030,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ObjectDimensionAggregate.EdFi.ObjectDimensionQ" table="ObjectDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ObjectDimensionAggregate.EdFi.ObjectDimensionQ" table="ObjectDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -15108,7 +15108,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ObjectiveAssessmentAggregate.EdFi.ObjectiveAssessmentQ" table="ObjectiveAssessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ObjectiveAssessmentAggregate.EdFi.ObjectiveAssessmentQ" table="ObjectiveAssessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -15349,7 +15349,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.OpenStaffPositionAggregate.EdFi.OpenStaffPositionQ" table="OpenStaffPosition" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.OpenStaffPositionAggregate.EdFi.OpenStaffPositionQ" table="OpenStaffPosition" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -15476,7 +15476,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.OperationalUnitDimensionAggregate.EdFi.OperationalUnitDimensionQ" table="OperationalUnitDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.OperationalUnitDimensionAggregate.EdFi.OperationalUnitDimensionQ" table="OperationalUnitDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -15554,7 +15554,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.PersonAggregate.EdFi.PersonQ" table="Person" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.PersonAggregate.EdFi.PersonQ" table="Person" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="PersonId" column="PersonId" type="string" length="32" />
@@ -15614,7 +15614,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventAggregate.EdFi.PostSecondaryEventQ" table="PostSecondaryEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.PostSecondaryEventAggregate.EdFi.PostSecondaryEventQ" table="PostSecondaryEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EventDate" column="EventDate" type="date" />
@@ -15685,7 +15685,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAggregate.EdFi.ProgramQ" table="Program" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramAggregate.EdFi.ProgramQ" table="Program" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -15948,7 +15948,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramDimensionAggregate.EdFi.ProgramDimensionQ" table="ProgramDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramDimensionAggregate.EdFi.ProgramDimensionQ" table="ProgramDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -16026,7 +16026,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationAggregate.EdFi.ProgramEvaluationQ" table="ProgramEvaluation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationAggregate.EdFi.ProgramEvaluationQ" table="ProgramEvaluation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramEducationOrganizationId" column="ProgramEducationOrganizationId" type="long" />
@@ -16159,7 +16159,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationElementAggregate.EdFi.ProgramEvaluationElementQ" table="ProgramEvaluationElement" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationElementAggregate.EdFi.ProgramEvaluationElementQ" table="ProgramEvaluationElement" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramEducationOrganizationId" column="ProgramEducationOrganizationId" type="long" />
@@ -16293,7 +16293,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationObjectiveAggregate.EdFi.ProgramEvaluationObjectiveQ" table="ProgramEvaluationObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProgramEvaluationObjectiveAggregate.EdFi.ProgramEvaluationObjectiveQ" table="ProgramEvaluationObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramEducationOrganizationId" column="ProgramEducationOrganizationId" type="long" />
@@ -16417,7 +16417,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProjectDimensionAggregate.EdFi.ProjectDimensionQ" table="ProjectDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ProjectDimensionAggregate.EdFi.ProjectDimensionQ" table="ProjectDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -16495,7 +16495,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ReportCardAggregate.EdFi.ReportCardQ" table="ReportCard" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.ReportCardAggregate.EdFi.ReportCardQ" table="ReportCard" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -16719,7 +16719,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventAggregate.EdFi.RestraintEventQ" table="RestraintEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.RestraintEventAggregate.EdFi.RestraintEventQ" table="RestraintEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="RestraintEventIdentifier" column="RestraintEventIdentifier" type="string" length="36" />
@@ -17047,7 +17047,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionQ" table="Section" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAggregate.EdFi.SectionQ" table="Section" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -17441,7 +17441,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAttendanceTakenEventAggregate.EdFi.SectionAttendanceTakenEventQ" table="SectionAttendanceTakenEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SectionAttendanceTakenEventAggregate.EdFi.SectionAttendanceTakenEventQ" table="SectionAttendanceTakenEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CalendarCode" column="CalendarCode" type="string" length="60" />
@@ -17497,7 +17497,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SessionAggregate.EdFi.SessionQ" table="Session" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SessionAggregate.EdFi.SessionQ" table="Session" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="SchoolId" column="SchoolId" type="long" />
@@ -17652,7 +17652,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SourceDimensionAggregate.EdFi.SourceDimensionQ" table="SourceDimension" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SourceDimensionAggregate.EdFi.SourceDimensionQ" table="SourceDimension" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Code" column="Code" type="string" length="16" />
@@ -17730,7 +17730,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAggregate.EdFi.StaffQ" table="Staff" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAggregate.EdFi.StaffQ" table="Staff" lazy="false" discriminator-value="null">
     <id name="StaffUSI" column="StaffUSI" type="int">
       <generator class="identity" />
     </id>
@@ -18623,7 +18623,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEventQ" table="StaffAbsenceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffAbsenceEventAggregate.EdFi.StaffAbsenceEventQ" table="StaffAbsenceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AbsenceEventCategoryDescriptorId" column="AbsenceEventCategoryDescriptorId" type="int" />
@@ -18665,7 +18665,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffCohortAssociationAggregate.EdFi.StaffCohortAssociationQ" table="StaffCohortAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffCohortAssociationAggregate.EdFi.StaffCohortAssociationQ" table="StaffCohortAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -18709,7 +18709,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffDisciplineIncidentAssociationAggregate.EdFi.StaffDisciplineIncidentAssociationQ" table="StaffDisciplineIncidentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffDisciplineIncidentAssociationAggregate.EdFi.StaffDisciplineIncidentAssociationQ" table="StaffDisciplineIncidentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="36" />
@@ -18788,7 +18788,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociationQ" table="StaffEducationOrganizationAssignmentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationAssignmentAssociationAggregate.EdFi.StaffEducationOrganizationAssignmentAssociationQ" table="StaffEducationOrganizationAssignmentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -18851,7 +18851,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociationQ" table="StaffEducationOrganizationContactAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationContactAssociationAggregate.EdFi.StaffEducationOrganizationContactAssociationQ" table="StaffEducationOrganizationContactAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ContactTitle" column="ContactTitle" type="string" length="75" />
@@ -19025,7 +19025,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" table="StaffEducationOrganizationEmploymentAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffEducationOrganizationEmploymentAssociationAggregate.EdFi.StaffEducationOrganizationEmploymentAssociationQ" table="StaffEducationOrganizationEmploymentAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -19099,7 +19099,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveAggregate.EdFi.StaffLeaveQ" table="StaffLeave" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffLeaveAggregate.EdFi.StaffLeaveQ" table="StaffLeave" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -19142,7 +19142,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffProgramAssociationAggregate.EdFi.StaffProgramAssociationQ" table="StaffProgramAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffProgramAssociationAggregate.EdFi.StaffProgramAssociationQ" table="StaffProgramAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -19188,7 +19188,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociationQ" table="StaffSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSchoolAssociationAggregate.EdFi.StaffSchoolAssociationQ" table="StaffSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ProgramAssignmentDescriptorId" column="ProgramAssignmentDescriptorId" type="int" />
@@ -19317,7 +19317,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociationQ" table="StaffSectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StaffSectionAssociationAggregate.EdFi.StaffSectionAssociationQ" table="StaffSectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -19426,7 +19426,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentQ" table="Student" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAggregate.EdFi.StudentQ" table="Student" lazy="false" discriminator-value="null">
     <id name="StudentUSI" column="StudentUSI" type="int">
       <generator class="identity" />
     </id>
@@ -19847,7 +19847,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordQ" table="StudentAcademicRecord" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAcademicRecordAggregate.EdFi.StudentAcademicRecordQ" table="StudentAcademicRecord" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -20223,7 +20223,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" table="StudentAssessment" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentAggregate.EdFi.StudentAssessmentQ" table="StudentAssessment" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -20676,7 +20676,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociationQ" table="StudentAssessmentEducationOrganizationAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentAssessmentEducationOrganizationAssociationAggregate.EdFi.StudentAssessmentEducationOrganizationAssociationQ" table="StudentAssessmentEducationOrganizationAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AssessmentIdentifier" column="AssessmentIdentifier" type="string" length="60" />
@@ -20729,7 +20729,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCohortAssociationAggregate.EdFi.StudentCohortAssociationQ" table="StudentCohortAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCohortAssociationAggregate.EdFi.StudentCohortAssociationQ" table="StudentCohortAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -20820,7 +20820,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCompetencyObjectiveAggregate.EdFi.StudentCompetencyObjectiveQ" table="StudentCompetencyObjective" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentCompetencyObjectiveAggregate.EdFi.StudentCompetencyObjectiveQ" table="StudentCompetencyObjective" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradingPeriodDescriptorId" column="GradingPeriodDescriptorId" type="int" />
@@ -21008,7 +21008,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentContactAssociationAggregate.EdFi.StudentContactAssociationQ" table="StudentContactAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentContactAssociationAggregate.EdFi.StudentContactAssociationQ" table="StudentContactAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ContactUSI" column="ContactUSI" type="int" />
@@ -21093,7 +21093,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociationQ" table="StudentDisciplineIncidentBehaviorAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentBehaviorAssociationAggregate.EdFi.StudentDisciplineIncidentBehaviorAssociationQ" table="StudentDisciplineIncidentBehaviorAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BehaviorDescriptorId" column="BehaviorDescriptorId" type="int" />
@@ -21189,7 +21189,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociationQ" table="StudentDisciplineIncidentNonOffenderAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentDisciplineIncidentNonOffenderAssociationAggregate.EdFi.StudentDisciplineIncidentNonOffenderAssociationQ" table="StudentDisciplineIncidentNonOffenderAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="IncidentIdentifier" column="IncidentIdentifier" type="string" length="36" />
@@ -21268,7 +21268,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" table="StudentEducationOrganizationAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationAssociationAggregate.EdFi.StudentEducationOrganizationAssociationQ" table="StudentEducationOrganizationAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -22106,7 +22106,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociationQ" table="StudentEducationOrganizationResponsibilityAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentEducationOrganizationResponsibilityAssociationAggregate.EdFi.StudentEducationOrganizationResponsibilityAssociationQ" table="StudentEducationOrganizationResponsibilityAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -22151,7 +22151,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntryQ" table="StudentGradebookEntry" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentGradebookEntryAggregate.EdFi.StudentGradebookEntryQ" table="StudentGradebookEntry" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="GradebookEntryIdentifier" column="GradebookEntryIdentifier" type="string" length="60" />
@@ -22210,7 +22210,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentHealthAggregate.EdFi.StudentHealthQ" table="StudentHealth" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentHealthAggregate.EdFi.StudentHealthQ" table="StudentHealth" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -22431,7 +22431,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationQ" table="StudentInterventionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAssociationAggregate.EdFi.StudentInterventionAssociationQ" table="StudentInterventionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -22531,7 +22531,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAttendanceEventAggregate.EdFi.StudentInterventionAttendanceEventQ" table="StudentInterventionAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentInterventionAttendanceEventAggregate.EdFi.StudentInterventionAttendanceEventQ" table="StudentInterventionAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -22772,7 +22772,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentProgramAttendanceEventAggregate.EdFi.StudentProgramAttendanceEventQ" table="StudentProgramAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentProgramAttendanceEventAggregate.EdFi.StudentProgramAttendanceEventQ" table="StudentProgramAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -22831,7 +22831,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentProgramEvaluationAggregate.EdFi.StudentProgramEvaluationQ" table="StudentProgramEvaluation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentProgramEvaluationAggregate.EdFi.StudentProgramEvaluationQ" table="StudentProgramEvaluation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EvaluationDate" column="EvaluationDate" type="date" />
@@ -23059,7 +23059,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" table="StudentSchoolAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAssociationAggregate.EdFi.StudentSchoolAssociationQ" table="StudentSchoolAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EntryDate" column="EntryDate" type="date" />
@@ -23245,7 +23245,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAttendanceEventAggregate.EdFi.StudentSchoolAttendanceEventQ" table="StudentSchoolAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSchoolAttendanceEventAggregate.EdFi.StudentSchoolAttendanceEventQ" table="StudentSchoolAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -23340,7 +23340,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociationQ" table="StudentSectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAssociationAggregate.EdFi.StudentSectionAssociationQ" table="StudentSectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="BeginDate" column="BeginDate" type="date" />
@@ -23475,7 +23475,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEventQ" table="StudentSectionAttendanceEvent" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSectionAttendanceEventAggregate.EdFi.StudentSectionAttendanceEventQ" table="StudentSectionAttendanceEvent" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="AttendanceEventCategoryDescriptorId" column="AttendanceEventCategoryDescriptorId" type="int" />
@@ -23784,7 +23784,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramEligibilityAssociationAggregate.EdFi.StudentSpecialEducationProgramEligibilityAssociationQ" table="StudentSpecialEducationProgramEligibilityAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentSpecialEducationProgramEligibilityAssociationAggregate.EdFi.StudentSpecialEducationProgramEligibilityAssociationQ" table="StudentSpecialEducationProgramEligibilityAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="ConsentToEvaluationReceivedDate" column="ConsentToEvaluationReceivedDate" type="date" />
@@ -23893,7 +23893,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTransportationAggregate.EdFi.StudentTransportationQ" table="StudentTransportation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.StudentTransportationAggregate.EdFi.StudentTransportationQ" table="StudentTransportation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="StudentUSI" column="StudentUSI" type="int" />
@@ -24046,7 +24046,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyAggregate.EdFi.SurveyQ" table="Survey" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyAggregate.EdFi.SurveyQ" table="Survey" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -24148,7 +24148,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyCourseAssociationAggregate.EdFi.SurveyCourseAssociationQ" table="SurveyCourseAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyCourseAssociationAggregate.EdFi.SurveyCourseAssociationQ" table="SurveyCourseAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="CourseCode" column="CourseCode" type="string" length="60" />
@@ -24191,7 +24191,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyProgramAssociationAggregate.EdFi.SurveyProgramAssociationQ" table="SurveyProgramAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyProgramAssociationAggregate.EdFi.SurveyProgramAssociationQ" table="SurveyProgramAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -24236,7 +24236,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionAggregate.EdFi.SurveyQuestionQ" table="SurveyQuestion" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionAggregate.EdFi.SurveyQuestionQ" table="SurveyQuestion" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -24368,7 +24368,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionResponseAggregate.EdFi.SurveyQuestionResponseQ" table="SurveyQuestionResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyQuestionResponseAggregate.EdFi.SurveyQuestionResponseQ" table="SurveyQuestionResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -24496,7 +24496,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseAggregate.EdFi.SurveyResponseQ" table="SurveyResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseAggregate.EdFi.SurveyResponseQ" table="SurveyResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -24625,7 +24625,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveyResponseEducationOrganizationTargetAssociationQ" table="SurveyResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveyResponseEducationOrganizationTargetAssociationQ" table="SurveyResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -24668,7 +24668,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseStaffTargetAssociationAggregate.EdFi.SurveyResponseStaffTargetAssociationQ" table="SurveyResponseStaffTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveyResponseStaffTargetAssociationAggregate.EdFi.SurveyResponseStaffTargetAssociationQ" table="SurveyResponseStaffTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -24711,7 +24711,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionAggregate.EdFi.SurveySectionQ" table="SurveySection" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionAggregate.EdFi.SurveySectionQ" table="SurveySection" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -24767,7 +24767,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionAssociationAggregate.EdFi.SurveySectionAssociationQ" table="SurveySectionAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionAssociationAggregate.EdFi.SurveySectionAssociationQ" table="SurveySectionAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="LocalCourseCode" column="LocalCourseCode" type="string" length="60" />
@@ -24816,7 +24816,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseAggregate.EdFi.SurveySectionResponseQ" table="SurveySectionResponse" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseAggregate.EdFi.SurveySectionResponseQ" table="SurveySectionResponse" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
@@ -24882,7 +24882,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveySectionResponseEducationOrganizationTargetAssociationQ" table="SurveySectionResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseEducationOrganizationTargetAssociationAggregate.EdFi.SurveySectionResponseEducationOrganizationTargetAssociationQ" table="SurveySectionResponseEducationOrganizationTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="EducationOrganizationId" column="EducationOrganizationId" type="long" />
@@ -24927,7 +24927,7 @@
 
 
   <!-- Class definition -->
-  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseStaffTargetAssociationAggregate.EdFi.SurveySectionResponseStaffTargetAssociationQ" table="SurveySectionResponseStaffTargetAssociation" lazy="false" discriminator-value="NULL">
+  <class name="EdFi.Ods.Entities.NHibernate.QueryModels.SurveySectionResponseStaffTargetAssociationAggregate.EdFi.SurveySectionResponseStaffTargetAssociationQ" table="SurveySectionResponseStaffTargetAssociation" lazy="false" discriminator-value="null">
     <!-- Composite primary key -->
     <composite-id>
       <key-property name="Namespace" column="Namespace" type="string" length="255" />
diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Mustache/EntityOrmMappings.mustache b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Mustache/EntityOrmMappings.mustache
index 104e1d43ca..3102da9b97 100644
--- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Mustache/EntityOrmMappings.mustache
+++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Mustache/EntityOrmMappings.mustache
@@ -40,7 +40,7 @@
         {{/IsAggregateRoot}}
 
   <!-- Class definition -->
-  <class name="{{ClassName}}" table="{{TableName}}" lazy="false"{{#SchemaName}} schema="{{SchemaName}}"{{/SchemaName}}{{#IsAbstract}} abstract="true"{{/IsAbstract}}{{#HasDiscriminator}} discriminator-value="NULL"{{/HasDiscriminator}}>
+  <class name="{{ClassName}}" table="{{TableName}}" lazy="false"{{#SchemaName}} schema="{{SchemaName}}"{{/SchemaName}}{{#IsAbstract}} abstract="true"{{/IsAbstract}}{{#HasDiscriminator}} discriminator-value="null"{{/HasDiscriminator}}>
         {{#Id}}
     <id name="{{PropertyName}}" column="{{ColumnName}}" type="{{NHibernateTypeName}}"{{#MaxLength}} length="{{MaxLength}}"{{/MaxLength}}>
       <generator class="{{GeneratorClass}}" />