         self.carbsOnBoard = carbsOnBoard
         self.scheduleOverride = scheduleOverride
         self.glucoseTargetRangeSchedule = glucoseTargetRangeSchedule
-        self.glucoseTargetRangeScheduleApplyingOverrideIfActive = glucoseTargetRangeScheduleApplyingOverrideIfActive
+        self.effectiveGlucoseTargetRangeSchedule = effectiveGlucoseTargetRangeSchedule
         self.predictedGlucose = predictedGlucose
         self.predictedGlucoseIncludingPendingInsulin = predictedGlucoseIncludingPendingInsulin
         self.lastReservoirValue = lastReservoirValue

    public let carbsOnBoard: CarbValue?
    public let scheduleOverride: TemporaryScheduleOverride?
    public let glucoseTargetRangeSchedule: GlucoseRangeSchedule?
    public let glucoseTargetRangeScheduleApplyingOverrideIfActive: GlucoseRangeSchedule?
    public let predictedGlucose: [PredictedGlucoseValue]?
    public let predictedGlucoseIncludingPendingInsulin: [PredictedGlucoseValue]?
    public let lastReservoirValue: LastReservoirValue?

                carbsOnBoard: CarbValue? = nil,
                scheduleOverride: TemporaryScheduleOverride? = nil,
                glucoseTargetRangeSchedule: GlucoseRangeSchedule? = nil,
                effectiveGlucoseTargetRangeSchedule: GlucoseRangeSchedule? = nil,
                predictedGlucose: [PredictedGlucoseValue]? = nil,
                predictedGlucoseIncludingPendingInsulin: [PredictedGlucoseValue]? = nil,
                lastReservoirValue: LastReservoirValue? = nil,
