diff --git a/heat-stack/model/HeatLoadAnalysis.tsx b/heat-stack/model/HeatLoadAnalysis.tsx
index 0e87f8d6..29662dac 100644
--- a/heat-stack/model/HeatLoadAnalysis.tsx
+++ b/heat-stack/model/HeatLoadAnalysis.tsx
@@ -1,9 +1,9 @@
 export interface HeatLoadAnalysis {
-	rules_engine_version: string
+	rulesEngineVersion: string
 	estimatedBalancePoint: number
 	otherFuelUsage: number
 	averageIndoorTemperature: number
-	differenceBetweenBAndTBP: number
+	differenceBetweenTiAndTbp: number
 	designTemperature: number
 	wholeHomeHeatLossRate: number
 	standardDeviationHeatLossRate: number
diff --git a/heat-stack/model/Homes.tsx b/heat-stack/model/Homes.tsx
index d4c25a27..34d89a42 100644
--- a/heat-stack/model/Homes.tsx
+++ b/heat-stack/model/Homes.tsx
@@ -1,11 +1,11 @@
 export interface Home {
 	livingArea: number
-	fuelType: string // number?
+	fuelType: 'Natural Gas' | 'Oil'
 	designTemperatureOverride: number
 	heatingSystemEfficiency: number
 	thermostatSetPoint: number
 	setbackTemperature: number
-	setBackHoursPerDay: number
+	setbackHoursPerDay: number
 	numberOfOccupants: number
 	estimatedWaterHeatingEfficiency: number
 	standByLosses: number
diff --git a/heat-stack/model/NaturalGasBillRecords.tsx b/heat-stack/model/NaturalGasBillRecords.tsx
index 8f1cfb9a..3b52635b 100644
--- a/heat-stack/model/NaturalGasBillRecords.tsx
+++ b/heat-stack/model/NaturalGasBillRecords.tsx
@@ -1,5 +1,4 @@
 export interface NaturalGasBillRecords {
-	provider: number
 	periodStartDate: Date
 	periodEndDate: Date
 	usageTherms: number
diff --git a/heat-stack/model/OilPropaneBill.tsx b/heat-stack/model/OilPropaneBill.tsx
index dfcb5be3..ddf05fea 100644
--- a/heat-stack/model/OilPropaneBill.tsx
+++ b/heat-stack/model/OilPropaneBill.tsx
@@ -1,4 +1,4 @@
 export interface OilPropaneBill {
-	provider: number
-	precedingDeliverDate: Date
+	provider: string
+	precedingDeliveryDate: Date
 }
diff --git a/heat-stack/model/OilPropaneBillRecords.tsx b/heat-stack/model/OilPropaneBillRecords.tsx
index 17240b6e..9f2cc67a 100644
--- a/heat-stack/model/OilPropaneBillRecords.tsx
+++ b/heat-stack/model/OilPropaneBillRecords.tsx
@@ -1,5 +1,4 @@
 export interface OilPropaneBillRecords {
-	provider: number
 	periodStartDate: Date
 	periodEndDate: Date
 	gallons: number