diff --git a/cylc/flow/cfgspec/workflow.py b/cylc/flow/cfgspec/workflow.py
index 0556519ad68..303f7d6c3d6 100644
--- a/cylc/flow/cfgspec/workflow.py
+++ b/cylc/flow/cfgspec/workflow.py
@@ -793,7 +793,7 @@
                 before the ``script`` item (just below). It can be an
                 external command or script, or inlined scripting.
             ''' + SCRIPT_COMMON.format(
-                'echo "Hello from workflow ${CYLC_WORKFLOW_NAME}!"'))
+                'echo "Hello from workflow ${CYLC_WORKFLOW_ID}!"'))
 
             Conf('script', VDR.V_STRING, desc='''
                 The main custom script invoked from the task job script. It
diff --git a/cylc/flow/config.py b/cylc/flow/config.py
index 5f6ddef8808..965b7395537 100644
--- a/cylc/flow/config.py
+++ b/cylc/flow/config.py
@@ -111,7 +111,7 @@
 RE_CLOCK_OFFSET = re.compile(r'(' + TaskID.NAME_RE + r')(?:\(\s*(.+)\s*\))?')
 RE_EXT_TRIGGER = re.compile(r'(.*)\s*\(\s*(.+)\s*\)\s*')
 RE_SEC_MULTI_SEQ = re.compile(r'(?![^(]+\)),')
-RE_WORKFLOW_NAME_VAR = re.compile(r'\${?CYLC_WORKFLOW_(REG_)?NAME}?')
+RE_WORKFLOW_ID_VAR = re.compile(r'\${?CYLC_WORKFLOW_(REG_)?ID}?')
 RE_TASK_NAME_VAR = re.compile(r'\${?CYLC_TASK_NAME}?')
 RE_VARNAME = re.compile(r'^[a-zA-Z_][\w]*$')
 
