diff --git a/client/ayon_core/hooks/pre_filter_farm_environments.py b/client/ayon_core/hooks/pre_filter_farm_environments.py
index 9a52f53950..837116d5eb 100644
--- a/client/ayon_core/hooks/pre_filter_farm_environments.py
+++ b/client/ayon_core/hooks/pre_filter_farm_environments.py
@@ -34,10 +34,10 @@ class FilterFarmEnvironments(PreLaunchHook):
         task_entity = data["task_entity"]
 
         filter_data = {
-            "hosts": self.host_name,
+            "host_names": self.host_name,
             "task_types": task_entity["taskType"],
-            "tasks": task_entity["name"],
-            "folders": data["folder_path"]
+            "task_names": task_entity["name"],
+            "folder_paths": data["folder_path"]
         }
         matching_profile = filter_profiles(
             filter_env_profiles, filter_data, logger=self.log
diff --git a/server/settings/main.py b/server/settings/main.py
index 1329f465e0..b6cfbe36ae 100644
--- a/server/settings/main.py
+++ b/server/settings/main.py
@@ -178,7 +178,7 @@ class EnvironmentReplacementModel(BaseSettingsModel):
 class FilterFarmEnvironmentModel(BaseSettingsModel):
     _layout = "expanded"
 
-    hosts: list[str] = SettingsField(
+    host_names: list[str] = SettingsField(
         default_factory=list,
         title="Host names"
     )
@@ -194,9 +194,9 @@ class FilterFarmEnvironmentModel(BaseSettingsModel):
         title="Task names"
     )
 
-    folders: list[str] = SettingsField(
+    folder_paths: list[str] = SettingsField(
         default_factory=list,
-        title="Folders"
+        title="Folder paths"
     )
 
     skip_environment: list[str] = SettingsField(