diff --git a/flowsa/flowby.py b/flowsa/flowby.py
index 81b87f7ae..12ef88ffe 100644
--- a/flowsa/flowby.py
+++ b/flowsa/flowby.py
@@ -1783,7 +1783,7 @@ def generateFlowBySector(
     def prepare_fbs(self: 'FlowBySector') -> 'FlowBySector':
         return (
             self
-            .function_socket('clean_fbs_df_fxn')
+            .function_socket('clean_fbs')
             .select_by_fields()
             # TODO: Add a method to convert to proper industry spec.
             .convert_fips_to_geoscale()
diff --git a/flowsa/methods/flowbysectormethods/CAP_HAP_national_2017.yaml b/flowsa/methods/flowbysectormethods/CAP_HAP_national_2017.yaml
index 99ed1e6ee..76dd6e1fb 100644
--- a/flowsa/methods/flowbysectormethods/CAP_HAP_national_2017.yaml
+++ b/flowsa/methods/flowbysectormethods/CAP_HAP_national_2017.yaml
@@ -204,7 +204,7 @@ source_names:
     year: 2017
     primary_action_type: Produced
     activity_to_sector_mapping: SCC
-    clean_fba_df_fxn: !script_function:EPA_NEI clean_NEI_fba
+    clean_fba_before_activity_sets: !script_function:EPA_NEI clean_NEI_fba
     fedefl_mapping: NEI
     activity_sets:
       direct_allocation:
@@ -227,7 +227,7 @@ source_names:
     year: 2017
     primary_action_type: Produced
     activity_to_sector_mapping: SCC
-    clean_fba_df_fxn: !script_function:EPA_NEI clean_NEI_fba
+    clean_fba_before_activity_sets: !script_function:EPA_NEI clean_NEI_fba
     fedefl_mapping: NEI
     activity_sets:
       direct_allocation:
@@ -253,7 +253,7 @@ source_names:
     # temporarily maintain target_sector_level for
     # allocation.equally_allocate_parent_to_child_naics()
     target_sector_level: NAICS_6
-    clean_fbs_df_fxn: !script_function:EPA_NEI drop_GHGs
+    clean_fbs: !script_function:EPA_NEI drop_GHGs
     compartments:
      - air
     reassign_process_to_sectors:
diff --git a/flowsa/methods/flowbysectormethods/CNHW_national_2014.yaml b/flowsa/methods/flowbysectormethods/CNHW_national_2014.yaml
index f0fcceb43..e152b6244 100644
--- a/flowsa/methods/flowbysectormethods/CNHW_national_2014.yaml
+++ b/flowsa/methods/flowbysectormethods/CNHW_national_2014.yaml
@@ -10,5 +10,5 @@ target_sector_level: NAICS_6
 source_names:
   CNHW_CA_2014:
     data_format: FBS
-    clean_fbs_df_fxn: !script_function:CalRecycle_WasteCharacterization apply_tons_per_employee_per_year_to_states
+    clean_fbs: !script_function:CalRecycle_WasteCharacterization apply_tons_per_employee_per_year_to_states
     year: 2014
diff --git a/flowsa/methods/flowbysectormethods/CNHW_state_2014.yaml b/flowsa/methods/flowbysectormethods/CNHW_state_2014.yaml
index 26d4f079e..12fcf65e6 100644
--- a/flowsa/methods/flowbysectormethods/CNHW_state_2014.yaml
+++ b/flowsa/methods/flowbysectormethods/CNHW_state_2014.yaml
@@ -5,7 +5,7 @@ geoscale: state
 source_names:
   CNHW_CA_2014:
     data_format: FBS
-    clean_fbs_df_fxn: !script_function:CalRecycle_WasteCharacterization apply_tons_per_employee_per_year_to_states
+    clean_fbs: !script_function:CalRecycle_WasteCharacterization apply_tons_per_employee_per_year_to_states
     year: 2014