diff --git a/js_modules/dagster-ui/packages/ui-components/src/components/Icon.tsx b/js_modules/dagster-ui/packages/ui-components/src/components/Icon.tsx
index 5b5fcdab38fa3..a6493e1b087e7 100644
--- a/js_modules/dagster-ui/packages/ui-components/src/components/Icon.tsx
+++ b/js_modules/dagster-ui/packages/ui-components/src/components/Icon.tsx
@@ -26,9 +26,9 @@ import asset_plot from '../icon-svgs/asset_plot.svg';
 import assignment from '../icon-svgs/assignment.svg';
 import assignment_turned_in from '../icon-svgs/assignment_turned_in.svg';
 import attach_file from '../icon-svgs/attach_file.svg';
-import auto_materialize_policy from '../icon-svgs/auto_materialize_policy.svg';
 import auto_observe from '../icon-svgs/auto_observe.svg';
 import automation from '../icon-svgs/automation.svg';
+import automation_condition from '../icon-svgs/automation_condition.svg';
 import backfill from '../icon-svgs/backfill.svg';
 import badge from '../icon-svgs/badge.svg';
 import bar_chart from '../icon-svgs/bar_chart.svg';
@@ -424,7 +424,7 @@ export const Icons = {
   assignment,
   assignment_turned_in,
   attach_file,
-  auto_materialize_policy,
+  automation_condition,
   auto_observe,
   automation,
   backfill,
diff --git a/js_modules/dagster-ui/packages/ui-components/src/icon-svgs/auto_materialize_policy.svg b/js_modules/dagster-ui/packages/ui-components/src/icon-svgs/automation_condition.svg
similarity index 100%
rename from js_modules/dagster-ui/packages/ui-components/src/icon-svgs/auto_materialize_policy.svg
rename to js_modules/dagster-ui/packages/ui-components/src/icon-svgs/automation_condition.svg
diff --git a/js_modules/dagster-ui/packages/ui-core/src/assets/AssetNodeOverview.tsx b/js_modules/dagster-ui/packages/ui-core/src/assets/AssetNodeOverview.tsx
index 73c8a3a5edcbe..5df0bc40ec4be 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/assets/AssetNodeOverview.tsx
+++ b/js_modules/dagster-ui/packages/ui-core/src/assets/AssetNodeOverview.tsx
@@ -661,7 +661,7 @@ export const AssetNodeOverview = ({
           <LargeCollapsibleSection header="Definition" icon="info">
             {renderDefinitionSection()}
           </LargeCollapsibleSection>
-          <LargeCollapsibleSection header="Automation details" icon="auto_materialize_policy">
+          <LargeCollapsibleSection header="Automation details" icon="automation_condition">
             {renderAutomationDetailsSection()}
           </LargeCollapsibleSection>
           {cachedOrLiveAssetNode.isExecutable ? (
diff --git a/js_modules/dagster-ui/packages/ui-core/src/assets/AutomaterializeDaemonStatusTag.tsx b/js_modules/dagster-ui/packages/ui-core/src/assets/AutomaterializeDaemonStatusTag.tsx
index 18ce69738d7bc..676c34e46ded1 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/assets/AutomaterializeDaemonStatusTag.tsx
+++ b/js_modules/dagster-ui/packages/ui-core/src/assets/AutomaterializeDaemonStatusTag.tsx
@@ -10,14 +10,14 @@ export const AutomaterializeDaemonStatusTag = () => {
     <Tooltip
       content={
         paused
-          ? 'Auto-materializing is paused. New materializations will not be triggered by auto-materialization policies.'
+          ? 'Automation condition evaluation is paused. New materializations will not be triggered by automation conditions.'
           : ''
       }
       canShow={paused}
     >
       <Link to="/health" style={{outline: 'none'}}>
         <Tag icon={paused ? 'toggle_off' : 'toggle_on'} intent={paused ? 'warning' : 'success'}>
-          {paused ? 'Auto-materialize off' : 'Auto-materialize on'}
+          {paused ? 'Automation conditions off' : 'Automation conditions on'}
         </Tag>
       </Link>
     </Tooltip>
diff --git a/js_modules/dagster-ui/packages/ui-core/src/assets/AutomaterializeTagWithEvaluation.tsx b/js_modules/dagster-ui/packages/ui-core/src/assets/AutomaterializeTagWithEvaluation.tsx
index a6ea56218f47b..718d91760e523 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/assets/AutomaterializeTagWithEvaluation.tsx
+++ b/js_modules/dagster-ui/packages/ui-core/src/assets/AutomaterializeTagWithEvaluation.tsx
@@ -23,7 +23,7 @@ export const AutomaterializeTagWithEvaluation = ({assetKeys, evaluationId}: Prop
       content={
         <div style={{width: '340px'}}>
           <Box padding={{vertical: 8, horizontal: 12}} border="bottom" style={{fontWeight: 600}}>
-            Auto-materialized
+            Automation condition
           </Box>
           <Box
             flex={{direction: 'column', gap: 12}}
@@ -65,7 +65,7 @@ export const AutomaterializeTagWithEvaluation = ({assetKeys, evaluationId}: Prop
       }
       interactionKind="hover"
     >
-      <Tag icon="auto_materialize_policy">Auto-materialized</Tag>
+      <Tag icon="automation_condition">Automation condition</Tag>
     </Popover>
   );
 };
diff --git a/js_modules/dagster-ui/packages/ui-core/src/automation/MergedAutomationRoot.tsx b/js_modules/dagster-ui/packages/ui-core/src/automation/MergedAutomationRoot.tsx
index 040bc40ee03a9..78155c7ff3ca3 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/automation/MergedAutomationRoot.tsx
+++ b/js_modules/dagster-ui/packages/ui-core/src/automation/MergedAutomationRoot.tsx
@@ -89,7 +89,7 @@ export const MergedAutomationRoot = () => {
   const automationTypeFilter = useStaticSetFilter({
     name: 'Automation type',
     allValues: ALL_AUTOMATION_VALUES,
-    icon: 'auto_materialize_policy',
+    icon: 'automation_condition',
     getStringValue: (value) => value.label,
     state: automationFilterState,
     renderLabel: ({value}) => <span>{value.label}</span>,
diff --git a/js_modules/dagster-ui/packages/ui-core/src/overview/groupRunsByAutomation.tsx b/js_modules/dagster-ui/packages/ui-core/src/overview/groupRunsByAutomation.tsx
index c232ac21612e1..b07353811b852 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/overview/groupRunsByAutomation.tsx
+++ b/js_modules/dagster-ui/packages/ui-core/src/overview/groupRunsByAutomation.tsx
@@ -39,7 +39,7 @@ const automationName = (automation: RunAutomation | null) => {
   const {type} = automation;
   switch (type) {
     case 'legacy-amp':
-      return 'Auto-materialized';
+      return 'Automation condition';
     case 'schedule':
     case 'sensor':
       return automation.name;
diff --git a/js_modules/dagster-ui/packages/ui-core/src/runs/CreatedByTag.tsx b/js_modules/dagster-ui/packages/ui-core/src/runs/CreatedByTag.tsx
index c04be6fee6509..d3295d3ef242a 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/runs/CreatedByTag.tsx
+++ b/js_modules/dagster-ui/packages/ui-core/src/runs/CreatedByTag.tsx
@@ -29,7 +29,7 @@ export const CreatedByTagCellWrapper = styled(Box)``;
 
 type TagType =
   | {
-      type: 'user' | 'schedule' | 'sensor' | 'auto-materialize' | 'auto-observe';
+      type: 'user' | 'schedule' | 'sensor' | 'automation-condition' | 'auto-observe';
       tag: RunTagsFragment;
     }
   | {type: 'manual'};
@@ -53,11 +53,11 @@ const pluckTagFromList = (tags: RunTagsFragment[]): TagType => {
     const {key} = tag;
     switch (key) {
       case DagsterTag.Automaterialize:
-        return {type: 'auto-materialize', tag};
+        return {type: 'automation-condition', tag};
       case DagsterTag.CreatedBy: {
         // Backwards compatibility
         if (tag.value === 'auto_materialize') {
-          return {type: 'auto-materialize', tag};
+          return {type: 'automation-condition', tag};
         } else {
           continue;
         }
@@ -105,8 +105,8 @@ export const CreatedByTag = ({repoAddress, tags, onAddTag}: Props) => {
           </Tag>
         );
       }
-      case 'auto-materialize':
-        return <Tag icon="auto_materialize_policy">Auto-materialize policy</Tag>;
+      case 'automation-condition':
+        return <Tag icon="automation_condition">Automation condition</Tag>;
       case 'auto-observe':
         return <Tag icon="auto_observe">Auto-observation</Tag>;
     }
diff --git a/js_modules/dagster-ui/packages/ui-core/src/runs/RunTag.tsx b/js_modules/dagster-ui/packages/ui-core/src/runs/RunTag.tsx
index 71ab7cc54f9d2..e1ca9582f8422 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/runs/RunTag.tsx
+++ b/js_modules/dagster-ui/packages/ui-core/src/runs/RunTag.tsx
@@ -5,6 +5,7 @@ import {Link} from 'react-router-dom';
 import {TagAction, TagActionsPopover} from '../ui/TagActions';
 
 export enum DagsterTag {
+  AutomationCondition = 'dagster/from_automation_condition',
   Automaterialize = 'dagster/auto_materialize',
   AutoObserve = 'dagster/auto_observe',
   Namespace = 'dagster/',
diff --git a/js_modules/dagster-ui/packages/ui-core/src/runs/RunsFilterInput.tsx b/js_modules/dagster-ui/packages/ui-core/src/runs/RunsFilterInput.tsx
index 3edaf3032ea42..729fa14616682 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/runs/RunsFilterInput.tsx
+++ b/js_modules/dagster-ui/packages/ui-core/src/runs/RunsFilterInput.tsx
@@ -499,8 +499,8 @@ export const useRunsFilterInput = ({tokens, onChange, enabledFilters}: RunsFilte
       } else if (value.type === DagsterTag.User) {
         return <UserDisplay email={value.value!} isFilter />;
       } else if (value.type === DagsterTag.Automaterialize) {
-        icon = <Icon name="auto_materialize_policy" />;
-        labelValue = 'Auto-materialize policy';
+        icon = <Icon name="automation_condition" />;
+        labelValue = 'Automation condition';
       }
       return (
         <Box flex={{direction: 'row', gap: 4, alignItems: 'center'}}>
@@ -511,7 +511,7 @@ export const useRunsFilterInput = ({tokens, onChange, enabledFilters}: RunsFilte
     },
     getStringValue: (x) => {
       if (x.type === DagsterTag.Automaterialize) {
-        return 'Auto-materialize policy';
+        return 'Automation condition';
       }
       return x.value!;
     },
diff --git a/js_modules/dagster-ui/packages/ui-core/src/workspace/VirtualizedSensorRow.tsx b/js_modules/dagster-ui/packages/ui-core/src/workspace/VirtualizedSensorRow.tsx
index 0c5ed345a34bf..b4e4fb89bdbf2 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/workspace/VirtualizedSensorRow.tsx
+++ b/js_modules/dagster-ui/packages/ui-core/src/workspace/VirtualizedSensorRow.tsx
@@ -284,14 +284,15 @@ export const SENSOR_TYPE_META: Record<
   },
   [SensorType.AUTO_MATERIALIZE]: {
     name: 'Automation condition sensor',
-    icon: 'auto_materialize_policy',
+    icon: 'automation_condition',
     description:
-      'Auto-materialize sensors trigger runs based on auto-materialize policies defined on assets.',
+      'Automation condition sensors trigger runs based on conditions defined on assets or checks.',
   },
   [SensorType.AUTOMATION]: {
     name: 'Automation condition sensor',
-    icon: 'auto_materialize_policy',
-    description: 'Automation sensors trigger runs based on conditions defined on assets.',
+    icon: 'automation_condition',
+    description:
+      'Automation condition sensors trigger runs based on conditions defined on assets or checks.',
   },
   [SensorType.FRESHNESS_POLICY]: {
     name: 'Freshness policy sensor',
diff --git a/python_modules/dagster/dagster/_daemon/asset_daemon.py b/python_modules/dagster/dagster/_daemon/asset_daemon.py
index 0150865d81a61..60a02058c63be 100644
--- a/python_modules/dagster/dagster/_daemon/asset_daemon.py
+++ b/python_modules/dagster/dagster/_daemon/asset_daemon.py
@@ -281,7 +281,7 @@ def __exit__(
             ):
                 try:
                     raise Exception(
-                        "Unable to reach the code server. Auto-materialization will resume once the code server is available."
+                        "Unable to reach the code server. Automation condition evaluation will resume once the code server is available."
                     ) from exception_value
                 except:
                     error_data = DaemonErrorCapture.on_exception(sys.exc_info())
@@ -853,7 +853,7 @@ def _process_auto_materialize_tick_generator(
             error_info = DaemonErrorCapture.on_exception(
                 exc_info=sys.exc_info(),
                 logger=self._logger,
-                log_message="Auto-materialize daemon caught an error",
+                log_message="Automation condition daemon caught an error",
             )
 
         yield error_info
diff --git a/python_modules/dagster/dagster_tests/definitions_tests/declarative_automation_tests/daemon_tests/test_asset_daemon_failure_recovery.py b/python_modules/dagster/dagster_tests/definitions_tests/declarative_automation_tests/daemon_tests/test_asset_daemon_failure_recovery.py
index 4477d8c3f1af5..8006b2725946d 100644
--- a/python_modules/dagster/dagster_tests/definitions_tests/declarative_automation_tests/daemon_tests/test_asset_daemon_failure_recovery.py
+++ b/python_modules/dagster/dagster_tests/definitions_tests/declarative_automation_tests/daemon_tests/test_asset_daemon_failure_recovery.py
@@ -269,8 +269,9 @@ def test_error_loop_after_cursor_written(daemon_not_paused_instance, crash_locat
         assert ticks[0].tick_data.failure_count == 0
 
         assert "WHERE IS THE CODE" in str(ticks[0].tick_data.error)
-        assert "Auto-materialization will resume once the code server is available" in str(
-            ticks[0].tick_data.error
+        assert (
+            "Automation condition evaluation will resume once the code server is available"
+            in str(ticks[0].tick_data.error)
         )
 
         # Run requests are still on the tick since they were stored there before the