diff --git a/rubin_scheduler/scheduler/basis_functions/feasibility_funcs.py b/rubin_scheduler/scheduler/basis_functions/feasibility_funcs.py
index 1ea2c450..fff65554 100644
--- a/rubin_scheduler/scheduler/basis_functions/feasibility_funcs.py
+++ b/rubin_scheduler/scheduler/basis_functions/feasibility_funcs.py
@@ -294,7 +294,7 @@ def __init__(self, days_delay=2.0, survey_name=None):
         super(ForceDelayBasisFunction, self).__init__()
         self.days_delay = days_delay
         self.survey_name = survey_name
-        self.survey_features["last_obs_self"] = features.Last_observation(survey_name=self.survey_name)
+        self.survey_features["last_obs_self"] = features.LastObservation(survey_name=self.survey_name)
 
     def check_feasibility(self, conditions):
         result = True
diff --git a/rubin_scheduler/scheduler/surveys/dd_surveys.py b/rubin_scheduler/scheduler/surveys/dd_surveys.py
index af8750a2..41c1e800 100644
--- a/rubin_scheduler/scheduler/surveys/dd_surveys.py
+++ b/rubin_scheduler/scheduler/surveys/dd_surveys.py
@@ -109,8 +109,8 @@ def __init__(
         )  # to days
 
         if self.reward_value is None:
-            self.extra_features["Ntot"] = features.N_obs_survey()
-            self.extra_features["N_survey"] = features.N_obs_survey(note=self.survey_name)
+            self.extra_features["Ntot"] = features.NObsSurvey()
+            self.extra_features["N_survey"] = features.NObsSurvey(note=self.survey_name)
 
     @cached_property
     def roi_hpid(self):