@@ -508,7 +508,7 @@ def __init__(
         #     Cylc8
         # remove at:
         #     Cylc9
-        self.cfg['meta']['URL'] = RE_WORKFLOW_NAME_VAR.sub(
+        self.cfg['meta']['URL'] = RE_WORKFLOW_ID_VAR.sub(
             self.workflow, self.cfg['meta']['URL'])
         for name, cfg in self.cfg['runtime'].items():
             cfg['meta']['URL'] = cfg['meta']['URL'] % {
@@ -520,7 +520,7 @@ def __init__(
             #     Cylc8
             # remove at:
             #     Cylc9
-            cfg['meta']['URL'] = RE_WORKFLOW_NAME_VAR.sub(
+            cfg['meta']['URL'] = RE_WORKFLOW_ID_VAR.sub(
                 self.workflow, cfg['meta']['URL'])
             cfg['meta']['URL'] = RE_TASK_NAME_VAR.sub(
                 name, cfg['meta']['URL'])
diff --git a/cylc/flow/scripts/message.py b/cylc/flow/scripts/message.py
index d887c4dd4c1..02b899d67c3 100755
--- a/cylc/flow/scripts/message.py
+++ b/cylc/flow/scripts/message.py
@@ -34,14 +34,14 @@
 
 Examples:
   # Single message as an argument:
-  $ cylc message -- "${CYLC_WORKFLOW_NAME}" "${CYLC_TASK_JOB}" 'Hello world!'
+  $ cylc message -- "${CYLC_WORKFLOW_ID}" "${CYLC_TASK_JOB}" 'Hello world!'
 
   # Multiple messages as arguments:
-  $ cylc message -- "${CYLC_WORKFLOW_NAME}" "${CYLC_TASK_JOB}" \
+  $ cylc message -- "${CYLC_WORKFLOW_ID}" "${CYLC_TASK_JOB}" \
   >     'Hello world!' 'Hi' 'WARNING:Hey!'
 
   # Multiple messages on STDIN:
-  $ cylc message -- "${CYLC_WORKFLOW_NAME}" "${CYLC_TASK_JOB}" - <<'__STDIN__'
+  $ cylc message -- "${CYLC_WORKFLOW_ID}" "${CYLC_TASK_JOB}" - <<'__STDIN__'
   > Hello
   > world!
   >
@@ -50,7 +50,7 @@
   > WARNING:Hey!
   >__STDIN__
 
-Note "${CYLC_WORKFLOW_NAME}" and "${CYLC_TASK_JOB}" are available in task job
+Note "${CYLC_WORKFLOW_ID}" and "${CYLC_TASK_JOB}" are available in task job
 environments - you do not need to write their actual values in task scripting.
 
 Each message can be prefixed with a severity level using the syntax 'SEVERITY:
@@ -115,7 +115,7 @@ def main(parser: COP, options: 'Values', *args: str) -> None:
         #     9.0?
         # (As of Dec 2020 some functional tests still use the classic
         # two arg interface)
-        workflow = os.getenv('CYLC_WORKFLOW_NAME')
+        workflow = os.getenv('CYLC_WORKFLOW_ID')
         task_job = os.getenv('CYLC_TASK_JOB')
         message_strs = list(args)
     else:
diff --git a/cylc/flow/workflow_files.py b/cylc/flow/workflow_files.py
index 181ffd88531..dad073c0c1f 100644
--- a/cylc/flow/workflow_files.py
+++ b/cylc/flow/workflow_files.py
@@ -271,7 +271,7 @@ class ContactFileFields:
     HOST = 'CYLC_WORKFLOW_HOST'
     """The name of the host the scheduler process is running on."""
 
-    NAME = 'CYLC_WORKFLOW_NAME'
+    NAME = 'CYLC_WORKFLOW_ID'
     """The name of the workflow."""
 
     OWNER = 'CYLC_WORKFLOW_OWNER'
@@ -585,7 +585,7 @@ def get_workflow_srv_dir(reg):
     run_d = os.getenv("CYLC_WORKFLOW_RUN_DIR")
     if (
         not run_d
-        or os.getenv("CYLC_WORKFLOW_NAME") != reg
+        or os.getenv("CYLC_WORKFLOW_ID") != reg
         or os.getenv("CYLC_WORKFLOW_OWNER") != get_user()
     ):
         run_d = get_workflow_run_dir(reg)
diff --git a/tests/flakyfunctional/cylc-poll/03-poll-all/flow.cylc b/tests/flakyfunctional/cylc-poll/03-poll-all/flow.cylc
index ca7fcf75f59..025696f0fed 100644
--- a/tests/flakyfunctional/cylc-poll/03-poll-all/flow.cylc
+++ b/tests/flakyfunctional/cylc-poll/03-poll-all/flow.cylc
@@ -36,7 +36,7 @@ trigger, and the workflow to shut down successfully."""
         script = exit 1
     [[poll_check_kill]]
         script = """
-cylc poll "${CYLC_WORKFLOW_NAME}"
+cylc poll "${CYLC_WORKFLOW_ID}"
 
 cylc__job__poll_grep_workflow_log \
     "submit_hold.${CYLC_TASK_CYCLE_POINT} preparing .* => submitted"
@@ -45,7 +45,7 @@ st_file="${CYLC_WORKFLOW_RUN_DIR}/log/job/${CYLC_TASK_CYCLE_POINT}/submit_hold/N
 pkill -g "$(awk -F= '$1 == "CYLC_JOB_ID" {print $2}' "${st_file}")"
 """
     [[poll_now]]
-        script = cylc poll "${CYLC_WORKFLOW_NAME}"
+        script = cylc poll "${CYLC_WORKFLOW_ID}"
 
     [[submit_hold]]
         init-script = sleep 120
diff --git a/tests/flakyfunctional/cylc-show/00-simple/flow.cylc b/tests/flakyfunctional/cylc-show/00-simple/flow.cylc
index 3822b3f2867..177047a1381 100644
--- a/tests/flakyfunctional/cylc-show/00-simple/flow.cylc
+++ b/tests/flakyfunctional/cylc-show/00-simple/flow.cylc
@@ -33,23 +33,23 @@ done
     [[SHOW]]
     [[show-workflow]]
         inherit = SHOW
-        script = cylc show "$CYLC_WORKFLOW_NAME" >>{{ TEST_OUTPUT_PATH }}-workflow
+        script = cylc show "$CYLC_WORKFLOW_ID" >>{{ TEST_OUTPUT_PATH }}-workflow
     [[show-task]]
         inherit = SHOW
-        script = cylc show "$CYLC_WORKFLOW_NAME" foo >>{{ TEST_OUTPUT_PATH }}-task
+        script = cylc show "$CYLC_WORKFLOW_ID" foo >>{{ TEST_OUTPUT_PATH }}-task
     [[show-taskinstance]]
         inherit = SHOW
-        script = cylc show "$CYLC_WORKFLOW_NAME" foo.20141106T0900Z \
+        script = cylc show "$CYLC_WORKFLOW_ID" foo.20141106T0900Z \
             >>{{ TEST_OUTPUT_PATH }}-taskinstance
     [[show-workflow-json]]
         inherit = SHOW
-        script = cylc show --json "$CYLC_WORKFLOW_NAME" \
+        script = cylc show --json "$CYLC_WORKFLOW_ID" \
             >>{{ TEST_OUTPUT_PATH }}-json-workflow
     [[show-task-json]]
         inherit = SHOW
-        script = cylc show --json "$CYLC_WORKFLOW_NAME" foo \
+        script = cylc show --json "$CYLC_WORKFLOW_ID" foo \
             >>{{ TEST_OUTPUT_PATH }}-json-task
     [[show-taskinstance-json]]
         inherit = SHOW
-        script = cylc show --json "$CYLC_WORKFLOW_NAME" foo.20141106T0900Z \
+        script = cylc show --json "$CYLC_WORKFLOW_ID" foo.20141106T0900Z \
             >>{{ TEST_OUTPUT_PATH }}-json-taskinstance
diff --git a/tests/flakyfunctional/cylc-show/04-multi/flow.cylc b/tests/flakyfunctional/cylc-show/04-multi/flow.cylc
index 3a58687562d..4b44ea8aea9 100644
--- a/tests/flakyfunctional/cylc-show/04-multi/flow.cylc
+++ b/tests/flakyfunctional/cylc-show/04-multi/flow.cylc
@@ -16,8 +16,8 @@ if [[ "${CYLC_TASK_CYCLE_POINT}" == '2018' ]]; then
     cylc__job__wait_cylc_message_started
     sleep 5
     # Test alternate syntaxes
-    cylc show "${CYLC_WORKFLOW_NAME}" 't1.*' >"${CYLC_WORKFLOW_RUN_DIR}/show1.txt"
-    cylc show "${CYLC_WORKFLOW_NAME}" '*/t1' >"${CYLC_WORKFLOW_RUN_DIR}/show2.txt"
+    cylc show "${CYLC_WORKFLOW_ID}" 't1.*' >"${CYLC_WORKFLOW_RUN_DIR}/show1.txt"
+    cylc show "${CYLC_WORKFLOW_ID}" '*/t1' >"${CYLC_WORKFLOW_RUN_DIR}/show2.txt"
 else
     while [[ ! -s "${CYLC_WORKFLOW_RUN_DIR}/show2.txt" ]]; do
         sleep 1
diff --git a/tests/flakyfunctional/database/01-broadcast/flow.cylc b/tests/flakyfunctional/database/01-broadcast/flow.cylc
index fa448fbf638..16d34488937 100644
--- a/tests/flakyfunctional/database/01-broadcast/flow.cylc
+++ b/tests/flakyfunctional/database/01-broadcast/flow.cylc
@@ -12,7 +12,7 @@ t1:start => recover-t1
             HELLO=
     [[recover-t1]]
         script="""
-cylc broadcast -p 1 -n t1 -s'[environment]HELLO=Hello' "${CYLC_WORKFLOW_NAME}"
+cylc broadcast -p 1 -n t1 -s'[environment]HELLO=Hello' "${CYLC_WORKFLOW_ID}"
 sleep 1
-cylc trigger "${CYLC_WORKFLOW_NAME}" 1/t1
+cylc trigger "${CYLC_WORKFLOW_ID}" 1/t1
 """
diff --git a/tests/flakyfunctional/events/39-task-event-template-all/bin/checkargs b/tests/flakyfunctional/events/39-task-event-template-all/bin/checkargs
index 7bdfc9483b7..4f4c770b039 100755
--- a/tests/flakyfunctional/events/39-task-event-template-all/bin/checkargs
+++ b/tests/flakyfunctional/events/39-task-event-template-all/bin/checkargs
@@ -8,7 +8,7 @@ from subprocess import Popen, PIPE
 
 args = dict([arg.split('=', 1) for arg in sys.argv[1:]])
 
-workflow = os.environ['CYLC_WORKFLOW_NAME']
+workflow = os.environ['CYLC_WORKFLOW_ID']
 proc = Popen(['cylc', 'cat-log', '-m', 'p', '-f', 'a', workflow, 'foo.1'],
              stdout=PIPE, stdin=open(os.devnull))
 alog = proc.communicate()[0].decode().strip()
diff --git a/tests/flakyfunctional/events/44-timeout/flow.cylc b/tests/flakyfunctional/events/44-timeout/flow.cylc
index fccedd11d1b..c3ff48b77a6 100644
--- a/tests/flakyfunctional/events/44-timeout/flow.cylc
+++ b/tests/flakyfunctional/events/44-timeout/flow.cylc
@@ -10,4 +10,4 @@
         [[[events]]]
             started handlers = sleeper.sh %(id)s
     [[stopper]]
-        script = cylc stop "${CYLC_WORKFLOW_NAME}"
+        script = cylc stop "${CYLC_WORKFLOW_ID}"
diff --git a/tests/flakyfunctional/hold-release/14-hold-kill/flow.cylc b/tests/flakyfunctional/hold-release/14-hold-kill/flow.cylc
index 7e383e375ba..11e652b85dc 100644
--- a/tests/flakyfunctional/hold-release/14-hold-kill/flow.cylc
+++ b/tests/flakyfunctional/hold-release/14-hold-kill/flow.cylc
@@ -7,16 +7,17 @@
     [[killer]]
         script = """
             echo '# killing "sleeper"'
-            cylc kill "${CYLC_WORKFLOW_NAME}" "sleeper.1"
+            cylc kill "${CYLC_WORKFLOW_ID}" "sleeper.1"
             cylc__job__poll_grep_workflow_log -E \
                 'sleeper\.1 waiting\(held\) .* job killed' 
+
             sleep 10  # sleep, should still be held after 10 seconds
-            cylc dump -s -t "${CYLC_WORKFLOW_NAME}" >'cylc-dump.out'
+            cylc dump -s -t "${CYLC_WORKFLOW_ID}" >'cylc-dump.out'
             diff -u 'cylc-dump.out' - <<'__OUT__'
             1, killer, running, unheld, not-queued, not-runahead
             1, sleeper, waiting, held, not-queued, not-runahead
             __OUT__
-            cylc release "${CYLC_WORKFLOW_NAME}" "sleeper.1"
+            cylc release "${CYLC_WORKFLOW_ID}" "sleeper.1"
         """
     [[sleeper]]
         script = """
diff --git a/tests/flakyfunctional/hold-release/15-hold-after/flow.cylc b/tests/flakyfunctional/hold-release/15-hold-after/flow.cylc
index 4d2dd2e74a1..497a2c6f212 100644
--- a/tests/flakyfunctional/hold-release/15-hold-after/flow.cylc
+++ b/tests/flakyfunctional/hold-release/15-hold-after/flow.cylc
@@ -20,12 +20,11 @@
         T00, T12 = foo[-PT12H] => foo => bar
 [runtime]
     [[holdafter]]
-        script = cylc hold --after '20140101T12' "${CYLC_WORKFLOW_NAME}"
+        script = cylc hold --after '20140101T12' "${CYLC_WORKFLOW_ID}"
     [[stopper]]
         script = """
-            cylc__job__poll_grep_workflow_log -E \
-                'bar\.20140101T1200Z .* \(received\)succeeded'
-            cylc stop "${CYLC_WORKFLOW_NAME}"
+            cylc__job__poll_grep_workflow_log '\[bar\.20140101T1200Z\].* (received)succeeded'
+            cylc stop "${CYLC_WORKFLOW_ID}"
         """
         [[[job]]]
             execution time limit = PT1M
diff --git a/tests/flakyfunctional/job-submission/05-activity-log/flow.cylc b/tests/flakyfunctional/job-submission/05-activity-log/flow.cylc
index 4815a882efb..9a59156082f 100644
--- a/tests/flakyfunctional/job-submission/05-activity-log/flow.cylc
+++ b/tests/flakyfunctional/job-submission/05-activity-log/flow.cylc
@@ -19,11 +19,11 @@
             failed handlers = echo
     [[t2]]
         script = """
-            cylc kill "${CYLC_WORKFLOW_NAME}" 't1'
+            cylc kill "${CYLC_WORKFLOW_ID}" 't1'
             sleep 1
-            cylc poll "${CYLC_WORKFLOW_NAME}" 't1'
+            cylc poll "${CYLC_WORKFLOW_ID}" 't1'
             sleep 1
-            cylc shutdown "${CYLC_WORKFLOW_NAME}"
+            cylc shutdown "${CYLC_WORKFLOW_ID}"
         """
         [[[job]]]
             execution time limit = PT1M
diff --git a/tests/flakyfunctional/job-submission/19-chatty/flow.cylc b/tests/flakyfunctional/job-submission/19-chatty/flow.cylc
index 460cb549ab0..58e33b1acd7 100644
--- a/tests/flakyfunctional/job-submission/19-chatty/flow.cylc
+++ b/tests/flakyfunctional/job-submission/19-chatty/flow.cylc
@@ -36,4 +36,4 @@
     [[h0, h1, h2, h3, h4, h5, h6, h7, h8, h9]]
         inherit = HOPEFUL
     [[stopper]]
-        script = cylc stop "${CYLC_WORKFLOW_NAME}"
+        script = cylc stop "${CYLC_WORKFLOW_ID}"
diff --git a/tests/flakyfunctional/restart/14-multicycle/flow.cylc b/tests/flakyfunctional/restart/14-multicycle/flow.cylc
index 77065598e32..0ca1478b863 100644
--- a/tests/flakyfunctional/restart/14-multicycle/flow.cylc
+++ b/tests/flakyfunctional/restart/14-multicycle/flow.cylc
@@ -34,7 +34,7 @@
     [[shutdown]]
         inherit = OUTPUT
         post-script = """
-            cylc shutdown $CYLC_WORKFLOW_NAME
+            cylc shutdown $CYLC_WORKFLOW_ID
             sleep 5
         """
         [[[meta]]]
diff --git a/tests/flakyfunctional/restart/46-stop-clock-time.t b/tests/flakyfunctional/restart/46-stop-clock-time.t
index 91fca200217..591f51ac422 100644
--- a/tests/flakyfunctional/restart/46-stop-clock-time.t
+++ b/tests/flakyfunctional/restart/46-stop-clock-time.t
@@ -52,10 +52,10 @@ init_workflow "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
         script = """
 CLOCKTIME="$(($(date +%s) + 60))"
 echo "${CLOCKTIME}" >"${CYLC_WORKFLOW_RUN_DIR}/clocktime"
-cylc stop -w "$(date --date="@${CLOCKTIME}" +%FT%T%:z)" "${CYLC_WORKFLOW_NAME}"
+cylc stop -w "$(date --date="@${CLOCKTIME}" +%FT%T%:z)" "${CYLC_WORKFLOW_ID}"
 """
     [[t<i=2>]]
-        script = cylc stop "${CYLC_WORKFLOW_NAME}"
+        script = cylc stop "${CYLC_WORKFLOW_ID}"
 __FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${WORKFLOW_NAME}"
diff --git a/tests/functional/directives/01-at/flow.cylc b/tests/functional/directives/01-at/flow.cylc
index ce9fca2a2c9..8ae8c68f073 100644
--- a/tests/functional/directives/01-at/flow.cylc
+++ b/tests/functional/directives/01-at/flow.cylc
@@ -21,4 +21,4 @@
         inherit = ATSETTINGS
         script = "sleep 30"
     [[killer]]
-        script = cylc kill "$CYLC_WORKFLOW_NAME" 'rem2'; sleep 10
+        script = cylc kill "$CYLC_WORKFLOW_ID" 'rem2'; sleep 10
diff --git a/tests/functional/directives/loadleveler/flow.cylc b/tests/functional/directives/loadleveler/flow.cylc
index b569357e4c3..ab6b306b4c4 100644
--- a/tests/functional/directives/loadleveler/flow.cylc
+++ b/tests/functional/directives/loadleveler/flow.cylc
@@ -26,4 +26,4 @@
         inherit = LLSETTINGS
         script = "sleep 30"
     [[killer]]
-        script = cylc kill "$CYLC_WORKFLOW_NAME" 'rem2'; sleep 10
+        script = cylc kill "$CYLC_WORKFLOW_ID" 'rem2'; sleep 10
diff --git a/tests/functional/directives/pbs/flow.cylc b/tests/functional/directives/pbs/flow.cylc
index a41756290a7..1b81bed8e90 100644
--- a/tests/functional/directives/pbs/flow.cylc
+++ b/tests/functional/directives/pbs/flow.cylc
@@ -24,4 +24,4 @@
         inherit = PBS_SETTINGS
         script = "sleep 30"
     [[killer]]
-        script = cylc kill "$CYLC_WORKFLOW_NAME" 'rem2'; sleep 10
+        script = cylc kill "$CYLC_WORKFLOW_ID" 'rem2'; sleep 10
diff --git a/tests/functional/directives/slurm/flow.cylc b/tests/functional/directives/slurm/flow.cylc
index fb4a1bb0519..aef43e0e5af 100644
--- a/tests/functional/directives/slurm/flow.cylc
+++ b/tests/functional/directives/slurm/flow.cylc
@@ -23,4 +23,4 @@
         inherit = SLURM_SETTINGS
         script = "sleep 30"
     [[killer]]
-        script = cylc kill "$CYLC_WORKFLOW_NAME" 'rem2'; sleep 10
+        script = cylc kill "$CYLC_WORKFLOW_ID" 'rem2'; sleep 10
diff --git a/tests/functional/events/20-workflow-event-handlers/flow.cylc b/tests/functional/events/20-workflow-event-handlers/flow.cylc
index a373cc8e757..ee03142de7f 100644
--- a/tests/functional/events/20-workflow-event-handlers/flow.cylc
+++ b/tests/functional/events/20-workflow-event-handlers/flow.cylc
@@ -1,7 +1,7 @@
 #!jinja2
 [meta]
     title=Workflow Event Mail
-    URL = http://myworkflows.com/${CYLC_WORKFLOW_NAME}.html
+    URL = http://myworkflows.com/${CYLC_WORKFLOW_ID}.html
     workflow-priority = HIGH
 
 [scheduler]
diff --git a/tests/functional/events/23-workflow-stalled-handler/flow.cylc b/tests/functional/events/23-workflow-stalled-handler/flow.cylc
index a3eb23a9632..beafeab78b3 100644
--- a/tests/functional/events/23-workflow-stalled-handler/flow.cylc
+++ b/tests/functional/events/23-workflow-stalled-handler/flow.cylc
@@ -14,4 +14,4 @@
     [[bar]]
         script = false
     [[baz]]
-        script = cylc remove $CYLC_WORKFLOW_NAME bar.1
+        script = cylc remove $CYLC_WORKFLOW_ID bar.1
diff --git a/tests/functional/events/42-late-then-restart/flow.cylc b/tests/functional/events/42-late-then-restart/flow.cylc
index 7a2977e5f0e..c06fbb4cd78 100644
--- a/tests/functional/events/42-late-then-restart/flow.cylc
+++ b/tests/functional/events/42-late-then-restart/flow.cylc
@@ -6,7 +6,7 @@
         R1 = t1 => t2
 [runtime]
     [[t1]]
-        script = cylc stop --now "${CYLC_WORKFLOW_NAME}"; sleep 61
+        script = cylc stop --now "${CYLC_WORKFLOW_ID}"; sleep 61
     [[t2]]
         script = true
         [[[events]]]
diff --git a/tests/functional/events/45-task-event-handler-multi-warning.t b/tests/functional/events/45-task-event-handler-multi-warning.t
index c69fcd5ff8a..7636a348498 100755
--- a/tests/functional/events/45-task-event-handler-multi-warning.t
+++ b/tests/functional/events/45-task-event-handler-multi-warning.t
@@ -30,10 +30,10 @@ init_workflow "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [runtime]
    [[foo]]
       script = """
-cylc message -s WARNING -- ${CYLC_WORKFLOW_NAME} ${CYLC_TASK_JOB} "cat"
-cylc message -s WARNING -- ${CYLC_WORKFLOW_NAME} ${CYLC_TASK_JOB} "dog"
-cylc message -s WARNING -- ${CYLC_WORKFLOW_NAME} ${CYLC_TASK_JOB} "fish"
-cylc message -s WARNING -- ${CYLC_WORKFLOW_NAME} ${CYLC_TASK_JOB} "guinea pig"
+cylc message -s WARNING -- ${CYLC_WORKFLOW_ID} ${CYLC_TASK_JOB} "cat"
+cylc message -s WARNING -- ${CYLC_WORKFLOW_ID} ${CYLC_TASK_JOB} "dog"
+cylc message -s WARNING -- ${CYLC_WORKFLOW_ID} ${CYLC_TASK_JOB} "fish"
+cylc message -s WARNING -- ${CYLC_WORKFLOW_ID} ${CYLC_TASK_JOB} "guinea pig"
 """
       [[[events]]]
         handler events = warning
diff --git a/tests/functional/events/46-task-output-as-event.t b/tests/functional/events/46-task-output-as-event.t
index 02dc2f3738d..1c39e93ff60 100755
--- a/tests/functional/events/46-task-output-as-event.t
+++ b/tests/functional/events/46-task-output-as-event.t
@@ -28,7 +28,7 @@ init_workflow "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [runtime]
     [[t1]]
         script="""
-cylc message -- ${CYLC_WORKFLOW_NAME} ${CYLC_TASK_JOB} \
+cylc message -- ${CYLC_WORKFLOW_ID} ${CYLC_TASK_JOB} \
     'rose' 'lily' 'iris' 'WARNING:poison ivy'
 """
         [[[outputs]]]
diff --git a/tests/functional/events/48-workflow-aborted/flow.cylc b/tests/functional/events/48-workflow-aborted/flow.cylc
index b302ee4e492..c2f44eb6d96 100644
--- a/tests/functional/events/48-workflow-aborted/flow.cylc
+++ b/tests/functional/events/48-workflow-aborted/flow.cylc
@@ -16,7 +16,7 @@
     [[modify]]
         script = """
             # Pause the workflow, so it does not shutdown
-            cylc pause "${CYLC_WORKFLOW_NAME}"
+            cylc pause "${CYLC_WORKFLOW_ID}"
             # Extra content in workflow contact file should cause health check to fail
             echo 'TIME=MONEY' >>"${CYLC_WORKFLOW_RUN_DIR}/.service/contact"
         """
diff --git a/tests/functional/events/timeout/flow.cylc b/tests/functional/events/timeout/flow.cylc
index 5d71e0f95de..dfac07d0be9 100644
--- a/tests/functional/events/timeout/flow.cylc
+++ b/tests/functional/events/timeout/flow.cylc
@@ -12,4 +12,4 @@
 
 [runtime]
     [[foo]]
-        script = "cylc pause $CYLC_WORKFLOW_NAME"
+        script = "cylc pause $CYLC_WORKFLOW_ID"
diff --git a/tests/functional/ext-trigger/00-satellite/flow.cylc b/tests/functional/ext-trigger/00-satellite/flow.cylc
index e560c77805d..e23e7fef8d4 100644
--- a/tests/functional/ext-trigger/00-satellite/flow.cylc
+++ b/tests/functional/ext-trigger/00-satellite/flow.cylc
@@ -64,7 +64,7 @@
                 ((COUNT += 1))
                 # (required to distinguish fast-arriving messages).
                 # Trigger downstream processing in the workflow.
-                cylc ext-trigger $CYLC_WORKFLOW_NAME \
+                cylc ext-trigger $CYLC_WORKFLOW_ID \
                    "new dataset ready for processing" $DATA_ID
             done
         """
diff --git a/tests/functional/ext-trigger/01-no-nudge/flow.cylc b/tests/functional/ext-trigger/01-no-nudge/flow.cylc
index f19bc542c05..6065ea5e8e0 100644
--- a/tests/functional/ext-trigger/01-no-nudge/flow.cylc
+++ b/tests/functional/ext-trigger/01-no-nudge/flow.cylc
@@ -32,12 +32,12 @@
         script = """
             cylc kill "$CYLC_WORKFLOW_NAME" 'bar.1'
             cylc__job__poll_grep_workflow_log -E 'bar\.1 .* \(internal\)failed'
-            cylc release "$CYLC_WORKFLOW_NAME" 'bar.1'
+            cylc release "$CYLC_WORKFLOW_ID" 'bar.1'
         """
     [[bar]]
         script = """
             sleep 5
-            cylc ext-trigger $CYLC_WORKFLOW_NAME "drugs and money" 12345
+            cylc ext-trigger $CYLC_WORKFLOW_ID "drugs and money" 12345
             sleep 60
         """
     [[handler]]
diff --git a/tests/functional/ext-trigger/02-cycle-point/flow.cylc b/tests/functional/ext-trigger/02-cycle-point/flow.cylc
index 663286841c4..a2c92ae6b5d 100644
--- a/tests/functional/ext-trigger/02-cycle-point/flow.cylc
+++ b/tests/functional/ext-trigger/02-cycle-point/flow.cylc
@@ -21,5 +21,5 @@ cycling workflow.  The workflow will time out and abort if the ext trigger fails
         script = echo $CYLC_EXT_TRIGGER_ID
     [[trig]]
         # Task to do the "external" triggering.
-        script = cylc ext-trigger $CYLC_WORKFLOW_NAME \
+        script = cylc ext-trigger $CYLC_WORKFLOW_ID \
             "cheese on toast for $CYLC_TASK_CYCLE_POINT" "blarghh!"
diff --git a/tests/functional/graph-equivalence/test1/flow.cylc b/tests/functional/graph-equivalence/test1/flow.cylc
index 4b2d2e04287..ca92456503d 100644
--- a/tests/functional/graph-equivalence/test1/flow.cylc
+++ b/tests/functional/graph-equivalence/test1/flow.cylc
@@ -5,16 +5,16 @@
 [runtime]
     [[a]]
         script = """
-cylc show "${CYLC_WORKFLOW_NAME}" 'a.1' \
+cylc show "${CYLC_WORKFLOW_ID}" 'a.1' \
     | sed -n "/prerequisites/,/outputs/p" > {{TEST_OUTPUT_PATH}}/a-prereqs
 """
     [[b]]
         script = """
-cylc show "${CYLC_WORKFLOW_NAME}" 'b.1' \
+cylc show "${CYLC_WORKFLOW_ID}" 'b.1' \
     | sed -n "/prerequisites/,/outputs/p" > {{TEST_OUTPUT_PATH}}/b-prereqs
 """
     [[c]]
         script = """
-cylc show "${CYLC_WORKFLOW_NAME}" 'c.1' \
+cylc show "${CYLC_WORKFLOW_ID}" 'c.1' \
     | sed -n "/prerequisites/,/outputs/p" > {{TEST_OUTPUT_PATH}}/c-prereqs
 """
diff --git a/tests/functional/graph-equivalence/test2/flow.cylc b/tests/functional/graph-equivalence/test2/flow.cylc
index b60268a3f03..7fe91822fe2 100644
--- a/tests/functional/graph-equivalence/test2/flow.cylc
+++ b/tests/functional/graph-equivalence/test2/flow.cylc
@@ -6,17 +6,17 @@
 [runtime]
     [[a]]
         script = """
-cylc show "${CYLC_WORKFLOW_NAME}" 'a.1' \
+cylc show "${CYLC_WORKFLOW_ID}" 'a.1' \
     | sed -n "/prerequisites/,/outputs/p" > {{TEST_OUTPUT_PATH}}/a-prereqs
 """
     [[b]]
         script = """
-cylc show "${CYLC_WORKFLOW_NAME}" 'b.1' \
+cylc show "${CYLC_WORKFLOW_ID}" 'b.1' \
     | sed -n "/prerequisites/,/outputs/p" > {{TEST_OUTPUT_PATH}}/b-prereqs
 """
     [[c]]
         script = """
-cylc show "${CYLC_WORKFLOW_NAME}" 'c.1' \
+cylc show "${CYLC_WORKFLOW_ID}" 'c.1' \
     | sed -n "/prerequisites/,/outputs/p" > {{TEST_OUTPUT_PATH}}/c-prereqs
 """
 
diff --git a/tests/functional/graph-equivalence/test3/flow.cylc b/tests/functional/graph-equivalence/test3/flow.cylc
index cb157212a78..a4e122142dc 100644
--- a/tests/functional/graph-equivalence/test3/flow.cylc
+++ b/tests/functional/graph-equivalence/test3/flow.cylc
@@ -6,16 +6,16 @@
 [runtime]
     [[a]]
         script = """
-cylc show "${CYLC_WORKFLOW_NAME}" 'a.1' \
+cylc show "${CYLC_WORKFLOW_ID}" 'a.1' \
     | sed -n "/prerequisites/,/outputs/p" > {{TEST_OUTPUT_PATH}}/a-prereqs
 """
     [[b]]
         script = """
-cylc show "${CYLC_WORKFLOW_NAME}" 'b.1' \
+cylc show "${CYLC_WORKFLOW_ID}" 'b.1' \
     | sed -n "/prerequisites/,/outputs/p" > {{TEST_OUTPUT_PATH}}/b-prereqs
 """
     [[c]]
         script = """
-cylc show "${CYLC_WORKFLOW_NAME}" 'c.1' \
+cylc show "${CYLC_WORKFLOW_ID}" 'c.1' \
     | sed -n "/prerequisites/,/outputs/p" > {{TEST_OUTPUT_PATH}}/c-prereqs
 """
diff --git a/tests/functional/hold-release/00-workflow/flow.cylc b/tests/functional/hold-release/00-workflow/flow.cylc
index fd9160752a6..c9829135240 100644
--- a/tests/functional/hold-release/00-workflow/flow.cylc
+++ b/tests/functional/hold-release/00-workflow/flow.cylc
@@ -22,9 +22,9 @@
     [[holdrelease]]
         script = """
             cylc__job__wait_cylc_message_started
-            cylc hold --after=1900 "${CYLC_WORKFLOW_NAME}"
+            cylc hold --after=1900 "${CYLC_WORKFLOW_ID}"
             cylc__job__poll_grep_workflow_log -F 'INFO - Command succeeded: set_hold_point'
-            cylc release --all "${CYLC_WORKFLOW_NAME}"
+            cylc release --all "${CYLC_WORKFLOW_ID}"
         """
     [[foo,bar]]
         script = true
diff --git a/tests/functional/hold-release/01-beyond-stop/flow.cylc b/tests/functional/hold-release/01-beyond-stop/flow.cylc
index edef24644be..abc02435093 100644
--- a/tests/functional/hold-release/01-beyond-stop/flow.cylc
+++ b/tests/functional/hold-release/01-beyond-stop/flow.cylc
@@ -23,8 +23,8 @@
     [[holdrelease]]
         # When this task runs foo will be held beyond the stop point.
         script = """
-            cylc hold --after=1900 $CYLC_WORKFLOW_NAME
-            cylc release --all $CYLC_WORKFLOW_NAME
+            cylc hold --after=1900 $CYLC_WORKFLOW_ID
+            cylc release --all $CYLC_WORKFLOW_ID
         """
     [[foo]]
         script = true
diff --git a/tests/functional/hold-release/05-release.t b/tests/functional/hold-release/05-release.t
index 15cae14442b..bb9303120e9 100755
--- a/tests/functional/hold-release/05-release.t
+++ b/tests/functional/hold-release/05-release.t
@@ -33,18 +33,18 @@ init_workflow "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
     [[holdrelease]]
         script = """
             cylc__job__wait_cylc_message_started
-            cylc hold --after=0 ${CYLC_WORKFLOW_NAME}
+            cylc hold --after=0 ${CYLC_WORKFLOW_ID}
             cylc__job__poll_grep_workflow_log 'Command succeeded: set_hold_point'
-            cylc release ${CYLC_WORKFLOW_NAME} '*FF.1'  # inexact fam
-            cylc release ${CYLC_WORKFLOW_NAME} 'TOAST.1'  # exact fam
-            cylc release ${CYLC_WORKFLOW_NAME} 'cat*.1'  # inexact tasks
-            cylc release ${CYLC_WORKFLOW_NAME} 'dog1.1'  # exact tasks
-            cylc release ${CYLC_WORKFLOW_NAME} 'stop.1'  # exact tasks
+            cylc release ${CYLC_WORKFLOW_ID} '*FF.1'  # inexact fam
+            cylc release ${CYLC_WORKFLOW_ID} 'TOAST.1'  # exact fam
+            cylc release ${CYLC_WORKFLOW_ID} 'cat*.1'  # inexact tasks
+            cylc release ${CYLC_WORKFLOW_ID} 'dog1.1'  # exact tasks
+            cylc release ${CYLC_WORKFLOW_ID} 'stop.1'  # exact tasks
 
             # TODO: finished tasks are not removed if held: should this be the case?
             # (is this related to killed tasks being held to prevent retries?)
-            cylc release ${CYLC_WORKFLOW_NAME} 'spawner.1'
-            cylc release ${CYLC_WORKFLOW_NAME} 'holdrelease.1'
+            cylc release ${CYLC_WORKFLOW_ID} 'spawner.1'
+            cylc release ${CYLC_WORKFLOW_ID} 'holdrelease.1'
         """
     [[STUFF]]
     [[TOAST]]
@@ -65,7 +65,7 @@ init_workflow "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
         script = """
             cylc__job__poll_grep_workflow_log -E \
                'dog1\.1 succeeded .* task proxy removed \(finished\)'
-            cylc stop "${CYLC_WORKFLOW_NAME}"
+            cylc stop "${CYLC_WORKFLOW_ID}"
         """
 __FLOW_CONFIG__
 
diff --git a/tests/functional/hold-release/08-hold.t b/tests/functional/hold-release/08-hold.t
index 01196cd8c85..9052640019d 100755
--- a/tests/functional/hold-release/08-hold.t
+++ b/tests/functional/hold-release/08-hold.t
@@ -41,10 +41,10 @@ cylc__job__poll_grep_workflow_log -E 'cat1\.1 .* spawned'
 cylc__job__poll_grep_workflow_log -E 'cat2\.1 .* spawned'
 cylc__job__poll_grep_workflow_log -E 'dog1\.1 .* spawned'
 cylc__job__poll_grep_workflow_log -E 'dog2\.1 .* spawned'
-cylc hold ${CYLC_WORKFLOW_NAME} '*FF.1'  # inexact fam
-cylc hold ${CYLC_WORKFLOW_NAME} 'TOAST.1'  # exact fam
-cylc hold ${CYLC_WORKFLOW_NAME} 'cat*.1'  # inexact tasks
-cylc hold ${CYLC_WORKFLOW_NAME} 'dog1.1'  # exact tasks
+cylc hold ${CYLC_WORKFLOW_ID} '*FF.1'  # inexact fam
+cylc hold ${CYLC_WORKFLOW_ID} 'TOAST.1'  # exact fam
+cylc hold ${CYLC_WORKFLOW_ID} 'cat*.1'  # inexact tasks
+cylc hold ${CYLC_WORKFLOW_ID} 'dog1.1'  # exact tasks
 """
     [[STUFF]]
     [[TOAST]]
@@ -64,7 +64,7 @@ cylc hold ${CYLC_WORKFLOW_NAME} 'dog1.1'  # exact tasks
         inherit = STOP
         script = """
         sleep 5
-        cylc stop "${CYLC_WORKFLOW_NAME}"
+        cylc stop "${CYLC_WORKFLOW_ID}"
         """
 __FLOW_CONFIG__
 
diff --git a/tests/functional/hold-release/11-retrying/flow.cylc b/tests/functional/hold-release/11-retrying/flow.cylc
index 9e60eb3b106..769105382a8 100644
--- a/tests/functional/hold-release/11-retrying/flow.cylc
+++ b/tests/functional/hold-release/11-retrying/flow.cylc
@@ -26,12 +26,12 @@ t-retry-able => t-analyse
             cylc__job__poll_grep_workflow_log -E \
                 't-retry-able\.1 waiting job:01.* retrying in PT15S'
 
-            cylc hold "${CYLC_WORKFLOW_NAME}" 't-retry-able.1'
+            cylc hold "${CYLC_WORKFLOW_ID}" 't-retry-able.1'
 
             cylc__job__poll_grep_workflow_log -E \
                 't-retry-able\.1 waiting job:01.* => waiting\(held\)'
  
-            cylc release "${CYLC_WORKFLOW_NAME}" 't-retry-able.1'
+            cylc release "${CYLC_WORKFLOW_ID}" 't-retry-able.1'
 
             cylc__job__poll_grep_workflow_log -E \
                 't-retry-able\.1 waiting\(held\) job:01.* => waiting'
diff --git a/tests/functional/hold-release/17-hold-after-point/flow.cylc b/tests/functional/hold-release/17-hold-after-point/flow.cylc
index 5c4f8082385..e6464b2115d 100644
--- a/tests/functional/hold-release/17-hold-after-point/flow.cylc
+++ b/tests/functional/hold-release/17-hold-after-point/flow.cylc
@@ -18,7 +18,7 @@
     [[stopper]]
         script = """
             cylc__job__poll_grep_workflow_log -F 'holding (beyond workflow hold point: 20100102T0000Z)'
-            cylc stop "${CYLC_WORKFLOW_NAME}"
+            cylc stop "${CYLC_WORKFLOW_ID}"
         """
     [[foo]]
         script = true
diff --git a/tests/functional/hold-release/18-hold-cycle-globs/flow.cylc b/tests/functional/hold-release/18-hold-cycle-globs/flow.cylc
index 923fb81e89a..971891ca4ef 100644
--- a/tests/functional/hold-release/18-hold-cycle-globs/flow.cylc
+++ b/tests/functional/hold-release/18-hold-cycle-globs/flow.cylc
@@ -26,11 +26,11 @@
             cylc__job__poll_grep_workflow_log -E 't1\.19900101T0000Z .* spawned'
             cylc__job__poll_grep_workflow_log -E 't2\.20100101T0000Z .* spawned'
             cylc__job__poll_grep_workflow_log -E 't3\.20300101T0000Z .* spawned'
-            cylc hold "${CYLC_WORKFLOW_NAME}" '*/t*'
+            cylc hold "${CYLC_WORKFLOW_ID}" '*/t*'
         """
     [[releaser]]
-        script = cylc release "${CYLC_WORKFLOW_NAME}" '20*/t*'
+        script = cylc release "${CYLC_WORKFLOW_ID}" '20*/t*'
     [[stopper]]
-        script = cylc stop "${CYLC_WORKFLOW_NAME}"
+        script = cylc stop "${CYLC_WORKFLOW_ID}"
     [[spawner, t1, t2, t3]]
         script = true
diff --git a/tests/functional/hold-release/19-no-reset-prereq-on-waiting/flow.cylc b/tests/functional/hold-release/19-no-reset-prereq-on-waiting/flow.cylc
index 7d7a17d1ee4..518a5fb947c 100644
--- a/tests/functional/hold-release/19-no-reset-prereq-on-waiting/flow.cylc
+++ b/tests/functional/hold-release/19-no-reset-prereq-on-waiting/flow.cylc
@@ -17,10 +17,10 @@ holder => releaser
     [[holder]]
         script = """
 cylc__job__poll_grep_workflow_log -E 't1\.1 .* spawned'
-cylc hold "${CYLC_WORKFLOW_NAME}" 't1.1'
+cylc hold "${CYLC_WORKFLOW_ID}" 't1.1'
 """
     [[releaser]]
         script = """
 cylc__job__wait_cylc_message_started
-cylc release "${CYLC_WORKFLOW_NAME}" 't1.1'
+cylc release "${CYLC_WORKFLOW_ID}" 't1.1'
 """
diff --git a/tests/functional/job-kill/00-local/flow.cylc b/tests/functional/job-kill/00-local/flow.cylc
index a37e5da2201..9d962bacd98 100644
--- a/tests/functional/job-kill/00-local/flow.cylc
+++ b/tests/functional/job-kill/00-local/flow.cylc
@@ -16,11 +16,11 @@
     [[stop1]]
         script="""
 # Kill t1.1 and t2.1 explicitly.
-cylc kill $CYLC_WORKFLOW_NAME t1.1 t2.1 || true"""
+cylc kill $CYLC_WORKFLOW_ID t1.1 t2.1 || true"""
     [[stop2]]
         script="""
 # Kill t3.1, t4.1, and myself! implicitly (kill all active tasks).
-cylc kill $CYLC_WORKFLOW_NAME || true
+cylc kill $CYLC_WORKFLOW_ID || true
 sleep 30"""
     [[shutdown]]
-        script = "cylc stop $CYLC_WORKFLOW_NAME"
+        script = "cylc stop $CYLC_WORKFLOW_ID"
diff --git a/tests/functional/job-kill/01-remote/flow.cylc b/tests/functional/job-kill/01-remote/flow.cylc
index a6971ceab3f..39bb35180ee 100644
--- a/tests/functional/job-kill/01-remote/flow.cylc
+++ b/tests/functional/job-kill/01-remote/flow.cylc
@@ -21,6 +21,6 @@
         inherit=T
     [[stop]]
         script="""
-            cylc kill "$CYLC_WORKFLOW_NAME" 't1.1' 't2.1' || true
-            cylc stop $CYLC_WORKFLOW_NAME
+            cylc kill "$CYLC_WORKFLOW_ID" 't1.1' 't2.1' || true
+            cylc stop $CYLC_WORKFLOW_ID
         """
diff --git a/tests/functional/job-kill/02-loadleveler/flow.cylc b/tests/functional/job-kill/02-loadleveler/flow.cylc
index 3b4d90d930b..982b9e29965 100644
--- a/tests/functional/job-kill/02-loadleveler/flow.cylc
+++ b/tests/functional/job-kill/02-loadleveler/flow.cylc
@@ -22,6 +22,6 @@
             wall_clock_limit=180,120
     [[stop]]
         script="""
-            cylc kill "$CYLC_WORKFLOW_NAME" 't1'
-            cylc stop "$CYLC_WORKFLOW_NAME"
+            cylc kill "$CYLC_WORKFLOW_ID" 't1'
+            cylc stop "$CYLC_WORKFLOW_ID"
         """
diff --git a/tests/functional/job-kill/03-slurm/flow.cylc b/tests/functional/job-kill/03-slurm/flow.cylc
index 56cbe41da89..3bfbd64a5fb 100644
--- a/tests/functional/job-kill/03-slurm/flow.cylc
+++ b/tests/functional/job-kill/03-slurm/flow.cylc
@@ -16,6 +16,6 @@
             --time=03:00
     [[stop]]
         script="""
-            cylc kill "$CYLC_WORKFLOW_NAME" 't1'
-            cylc stop "$CYLC_WORKFLOW_NAME"
+            cylc kill "$CYLC_WORKFLOW_ID" 't1'
+            cylc stop "$CYLC_WORKFLOW_ID"
         """
diff --git a/tests/functional/job-kill/04-pbs/flow.cylc b/tests/functional/job-kill/04-pbs/flow.cylc
index c2e4b8e2589..b7009cb33fe 100644
--- a/tests/functional/job-kill/04-pbs/flow.cylc
+++ b/tests/functional/job-kill/04-pbs/flow.cylc
@@ -20,6 +20,6 @@
             -l select=1:ncpus=1:mem=15mb
     [[stop]]
         script="""
-            cylc kill "$CYLC_WORKFLOW_NAME" 't1'
-            cylc stop "$CYLC_WORKFLOW_NAME"
+            cylc kill "$CYLC_WORKFLOW_ID" 't1'
+            cylc stop "$CYLC_WORKFLOW_ID"
         """
diff --git a/tests/functional/job-submission/04-submit-num/flow.cylc b/tests/functional/job-submission/04-submit-num/flow.cylc
index fa6508a83d8..ca06d20fcbe 100644
--- a/tests/functional/job-submission/04-submit-num/flow.cylc
+++ b/tests/functional/job-submission/04-submit-num/flow.cylc
@@ -20,7 +20,7 @@
         [[[job]]]
             execution retry delays=2*PT0S
     [[bar]]
-        script = cylc trigger "${CYLC_WORKFLOW_NAME}" foo.1
+        script = cylc trigger "${CYLC_WORKFLOW_ID}" foo.1
     [[baz]]
         script = """
             printf "%d\n" {1..4} | cmp - "${CYLC_WORKFLOW_RUN_DIR}/foo-submits.txt"
diff --git a/tests/functional/job-submission/06-garbage/flow.cylc b/tests/functional/job-submission/06-garbage/flow.cylc
index 5cad6cbd226..e0e07b73923 100644
--- a/tests/functional/job-submission/06-garbage/flow.cylc
+++ b/tests/functional/job-submission/06-garbage/flow.cylc
@@ -15,5 +15,5 @@
             grep -q -F \
                 'bad: initialisation did not complete' \
                 "${CYLC_WORKFLOW_LOG_DIR}/log"
-            cylc shutdown "${CYLC_WORKFLOW_NAME}"
+            cylc shutdown "${CYLC_WORKFLOW_ID}"
         """
diff --git a/tests/functional/job-submission/08-activity-log-host/flow.cylc b/tests/functional/job-submission/08-activity-log-host/flow.cylc
index 47b647e92e0..4b084710a3e 100644
--- a/tests/functional/job-submission/08-activity-log-host/flow.cylc
+++ b/tests/functional/job-submission/08-activity-log-host/flow.cylc
@@ -16,6 +16,6 @@
         [[[job]]]
             execution retry delays = PT1S
     [[killer]]
-        script = cylc kill "${CYLC_WORKFLOW_NAME}" sleeper.1999
+        script = cylc kill "${CYLC_WORKFLOW_ID}" sleeper.1999
     [[releaser]]
-        script = cylc__job__wait_cylc_message_started; cylc release "${CYLC_WORKFLOW_NAME}" sleeper.1999
+        script = cylc__job__wait_cylc_message_started; cylc release "${CYLC_WORKFLOW_ID}" sleeper.1999
diff --git a/tests/functional/job-submission/09-activity-log-host-bad-submit/flow.cylc b/tests/functional/job-submission/09-activity-log-host-bad-submit/flow.cylc
index 0014da6ef70..7c8ed2af672 100644
--- a/tests/functional/job-submission/09-activity-log-host-bad-submit/flow.cylc
+++ b/tests/functional/job-submission/09-activity-log-host-bad-submit/flow.cylc
@@ -24,5 +24,5 @@
             grep '\[jobs-submit cmd\] ssh .* {{CYLC_TEST_HOST}} .*cylc jobs-submit.*' \
                 "${A_LOG}"
             # Stop the workflow cleanly
-            cylc stop "${CYLC_WORKFLOW_NAME}"
+            cylc stop "${CYLC_WORKFLOW_ID}"
         """
diff --git a/tests/functional/job-submission/11-garbage-platform-command/flow.cylc b/tests/functional/job-submission/11-garbage-platform-command/flow.cylc
index 7d0ddb54704..f2b633c81ed 100644
--- a/tests/functional/job-submission/11-garbage-platform-command/flow.cylc
+++ b/tests/functional/job-submission/11-garbage-platform-command/flow.cylc
@@ -12,7 +12,7 @@
         platform = badhost
     [[t2]]
         script = """
-            cylc broadcast "${CYLC_WORKFLOW_NAME}" \
+            cylc broadcast "${CYLC_WORKFLOW_ID}" \
                 -n 't1' -p '1' -s 'platform=localhost'
-            cylc trigger "${CYLC_WORKFLOW_NAME}" 't1.1'
+            cylc trigger "${CYLC_WORKFLOW_ID}" 't1.1'
         """
diff --git a/tests/functional/job-submission/16-timeout/flow.cylc b/tests/functional/job-submission/16-timeout/flow.cylc
index 1ac04d58337..30883ea8048 100644
--- a/tests/functional/job-submission/16-timeout/flow.cylc
+++ b/tests/functional/job-submission/16-timeout/flow.cylc
@@ -7,4 +7,4 @@
     [[foo]]
         platform = {{ environ['CYLC_TEST_PLATFORM'] }}
     [[stopper]]
-        script = cylc stop "${CYLC_WORKFLOW_NAME}"
+        script = cylc stop "${CYLC_WORKFLOW_ID}"
diff --git a/tests/functional/logging/02-duplicates/flow.cylc b/tests/functional/logging/02-duplicates/flow.cylc
index 4165b9ac693..70be749cfc6 100644
--- a/tests/functional/logging/02-duplicates/flow.cylc
+++ b/tests/functional/logging/02-duplicates/flow.cylc
@@ -22,16 +22,16 @@
         script = false
     [[bar]]
         script = """
-cylc set-outputs --flow=1 "${CYLC_WORKFLOW_NAME}" "foo.${CYLC_TASK_CYCLE_POINT}"
-"""
+cylc set-outputs --flow=1 "${CYLC_WORKFLOW_ID}" "foo.${CYLC_TASK_CYCLE_POINT}"
+        """
     [[restart]]
         script = """
-cylc stop "${CYLC_WORKFLOW_NAME}"
-"""
+            cylc stop "${CYLC_WORKFLOW_ID}"
+        """
     [[pub]]
         script = """
 # Extract timestamp lines from logs
 for file in $(find "${CYLC_WORKFLOW_RUN_DIR}/log/workflow/" -name '*.*'); do
     grep '.*-.*-.*' "${file}" | sort -u || true
 done | sort | uniq -d > 'log-duplication'
-"""
+        """
diff --git a/tests/functional/message-triggers/00-basic/flow.cylc b/tests/functional/message-triggers/00-basic/flow.cylc
index 68d9dc7cea3..612fbd4370b 100644
--- a/tests/functional/message-triggers/00-basic/flow.cylc
+++ b/tests/functional/message-triggers/00-basic/flow.cylc
@@ -16,8 +16,8 @@
     [[foo]]
         script = """
 cylc__job__wait_cylc_message_started
-cylc message -- "${CYLC_WORKFLOW_NAME} "${CYLC_TASK_JOB} "file 1 done"
-cylc message -- "${CYLC_WORKFLOW_NAME} "${CYLC_TASK_JOB} "file 2 done"
+cylc message -- "${CYLC_WORKFLOW_ID} "${CYLC_TASK_JOB} "file 1 done"
+cylc message -- "${CYLC_WORKFLOW_ID} "${CYLC_TASK_JOB} "file 2 done"
 """
         [[[outputs]]]
             out1 = "file 1 done"
diff --git a/tests/functional/pause-resume/00-workflow/flow.cylc b/tests/functional/pause-resume/00-workflow/flow.cylc
index d50d0626d8a..b868b8cc605 100644
--- a/tests/functional/pause-resume/00-workflow/flow.cylc
+++ b/tests/functional/pause-resume/00-workflow/flow.cylc
@@ -18,9 +18,9 @@
     [[pause_resume]]
         script = """
             wait
-            cylc pause "${CYLC_WORKFLOW_NAME}"
+            cylc pause "${CYLC_WORKFLOW_ID}"
             cylc__job__poll_grep_workflow_log -F 'INFO - Command succeeded: pause()'
-            cylc play "${CYLC_WORKFLOW_NAME}"
+            cylc play "${CYLC_WORKFLOW_ID}"
         """
     [[foo,bar]]
         script = true
diff --git a/tests/functional/pause-resume/01-beyond-stop/flow.cylc b/tests/functional/pause-resume/01-beyond-stop/flow.cylc
index fa3cef1780e..5b96d7805f2 100644
--- a/tests/functional/pause-resume/01-beyond-stop/flow.cylc
+++ b/tests/functional/pause-resume/01-beyond-stop/flow.cylc
@@ -23,8 +23,8 @@
     [[pause_resume]]
         # When this task runs foo will be held beyond the workflow stop point.
         script = """
-            cylc pause $CYLC_WORKFLOW_NAME
-            cylc play $CYLC_WORKFLOW_NAME
+            cylc pause $CYLC_WORKFLOW_ID
+            cylc play $CYLC_WORKFLOW_ID
         """
     [[foo]]
         script = true
diff --git a/tests/functional/pause-resume/12-pause-then-retry/flow.cylc b/tests/functional/pause-resume/12-pause-then-retry/flow.cylc
index 18849f0f170..dac9929a003 100644
--- a/tests/functional/pause-resume/12-pause-then-retry/flow.cylc
+++ b/tests/functional/pause-resume/12-pause-then-retry/flow.cylc
@@ -18,13 +18,11 @@
 [runtime]
     [[t-pause]]
         script = """
-            cylc pause "${CYLC_WORKFLOW_NAME}"
-
+            cylc pause "${CYLC_WORKFLOW_ID}"
             cylc__job__poll_grep_workflow_log -F 'Command succeeded: pause'
 
             # Poll t-submit-retry-able, should return submit-fail
-            cylc poll "${CYLC_WORKFLOW_NAME}" 't-submit-retry-able'
-
+            cylc poll "${CYLC_WORKFLOW_ID}" 't-submit-retry-able'
             # Allow t-retry-able to continue
             rm -f "${CYLC_WORKFLOW_RUN_DIR}/file"
 
@@ -35,7 +33,7 @@
                 't-submit-retry-able\.1 submitted .* => waiting'
 
             # Resume the workflow
-            cylc play "${CYLC_WORKFLOW_NAME}"
+            cylc play "${CYLC_WORKFLOW_ID}"
 
             cylc__job__poll_grep_workflow_log -E \
                 't-retry-able\.1 waiting .* => waiting\(queued\)'
diff --git a/tests/functional/pre-initial/warm-insert/flow.cylc b/tests/functional/pre-initial/warm-insert/flow.cylc
index de61a99b865..b154c26031c 100644
--- a/tests/functional/pre-initial/warm-insert/flow.cylc
+++ b/tests/functional/pre-initial/warm-insert/flow.cylc
@@ -26,5 +26,6 @@
     [[foo,bar]]
     [[inserter]]
         script = """
-            cylc trigger --reflow --meta="other" $CYLC_WORKFLOW_NAME foo.20100101T1200Z
+            cylc trigger --reflow --meta="other" $CYLC_WORKFLOW_ID foo.20100101T1200Z
         """
+        
\ No newline at end of file
diff --git a/tests/functional/queues/qsize/flow.cylc b/tests/functional/queues/qsize/flow.cylc
index a1e83c50d63..4cfce86d0a5 100644
--- a/tests/functional/queues/qsize/flow.cylc
+++ b/tests/functional/queues/qsize/flow.cylc
@@ -16,8 +16,8 @@
         N_SUCCEDED=0
         while ((N_SUCCEDED < 12)); do
             sleep 1
-            N_RUNNING=$(cylc workflow-state $CYLC_WORKFLOW_NAME -S running | wc -l)
+            N_RUNNING=$(cylc workflow-state $CYLC_WORKFLOW_ID -S running | wc -l)
             ((N_RUNNING <= {{q_size}})) # check
-            N_SUCCEDED=$(cylc workflow-state $CYLC_WORKFLOW_NAME -S succeeded | wc -l)
+            N_SUCCEDED=$(cylc workflow-state $CYLC_WORKFLOW_ID -S succeeded | wc -l)
         done
 """
diff --git a/tests/functional/reload/00-simple/flow.cylc b/tests/functional/reload/00-simple/flow.cylc
index fe20667b576..8abe4b99b80 100644
--- a/tests/functional/reload/00-simple/flow.cylc
+++ b/tests/functional/reload/00-simple/flow.cylc
@@ -5,4 +5,4 @@
     [[a,c]]
         script = "true"
     [[b]]
-        script = "cylc reload $CYLC_WORKFLOW_NAME; sleep 5"
+        script = "cylc reload $CYLC_WORKFLOW_ID; sleep 5"
diff --git a/tests/functional/reload/01-startup/flow.cylc b/tests/functional/reload/01-startup/flow.cylc
index 375ac8f0f8b..229a64adb2e 100644
--- a/tests/functional/reload/01-startup/flow.cylc
+++ b/tests/functional/reload/01-startup/flow.cylc
@@ -12,6 +12,6 @@
         script = true
     [[b]]
         script = """
-cylc reload "${CYLC_WORKFLOW_NAME}"
+cylc reload "${CYLC_WORKFLOW_ID}"
 cylc__job__poll_grep_workflow_log -F 'Reload completed'
 """
diff --git a/tests/functional/reload/02-content/flow.cylc b/tests/functional/reload/02-content/flow.cylc
index 079317fff46..483a14ecf82 100644
--- a/tests/functional/reload/02-content/flow.cylc
+++ b/tests/functional/reload/02-content/flow.cylc
@@ -13,7 +13,7 @@ fail, unless the first reloads the workflow definition after modifying it."""
 # change the value of $FALSE to "true" in foo's environment:
 perl -pi -e 's/(FALSE = )false( # marker)/\1true\2/' $CYLC_WORKFLOW_RUN_DIR/flow.cylc
 # reload
-cylc reload $CYLC_WORKFLOW_NAME
+cylc reload $CYLC_WORKFLOW_ID
 """
     [[foo]]
         script = "$FALSE"
diff --git a/tests/functional/reload/03-queues/flow.cylc b/tests/functional/reload/03-queues/flow.cylc
index 84bc772d7fc..21af35196c9 100644
--- a/tests/functional/reload/03-queues/flow.cylc
+++ b/tests/functional/reload/03-queues/flow.cylc
@@ -21,20 +21,20 @@
 # change the limit from 5 to 3:
 perl -pi -e 's/(limit = )5( # marker)/\1 3 \2/' $CYLC_WORKFLOW_RUN_DIR/flow.cylc
 # reload:
-cylc reload "${CYLC_WORKFLOW_NAME}"
+cylc reload "${CYLC_WORKFLOW_ID}"
 cylc__job__poll_grep_workflow_log 'Reload completed'
 """
     [[monitor]]
         script = """
         cylc__job__wait_cylc_message_started
         while true; do
-            RUNNING=$(cylc workflow-state $CYLC_WORKFLOW_NAME -S running | wc -l)
+            RUNNING=$(cylc workflow-state $CYLC_WORKFLOW_ID -S running | wc -l)
             # Should be max of: monitor plus 3 members of q1
             if ((RUNNING > 4)); then
                 break
             fi
             sleep 1
-            SUCCEEDED=$(cylc workflow-state $CYLC_WORKFLOW_NAME -S succeeded | wc -l)
+            SUCCEEDED=$(cylc workflow-state $CYLC_WORKFLOW_ID -S succeeded | wc -l)
             if ((SUCCEEDED==13)); then
                 break
             fi
diff --git a/tests/functional/reload/04-inheritance/flow.cylc b/tests/functional/reload/04-inheritance/flow.cylc
index b526a116fb0..edf05529bb1 100644
--- a/tests/functional/reload/04-inheritance/flow.cylc
+++ b/tests/functional/reload/04-inheritance/flow.cylc
@@ -15,7 +15,7 @@
 # change the inheritance of inheritor:
 perl -pi -e 's/(inherit = )FAM1( # marker)/\1FAM2\2/' $CYLC_WORKFLOW_RUN_DIR/flow.cylc
 # reload
-cylc reload $CYLC_WORKFLOW_NAME
+cylc reload $CYLC_WORKFLOW_ID
 sleep 5
 """
     [[inheritor]]
diff --git a/tests/functional/reload/05-graphing-simple/flow.cylc b/tests/functional/reload/05-graphing-simple/flow.cylc
index 63544dd2ef8..4c3b938daf3 100644
--- a/tests/functional/reload/05-graphing-simple/flow.cylc
+++ b/tests/functional/reload/05-graphing-simple/flow.cylc
@@ -13,7 +13,7 @@
 # change the order of foo and bar in the graphing section:
 perl -pi -e 's/(R1 = reloader => inter => )bar => foo( # marker)/\1foo => bar\2/' $CYLC_WORKFLOW_RUN_DIR/flow.cylc
 # reload
-cylc reload "${CYLC_WORKFLOW_NAME}"
+cylc reload "${CYLC_WORKFLOW_ID}"
 cylc__job__poll_grep_workflow_log -F 'Reload completed'
 """
     [[foo, bar]]
diff --git a/tests/functional/reload/06-graphing-fam/flow.cylc b/tests/functional/reload/06-graphing-fam/flow.cylc
index 23f4b0d5579..8aa0f9ac87f 100644
--- a/tests/functional/reload/06-graphing-fam/flow.cylc
+++ b/tests/functional/reload/06-graphing-fam/flow.cylc
@@ -16,7 +16,7 @@
 perl -pi -e 's/(reloader => inter => )BAR\?( # marker1)/\1FOO?\2/' $CYLC_WORKFLOW_RUN_DIR/flow.cylc
 perl -pi -e 's/( )BAR:finish-all => FOO( # marker2)/\1FOO:finish-all => BAR\2/' $CYLC_WORKFLOW_RUN_DIR/flow.cylc
 # reload
-cylc reload "${CYLC_WORKFLOW_NAME}"
+cylc reload "${CYLC_WORKFLOW_ID}"
 cylc__job__poll_grep_workflow_log -F 'Reload completed'
 """
     [[FOO, BAR]]
diff --git a/tests/functional/reload/07-final-cycle/flow.cylc b/tests/functional/reload/07-final-cycle/flow.cylc
index 6158587f635..51b87cac11d 100644
--- a/tests/functional/reload/07-final-cycle/flow.cylc
+++ b/tests/functional/reload/07-final-cycle/flow.cylc
@@ -17,7 +17,7 @@
 # change the final cycle:
 perl -pi -e 's/(final cycle point = )20100102T00( # marker)/\1 20100101T12\2/' $CYLC_WORKFLOW_RUN_DIR/flow.cylc
 # reload
-cylc reload $CYLC_WORKFLOW_NAME
+cylc reload $CYLC_WORKFLOW_ID
 cylc__job__poll_grep_workflow_log -F 'Reload completed'
 """
     [[a]]
diff --git a/tests/functional/reload/08-cycle/flow.cylc b/tests/functional/reload/08-cycle/flow.cylc
index 3e80b7d344e..192d8c8acac 100644
--- a/tests/functional/reload/08-cycle/flow.cylc
+++ b/tests/functional/reload/08-cycle/flow.cylc
@@ -17,7 +17,7 @@
 # change the order of FOO and BAR in the graphing section:
 sed -i 's/T00,T12 = a\[-PT12H\]/T00,T06,T12,T18 = a[-PT6H]/' "${CYLC_WORKFLOW_RUN_DIR}/flow.cylc"
 # reload
-cylc reload "${CYLC_WORKFLOW_NAME}"
+cylc reload "${CYLC_WORKFLOW_ID}"
 cylc__job__poll_grep_workflow_log -F 'Reload completed'
 """
     [[a]]
diff --git a/tests/functional/reload/11-retrying/flow.cylc b/tests/functional/reload/11-retrying/flow.cylc
index 0bf1477afa8..52191a76d40 100644
--- a/tests/functional/reload/11-retrying/flow.cylc
+++ b/tests/functional/reload/11-retrying/flow.cylc
@@ -12,17 +12,17 @@ cylc__job__wait_cylc_message_started
 sleep 1
 if ((CYLC_TASK_TRY_NUMBER == 1)); then
     # Kill the job, so task will go into waiting (held)
-    cylc kill "${CYLC_WORKFLOW_NAME}" 'retrier.1'
+    cylc kill "${CYLC_WORKFLOW_ID}" 'retrier.1'
     sleep 120  # Does not matter how long as the job will be killed
 fi
-"""
+        """
         [[[job]]]
             execution retry delays = PT0S
     [[reloader]]
         script = """
 cylc__job__poll_grep_workflow_log -E 'retrier\.1 running\(held\) .* => waiting\(held\)'
-cylc reload "${CYLC_WORKFLOW_NAME}"
-cylc reload "${CYLC_WORKFLOW_NAME}"
+cylc reload "${CYLC_WORKFLOW_ID}"
+cylc reload "${CYLC_WORKFLOW_ID}"
 cylc__job__poll_grep_workflow_log -F 'Reload completed'
-cylc release "${CYLC_WORKFLOW_NAME}" 'retrier.1'
-"""
+cylc release "${CYLC_WORKFLOW_ID}" 'retrier.1'
+        """
diff --git a/tests/functional/reload/12-remove-task/flow.cylc b/tests/functional/reload/12-remove-task/flow.cylc
index 5e7fdf03901..3d26bd5d56f 100644
--- a/tests/functional/reload/12-remove-task/flow.cylc
+++ b/tests/functional/reload/12-remove-task/flow.cylc
@@ -9,7 +9,7 @@
     [[reloader]]
         script = """
             sed -i "s/remove_me =>//g" $CYLC_WORKFLOW_RUN_DIR/flow.cylc
-            cylc reload $CYLC_WORKFLOW_NAME
+            cylc reload $CYLC_WORKFLOW_ID
             cylc__job__poll_grep_workflow_log -F 'Reload completed'
         """
     [[remove_me]]
diff --git a/tests/functional/reload/13-add-task/flow.cylc b/tests/functional/reload/13-add-task/flow.cylc
index 8282ef65d15..b8e10256413 100644
--- a/tests/functional/reload/13-add-task/flow.cylc
+++ b/tests/functional/reload/13-add-task/flow.cylc
@@ -13,6 +13,6 @@
     [[reloader]]
         script = """
 sed -i "s/\(R1 = reloader => foo\)\s*$/\1 => add_me/" $CYLC_WORKFLOW_RUN_DIR/flow.cylc
-cylc reload $CYLC_WORKFLOW_NAME
+cylc reload $CYLC_WORKFLOW_ID
 sleep 10
         """
diff --git a/tests/functional/reload/14-waiting/flow.cylc b/tests/functional/reload/14-waiting/flow.cylc
index e96603e7bcd..3cbfe60f8c2 100644
--- a/tests/functional/reload/14-waiting/flow.cylc
+++ b/tests/functional/reload/14-waiting/flow.cylc
@@ -23,8 +23,8 @@ done
         script = true
     [[reloader]]
         script = """
-cylc reload "${CYLC_WORKFLOW_NAME}"
+cylc reload "${CYLC_WORKFLOW_ID}"
 cylc__job__poll_grep_workflow_log -E 'waiter\.1 .* reloaded task definition'
 rm -f "${CYLC_WORKFLOW_WORK_DIR}/1/sleeping-waiter/file"
 rm -f "${CYLC_WORKFLOW_WORK_DIR}/1/starter/file"
-"""
+        """
diff --git a/tests/functional/reload/16-remove-add-alter-task/flow.cylc b/tests/functional/reload/16-remove-add-alter-task/flow.cylc
index 7f95640be94..07e63f318e3 100644
--- a/tests/functional/reload/16-remove-add-alter-task/flow.cylc
+++ b/tests/functional/reload/16-remove-add-alter-task/flow.cylc
@@ -16,7 +16,7 @@
    [[reloader]]
       script = """
 do_reload() {
-    cylc reload "${CYLC_WORKFLOW_NAME}"
+    cylc reload "${CYLC_WORKFLOW_ID}"
     while test "$(grep -cF 'Reload completed' "${CYLC_WORKFLOW_LOG_DIR}/log")" -ne "$1"
     do
         sleep 1
diff --git a/tests/functional/reload/18-broadcast-insert/flow.cylc b/tests/functional/reload/18-broadcast-insert/flow.cylc
index fbec0c1446c..50766e6c3a4 100644
--- a/tests/functional/reload/18-broadcast-insert/flow.cylc
+++ b/tests/functional/reload/18-broadcast-insert/flow.cylc
@@ -5,9 +5,9 @@
 [runtime]
     [[foo]]
         script="""
-cylc broadcast "${CYLC_WORKFLOW_NAME}" -s '[environment]CYLC_TEST_VAR=1'
+cylc broadcast "${CYLC_WORKFLOW_ID}" -s '[environment]CYLC_TEST_VAR=1'
 cp -p "${CYLC_WORKFLOW_RUN_DIR}/flow-2.cylc" "${CYLC_WORKFLOW_RUN_DIR}/flow.cylc"
-cylc reload "${CYLC_WORKFLOW_NAME}"
+cylc reload "${CYLC_WORKFLOW_ID}"
 sleep 5
-cylc trigger "${CYLC_WORKFLOW_NAME}" 'bar.1'
+cylc trigger "${CYLC_WORKFLOW_ID}" 'bar.1'
 """
diff --git a/tests/functional/reload/19-remote-kill/flow.cylc b/tests/functional/reload/19-remote-kill/flow.cylc
index 5aba73dc488..4a40264b300 100644
--- a/tests/functional/reload/19-remote-kill/flow.cylc
+++ b/tests/functional/reload/19-remote-kill/flow.cylc
@@ -14,9 +14,9 @@
     [[bar]]
         script = """
             cylc__job__wait_cylc_message_started
-            cylc reload "${CYLC_WORKFLOW_NAME}"
+            cylc reload "${CYLC_WORKFLOW_ID}"
             cylc__job__poll_grep_workflow_log -F 'Reload completed'
-            cylc kill "${CYLC_WORKFLOW_NAME}" 'foo.1'
+            cylc kill "${CYLC_WORKFLOW_ID}" 'foo.1'
             cylc__job__poll_grep_workflow_log -E 'foo\.1 failed\(held\) job:01.* job killed'
         """
         [[[job]]]
diff --git a/tests/functional/reload/20-stop-point/flow.cylc b/tests/functional/reload/20-stop-point/flow.cylc
index 4ad5c9d132c..5a74161ea70 100644
--- a/tests/functional/reload/20-stop-point/flow.cylc
+++ b/tests/functional/reload/20-stop-point/flow.cylc
@@ -15,11 +15,11 @@
 
 [runtime]
     [[set-stop-point]]
-        script = cylc stop "${CYLC_WORKFLOW_NAME}" '3'
+        script = cylc stop "${CYLC_WORKFLOW_ID}" '3'
     [[reload]]
         script = """
             cylc__job__wait_cylc_message_started
-            cylc reload "${CYLC_WORKFLOW_NAME}"
+            cylc reload "${CYLC_WORKFLOW_ID}"
             cylc__job__poll_grep_workflow_log -F 'Reload completed'
         """
         [[[job]]]
diff --git a/tests/functional/reload/21-submit-fail/flow.cylc b/tests/functional/reload/21-submit-fail/flow.cylc
index f0b4b9c6559..5a5b5c0a1e1 100644
--- a/tests/functional/reload/21-submit-fail/flow.cylc
+++ b/tests/functional/reload/21-submit-fail/flow.cylc
@@ -17,6 +17,6 @@ reloader => stopper
         platform = platypus
 
     [[reloader]]
-        script=cylc reload "${CYLC_WORKFLOW_NAME}"
+        script=cylc reload "${CYLC_WORKFLOW_ID}"
     [[stopper]]
-        script=cylc stop "${CYLC_WORKFLOW_NAME}"
+        script=cylc stop "${CYLC_WORKFLOW_ID}"
diff --git a/tests/functional/reload/22-remove-task-cycling.t b/tests/functional/reload/22-remove-task-cycling.t
index 207270e0333..aaa20c5fb74 100644
--- a/tests/functional/reload/22-remove-task-cycling.t
+++ b/tests/functional/reload/22-remove-task-cycling.t
@@ -51,7 +51,7 @@ $(declare -f poll_grep)
 # Remove bar and tell the server to reload.
 if (( CYLC_TASK_CYCLE_POINT == CYLC_WORKFLOW_INITIAL_CYCLE_POINT )); then
    sed -i 's/^.*remove*$//g' "\${CYLC_WORKFLOW_RUN_DIR}/flow.cylc"
-   cylc reload "\${CYLC_WORKFLOW_NAME}"
+   cylc reload "\${CYLC_WORKFLOW_ID}"
    poll_grep -F 'Reload complete' "\${CYLC_WORKFLOW_RUN_DIR}/log/workflow/log"
    # kill the long-running orphaned bar task.
    kill "\$(cat "\${CYLC_WORKFLOW_RUN_DIR}/work/1/bar/pid")"
diff --git a/tests/functional/reload/garbage/flow.cylc b/tests/functional/reload/garbage/flow.cylc
index 195e64b3b88..fa65f2eab81 100644
--- a/tests/functional/reload/garbage/flow.cylc
+++ b/tests/functional/reload/garbage/flow.cylc
@@ -8,7 +8,7 @@ sleep 5
 # change the dependencies section name to garbage:
 perl -pi -e 's/(\[\[)graph(\]\] # marker)/\1garbage\2/' $CYLC_WORKFLOW_RUN_DIR/flow.cylc
 # reload
-cylc reload $CYLC_WORKFLOW_NAME
+cylc reload $CYLC_WORKFLOW_ID
 """
     [[foo]]
         script = true
diff --git a/tests/functional/reload/runahead/flow.cylc b/tests/functional/reload/runahead/flow.cylc
index ef649f3a4b9..cc0d837a789 100644
--- a/tests/functional/reload/runahead/flow.cylc
+++ b/tests/functional/reload/runahead/flow.cylc
@@ -20,5 +20,5 @@
         script = """
 cylc__job__poll_grep_workflow_log -E "foo\.${CYLC_TASK_CYCLE_POINT} running .*\(received\)failed"
 perl -pi -e 's/(runahead limit = )P2( # marker)/\1 P4\2/' $CYLC_WORKFLOW_RUN_DIR/flow.cylc
-cylc reload $CYLC_WORKFLOW_NAME
+cylc reload $CYLC_WORKFLOW_ID
 """
diff --git a/tests/functional/restart/00-pre-initial/flow.cylc b/tests/functional/restart/00-pre-initial/flow.cylc
index 5e3d7729f79..3f247f134ae 100644
--- a/tests/functional/restart/00-pre-initial/flow.cylc
+++ b/tests/functional/restart/00-pre-initial/flow.cylc
@@ -20,7 +20,7 @@
         script = """
 cylc__job__wait_cylc_message_started
 sleep 1
-cylc shutdown --now --max-polls=30 --interval=1 "${CYLC_WORKFLOW_NAME}"
+cylc shutdown --now --max-polls=30 --interval=1 "${CYLC_WORKFLOW_ID}"
 """
     [[foo, p2]]
         script = true
diff --git a/tests/functional/restart/03-retrying.t b/tests/functional/restart/03-retrying.t
index f0ad8710bec..dec8aed7794 100755
--- a/tests/functional/restart/03-retrying.t
+++ b/tests/functional/restart/03-retrying.t
@@ -33,7 +33,7 @@ init_workflow "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
         script = """
             cylc__job__wait_cylc_message_started
             if ((CYLC_TASK_TRY_NUMBER == 1)); then
-                cylc stop "${CYLC_WORKFLOW_NAME}"
+                cylc stop "${CYLC_WORKFLOW_ID}"
                 exit 1
             fi
         """
diff --git a/tests/functional/restart/04-running.t b/tests/functional/restart/04-running.t
index 9875ed766e8..b6d4eccd6dc 100755
--- a/tests/functional/restart/04-running.t
+++ b/tests/functional/restart/04-running.t
@@ -32,7 +32,7 @@ init_workflow "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
     [[t1]]
         script = """
             cylc__job__wait_cylc_message_started
-            cylc stop --now "${CYLC_WORKFLOW_NAME}"
+            cylc stop --now "${CYLC_WORKFLOW_ID}"
             cylc__job__poll_grep_workflow_log -F 'Run: (re)start=1'
             # Should be good to send succeeded message at this point
         """
diff --git a/tests/functional/restart/08-stop-after-cycle-point/flow.cylc b/tests/functional/restart/08-stop-after-cycle-point/flow.cylc
index c16a1f7a120..592229cf151 100644
--- a/tests/functional/restart/08-stop-after-cycle-point/flow.cylc
+++ b/tests/functional/restart/08-stop-after-cycle-point/flow.cylc
@@ -24,7 +24,7 @@ description = """
 {% if MANUAL_SHUTDOWN is defined %}
         script = """
             if [[ "$CYLC_TASK_CYCLE_POINT" == {{ MANUAL_SHUTDOWN }} ]]; then
-                cylc stop "$CYLC_WORKFLOW_NAME"
+                cylc stop "$CYLC_WORKFLOW_ID"
             fi
         """
 {% endif %}
diff --git a/tests/functional/restart/22-hold/flow.cylc b/tests/functional/restart/22-hold/flow.cylc
index 30570843aef..8a752db7549 100644
--- a/tests/functional/restart/22-hold/flow.cylc
+++ b/tests/functional/restart/22-hold/flow.cylc
@@ -18,10 +18,10 @@
         script = """
             if [[ "${CYLC_TASK_CYCLE_POINT}" == '2016' ]]; then
                 cylc__job__poll_grep_workflow_log -E 't2\.2016 .* spawned'
-                cylc hold "${CYLC_WORKFLOW_NAME}" t2.2016 t2.2017
-                cylc stop "${CYLC_WORKFLOW_NAME}"
+                cylc hold "${CYLC_WORKFLOW_ID}" t2.2016 t2.2017
+                cylc stop "${CYLC_WORKFLOW_ID}"
             else
-                cylc release "${CYLC_WORKFLOW_NAME}" t2.2016 t2.2017
+                cylc release "${CYLC_WORKFLOW_ID}" t2.2016 t2.2017
             fi
         """
     [[fast]]
diff --git a/tests/functional/restart/25-hold-workflow/flow.cylc b/tests/functional/restart/25-hold-workflow/flow.cylc
index 9fd36f5b33f..7d3bf7c26c4 100644
--- a/tests/functional/restart/25-hold-workflow/flow.cylc
+++ b/tests/functional/restart/25-hold-workflow/flow.cylc
@@ -13,8 +13,8 @@
     [[t1]]
         script = """
             if [[ "${CYLC_TASK_CYCLE_POINT}" == '2016' ]]; then
-                cylc hold --after=1900 "${CYLC_WORKFLOW_NAME}"
-                cylc stop "${CYLC_WORKFLOW_NAME}"
+                cylc hold --after=1900 "${CYLC_WORKFLOW_ID}"
+                cylc stop "${CYLC_WORKFLOW_ID}"
             fi
         """
     [[t2]]
diff --git a/tests/functional/restart/27-broadcast-timeout/flow.cylc b/tests/functional/restart/27-broadcast-timeout/flow.cylc
index 79c2b7a2cd7..49a1ef9ea32 100644
--- a/tests/functional/restart/27-broadcast-timeout/flow.cylc
+++ b/tests/functional/restart/27-broadcast-timeout/flow.cylc
@@ -7,8 +7,8 @@
 [runtime]
     [[foo]]
         script="""
-cylc broadcast "${CYLC_WORKFLOW_NAME}" --set='[events]submission timeout=PT1M'
-cylc stop "${CYLC_WORKFLOW_NAME}"
+cylc broadcast "${CYLC_WORKFLOW_ID}" --set='[events]submission timeout=PT1M'
+cylc stop "${CYLC_WORKFLOW_ID}"
 """
     [[bar]]
         script=true
diff --git a/tests/functional/restart/28-execution-timeout/flow.cylc b/tests/functional/restart/28-execution-timeout/flow.cylc
index 590222ff849..bbcf68d2603 100644
--- a/tests/functional/restart/28-execution-timeout/flow.cylc
+++ b/tests/functional/restart/28-execution-timeout/flow.cylc
@@ -9,7 +9,7 @@
         script="""
 cylc__job__wait_cylc_message_started
 sleep 1
-cylc stop --now --now "${CYLC_WORKFLOW_NAME}"
+cylc stop --now --now "${CYLC_WORKFLOW_ID}"
 sleep 60
 """
         [[[events]]]
diff --git a/tests/functional/restart/32-reload-runahead-no-stop-point/flow.cylc b/tests/functional/restart/32-reload-runahead-no-stop-point/flow.cylc
index a3fc707fe3c..43c8d00b46b 100644
--- a/tests/functional/restart/32-reload-runahead-no-stop-point/flow.cylc
+++ b/tests/functional/restart/32-reload-runahead-no-stop-point/flow.cylc
@@ -11,12 +11,12 @@
     [[t1]]
         script = """
             cylc__job__wait_cylc_message_started
-            cylc stop --now "${CYLC_WORKFLOW_NAME}"
+            cylc stop --now "${CYLC_WORKFLOW_ID}"
         """
     [[t2]]
         script = """
             cylc__job__wait_cylc_message_started
-            cylc reload "${CYLC_WORKFLOW_NAME}"
+            cylc reload "${CYLC_WORKFLOW_ID}"
         """
     [[t3]]
         script = true
diff --git a/tests/functional/restart/38-auto-restart-stopping.t b/tests/functional/restart/38-auto-restart-stopping.t
index 9b0a7ccd86d..6e6ebf2020e 100644
--- a/tests/functional/restart/38-auto-restart-stopping.t
+++ b/tests/functional/restart/38-auto-restart-stopping.t
@@ -43,7 +43,7 @@ init_workflow "${TEST_NAME}" - <<'__FLOW_CONFIG__'
         R1 = foo => bar
 [runtime]
     [[foo]]
-        script = cylc stop "${CYLC_WORKFLOW_NAME}"; sleep 15
+        script = cylc stop "${CYLC_WORKFLOW_ID}"; sleep 15
     [[bar]]
 __FLOW_CONFIG__
 
diff --git a/tests/functional/restart/44-stop-point.t b/tests/functional/restart/44-stop-point.t
index c79f3f9a6af..74267fdf8da 100644
--- a/tests/functional/restart/44-stop-point.t
+++ b/tests/functional/restart/44-stop-point.t
@@ -58,16 +58,16 @@ init_workflow "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
         script = """
 case "${CYLC_TASK_CYCLE_POINT}" in
 2015)
-    cylc stop "${CYLC_WORKFLOW_NAME}"
+    cylc stop "${CYLC_WORKFLOW_ID}"
     :;;
 2016)
     sed -i 's/\(final cycle point =\) 2024/\1 2025/' "${CYLC_WORKFLOW_RUN_DIR}/flow.cylc"
-    cylc reload "${CYLC_WORKFLOW_NAME}"
+    cylc reload "${CYLC_WORKFLOW_ID}"
     cylc__job__poll_grep_workflow_log "Reload completed"
     :;;
 2019)
-    cylc stop "${CYLC_WORKFLOW_NAME}" '2021'
-    cylc stop "${CYLC_WORKFLOW_NAME}"
+    cylc stop "${CYLC_WORKFLOW_ID}" '2021'
+    cylc stop "${CYLC_WORKFLOW_ID}"
     :;;
 esac
 """
diff --git a/tests/functional/restart/45-stop-task.t b/tests/functional/restart/45-stop-task.t
index b926d8dd9f4..77804856f14 100644
--- a/tests/functional/restart/45-stop-task.t
+++ b/tests/functional/restart/45-stop-task.t
@@ -52,9 +52,9 @@ init_workflow "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
     [[t<i>]]
         script = true
     [[t<i=1>]]
-        script = cylc stop "${CYLC_WORKFLOW_NAME}" 't_i5.1'
+        script = cylc stop "${CYLC_WORKFLOW_ID}" 't_i5.1'
     [[t<i=2>]]
-        script = cylc stop "${CYLC_WORKFLOW_NAME}"
+        script = cylc stop "${CYLC_WORKFLOW_ID}"
 __FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${WORKFLOW_NAME}"
diff --git a/tests/functional/restart/51-final-point-reload.t b/tests/functional/restart/51-final-point-reload.t
index 48608841a10..c11718b155e 100644
--- a/tests/functional/restart/51-final-point-reload.t
+++ b/tests/functional/restart/51-final-point-reload.t
@@ -56,7 +56,7 @@ init_workflow "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
         script = """
             case "${CYLC_TASK_CYCLE_POINT}" in
             2015)
-                cylc stop "${CYLC_WORKFLOW_NAME}"
+                cylc stop "${CYLC_WORKFLOW_ID}"
                 :;;
             esac
         """
diff --git a/tests/functional/restart/bad-job-host/flow.cylc b/tests/functional/restart/bad-job-host/flow.cylc
index 3412818288a..d4769693d40 100644
--- a/tests/functional/restart/bad-job-host/flow.cylc
+++ b/tests/functional/restart/bad-job-host/flow.cylc
@@ -20,7 +20,7 @@
     [[t-shutdown]]
         script = """
             # Shutdown and wait
-            cylc shutdown --now --max-polls=10 --interval=1 "${CYLC_WORKFLOW_NAME}"
+            cylc shutdown --now --max-polls=10 --interval=1 "${CYLC_WORKFLOW_ID}"
         """
     [[t-remote-2]]
         script = """
@@ -32,5 +32,5 @@
         script = """
             grep -q 'ERROR - garbage: initialisation did not complete' \
                 "${CYLC_WORKFLOW_LOG_DIR}/log"
-            cylc shutdown --now "${CYLC_WORKFLOW_NAME}"
+            cylc shutdown --now "${CYLC_WORKFLOW_ID}"
         """