diff --git a/inst/templates/ad_adeg.R b/inst/templates/ad_adeg.R
index cbe4b266cb..523491a82b 100644
--- a/inst/templates/ad_adeg.R
+++ b/inst/templates/ad_adeg.R
@@ -227,8 +227,8 @@ adeg <- adeg %>%
 ## Derive baseline flags ----
 adeg <- adeg %>%
   # Calculate BASETYPE
-  derive_var_basetype(
-    basetypes = rlang::exprs(
+  derive_basetype_records(
+    basetypes = exprs(
       "LAST: AFTER LYING DOWN FOR 5 MINUTES" = ATPTN == 815,
       "LAST: AFTER STANDING FOR 1 MINUTE" = ATPTN == 816,
       "LAST: AFTER STANDING FOR 3 MINUTES" = ATPTN == 817,
diff --git a/inst/templates/ad_adlb.R b/inst/templates/ad_adlb.R
index 35e8f08630..22275b11a5 100644
--- a/inst/templates/ad_adlb.R
+++ b/inst/templates/ad_adlb.R
@@ -385,7 +385,7 @@ adlb <- adlb %>%
     order = exprs(AVAL, ADT, AVISITN),
     mode = "first",
     # "AVISITN < 9997" to evaluate only real visits
-    filter = (!is.na(AVAL) & ONTRTFL == "Y" & AVISITN < 9997),
+    filter_add = (!is.na(AVAL) & ONTRTFL == "Y" & AVISITN < 9997),
     set_values_to = exprs(
       AVISITN = 9997,
       AVISIT = "POST-BASELINE MINIMUM",
@@ -398,7 +398,7 @@ adlb <- adlb %>%
     order = exprs(desc(AVAL), ADT, AVISITN),
     mode = "first",
     # "AVISITN < 9997" to evaluate only real visits
-    filter = (!is.na(AVAL) & ONTRTFL == "Y" & AVISITN < 9997),
+    filter_add = (!is.na(AVAL) & ONTRTFL == "Y" & AVISITN < 9997),
     set_values_to = exprs(
       AVISITN = 9998,
       AVISIT = "POST-BASELINE MAXIMUM",
@@ -411,7 +411,7 @@ adlb <- adlb %>%
     order = exprs(ADT, AVISITN),
     mode = "last",
     # "AVISITN < 9997" to evaluate only real visits
-    filter = (ONTRTFL == "Y" & AVISITN < 9997),
+    filter_add = (ONTRTFL == "Y" & AVISITN < 9997),
     set_values_to = exprs(
       AVISITN = 9999,
       AVISIT = "POST-BASELINE LAST",
diff --git a/inst/templates/ad_advs.R b/inst/templates/ad_advs.R
index 6ff2756246..eb0977ce9d 100644
--- a/inst/templates/ad_advs.R
+++ b/inst/templates/ad_advs.R
@@ -181,7 +181,7 @@ advs <- advs %>%
 ## Derive baseline flags ----
 advs <- advs %>%
   # Calculate BASETYPE
-  derive_var_basetype(
+  derive_basetype_records(
     basetypes = exprs(
       "LAST: AFTER LYING DOWN FOR 5 MINUTES" = ATPTN == 815,
       "LAST: AFTER STANDING FOR 1 MINUTE" = ATPTN == 816,
@@ -251,7 +251,7 @@ advs <- advs %>%
     by_vars = exprs(STUDYID, USUBJID, PARAMCD, ATPTN),
     order = exprs(ADT, AVISITN, AVAL),
     mode = "last",
-    filter = (4 < AVISITN & AVISITN <= 13 & ANL01FL == "Y" & is.na(DTYPE)),
+    filter_add = (4 < AVISITN & AVISITN <= 13 & ANL01FL == "Y" & is.na(DTYPE)),
     set_values_to = exprs(
       AVISIT = "End of Treatment",
       AVISITN = 99,