diff --git a/.gitignore b/.gitignore
index f9cd75707ee..909df8fbfef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ __pycache__/
 
 # processed suite definitions
 *.rc.processed
+*.cylc.processed
 
 # profiling
 .profiling
diff --git a/CHANGES.md b/CHANGES.md
index a39cea9c6b8..d4fc7ba2218 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -40,6 +40,12 @@ Fourth alpha release of Cylc 8.
 
 (See note on cylc-8 backward-incompatible changes, above)
 
+The filenames `suite.rc` and `global.rc` are now deprecated in favour of
+`flow.cylc` and `global.cylc` respectively
+([#3755](https://github.com/cylc/cylc-flow/pull/3755)). For backwards
+compatibility, the `cylc run` command will automatically symlink an existing
+`suite.rc` file to `flow.cylc`.
+
 ### Enhancements
 
 [#3515](https://github.com/cylc/cylc-flow/pull/3515) - spawn-on-demand: a more
diff --git a/cylc/flow/cfgspec/globalcfg.py b/cylc/flow/cfgspec/globalcfg.py
index 28bbef87ef7..687c98fac74 100644
--- a/cylc/flow/cfgspec/globalcfg.py
+++ b/cylc/flow/cfgspec/globalcfg.py
@@ -33,7 +33,7 @@
 # - value_type: value type (compulsory).
 # - default: the default value (optional).
 # - allowed_2, ...: the only other allowed values of this setting (optional).
-with Conf('flow.rc', desc='''
+with Conf('global.cylc', desc='''
     The global configuration which defines default Cylc Flow settings
     for a user or site.
 
@@ -42,11 +42,11 @@
        $ cylc get-global-config --sparse
 
 
-    Cylc will attempt to load the global configuration (flow.rc) from two
+    Cylc will attempt to load the global configuration (global.cylc) from two
     locations:
 
-    * ``/etc/cylc/flow/<CYLC_VERSION>/flow.rc``
-    * ``~/.cylc/flow/<CYLC_VERSION>/flow.rc``
+    * ``/etc/cylc/flow/<CYLC_VERSION>/global.cylc``
+    * ``~/.cylc/flow/<CYLC_VERSION>/global.cylc``
 
     If both files are present files will be loaded in this order so those
     lower down the list may override settings from those higher up.
@@ -55,8 +55,13 @@
 
     .. note::
 
-       The ``flow.rc`` file can be templated using Jinja2 variables.
+       The ``global.cylc`` file can be templated using Jinja2 variables.
        See :ref:`Jinja`.
+
+    .. note::
+
+       Prior to Cylc 8, ``global.cylc`` was named ``global.rc``, but that name
+       is no longer supported.
 ''') as SPEC:
 
     # suite
@@ -79,21 +84,21 @@
 
     # suite
     with Conf('cylc', desc='''
-        Default values for entries in the suite.rc ``[cylc]`` section.
+        Default values for entries in flow.cylc ``[cylc]`` section.
     '''):
         Conf('UTC mode', VDR.V_BOOLEAN, False, desc='''
-                Default for :cylc:conf:`suite.rc[cylc]UTC mode`.
+                Default for :cylc:conf:`flow.cylc[cylc]UTC mode`.
         ''')
         Conf('task event mail interval', VDR.V_INTERVAL, DurationFloat(300),
              desc='''
                 Default for
-                :cylc:conf:`suite.rc[cylc]task event mail interval`.
+                :cylc:conf:`flow.cylc[cylc]task event mail interval`.
         ''')
 
         with Conf('events', desc='''
             You can define site defaults for each of the following options,
             details of which can be found under
-            :cylc:conf:`suite.rc[cylc][events]`.
+            :cylc:conf:`flow.cylc[cylc][events]`.
         '''):
             Conf('handlers', VDR.V_STRING_LIST)
             Conf('handler events', VDR.V_STRING_LIST)
@@ -372,7 +377,7 @@
             ''')
             Conf('retrieve job logs', VDR.V_BOOLEAN, desc='''
                 Global default for
-                :cylc:conf:`suite.rc[runtime][<namespace>][remote]retrieve job
+                :cylc:conf:`flow.cylc[runtime][<namespace>][remote]retrieve job
                 logs`.
             ''')
             Conf('retrieve job logs command', VDR.V_STRING, 'rsync -a',
@@ -383,22 +388,22 @@
             ''')
             Conf('retrieve job logs max size', VDR.V_STRING, desc='''
                 Global default for the
-                :cylc:conf:`suite.rc[runtime][<namespace>][remote]retrieve job
+                :cylc:conf:`flow.cylc[runtime][<namespace>][remote]retrieve job
                 logs max size`.
                 the specified host.
             ''')
             Conf('retrieve job logs retry delays', VDR.V_INTERVAL_LIST,
                  desc='''
                 Global default for the
-                :cylc:conf:`suite.rc[runtime][<namespace>][remote]retrieve job
+                :cylc:conf:`flow.cylc[runtime][<namespace>][remote]retrieve job
                 logs retry delays`.
                 setting for the specified host.
             ''')
             Conf('task event handler retry delays', VDR.V_INTERVAL_LIST,
                  desc='''
                 Host specific default for
-                :cylc:conf:`suite.rc[runtime][<namespace>][events]handler retry
-                delays`.
+                :cylc:conf:`flow.cylc[runtime][<namespace>][events]handler
+                retry delays`.
             ''')
             Conf('tail command template',
                  VDR.V_STRING, 'tail -n +1 -F %(filename)s', desc='''
@@ -471,7 +476,7 @@
     # task
     with Conf('task events', desc='''
         Global site/user defaults for
-        :cylc:conf:`suite.rc[runtime][<namespace>][events]`.
+        :cylc:conf:`flow.cylc[runtime][<namespace>][events]`.
     '''):
         Conf('execution timeout', VDR.V_INTERVAL)
         Conf('handlers', VDR.V_STRING_LIST)
@@ -489,7 +494,7 @@
         Settings for the automated development tests.
 
         .. note::
-           The test battery reads ``flow-tests.rc`` instead of the normal
+           The test battery reads ``global-tests.cylc`` instead of the normal
            site/user global config files (from the same locations, however).
     '''):
         Conf('remote platform with shared fs', VDR.V_STRING, desc='''
@@ -584,7 +589,7 @@
     with Conf('authentication', desc='''
         Authentication of client programs with suite server programs can be
         configured here, and overridden in suites if necessary with
-        :cylc:conf:`suite.rc[cylc][authentication]`.
+        :cylc:conf:`flow.cylc[cylc][authentication]`.
 
         The suite-specific passphrase must be installed on a user's account to
         authorize full control privileges (see
@@ -686,7 +691,7 @@ class GlobalConfig(ParsecConfig):
 
     _DEFAULT = None
     _HOME = os.getenv('HOME') or get_user_home()
-    CONF_BASENAME = "flow.rc"
+    CONF_BASENAME = "global.cylc"
     SITE_CONF_DIR = os.path.join(os.sep, 'etc', 'cylc', 'flow', CYLC_VERSION)
     USER_CONF_DIR = os.path.join(_HOME, '.cylc', 'flow', CYLC_VERSION)
 
diff --git a/cylc/flow/cfgspec/suite.py b/cylc/flow/cfgspec/suite.py
index a2b160453a2..ea80106ca92 100644
--- a/cylc/flow/cfgspec/suite.py
+++ b/cylc/flow/cfgspec/suite.py
@@ -34,13 +34,19 @@
 REC_COMMAND = re.compile(r'(`|\$\()\s*(.*)\s*([`)])$')
 
 with Conf(
-    'suite.rc',
+    'flow.cylc',
     desc='''
         Defines a cylc suite configuration.
 
         Embedded Jinja2 code (see :ref:`Jinja`) must process to a valid
-        raw suite.rc file. See also :ref:`SuiteRCFile` for a descriptive
-        overview of suite.rc files, including syntax (:ref:`Syntax`).
+        raw flow.cylc file. See also :ref:`FlowConfigFile` for a descriptive
+        overview of flow.cylc files, including syntax (:ref:`Syntax`).
+
+        .. note::
+
+           Prior to Cylc 8, this was named ``suite.rc``, but that
+           name is now deprecated. The ``cylc run`` command will automatically
+           symlink an existing ``suite.rc`` file to ``flow.cylc``.
     '''
 ) as SPEC:
 
@@ -66,7 +72,7 @@
             A web URL to suite documentation.  If present it can be browsed
             with the ``cylc doc`` command. The string template
             ``%(suite_name)s`` will be replaced with the actual suite name.
-            See also :cylc:conf:`suite.rc[runtime][<namespace>][meta]URL`.
+            See also :cylc:conf:`flow.cylc[runtime][<namespace>][meta]URL`.
 
             Example:
 
@@ -201,14 +207,14 @@
 
             In date-time cycling, if you do not provide time zone information
             for this, it will be assumed to be local time, or in UTC if
-            :cylc:conf:`suite.rc[cylc]UTC mode` is set, or in the time zone
-            determined by :cylc:conf`suite.rc[cylc][cycle point time zone]`.
+            :cylc:conf:`flow.cylc[cylc]UTC mode` is set, or in the time zone
+            determined by :cylc:conf`flow.cylc[cylc][cycle point time zone]`.
 
             The string ``now`` converts to the current date-time on the suite
             host (adjusted to UTC if the suite is in UTC mode but the host is
             not) to minute resolution.  Minutes (or hours, etc.) may be
             ignored depending on the value of
-            :cylc:conf:`suite.rc[cylc]cycle point format`.
+            :cylc:conf:`flow.cylc[cylc]cycle point format`.
         ''')
         Conf('final cycle point', VDR.V_STRING, desc='''
             Cycling tasks are held once they pass the final cycle point, if
@@ -218,9 +224,9 @@
 
             In date-time cycling, if you do not provide time zone information
             for this, it will be assumed to be local time, or in UTC if
-            :cylc:conf:`suite.rc[cylc]UTC mode`
+            :cylc:conf:`flow.cylc[cylc]UTC mode`
             is set, or in the time zone determined by
-            :cylc:conf`suite.rc[cylc][cycle point time zone]`.
+            :cylc:conf`flow.cylc[cylc][cycle point time zone]`.
         ''')
         Conf('initial cycle point constraints', VDR.V_STRING_LIST, desc='''
             in a cycling suite it is possible to restrict the initial cycle
@@ -675,7 +681,8 @@
 
                 The top level share and work directory location can be changed
                 (e.g. to a large data area) by a global config setting (see
-                :cylc:conf:`flow.rc[hosts][<hostname glob>]work directory`).
+                :cylc:conf:`global.cylc[hosts][<hostname glob>]
+                work directory`).
 
                 .. note::
 
@@ -732,7 +739,7 @@
                         ``%(task_name)s`` will be replaced with the actual
                         suite and task names.
 
-                        See also :cylc:conf:`[meta]URL <suite.rc[meta]URL>`.
+                        See also :cylc:conf:`[meta]URL <flow.cylc[meta]URL>`.
 
                         Example:
 
@@ -855,7 +862,7 @@
             with Conf('events', desc='''
                 Cylc can call nominated event handlers when certain task
                 events occur. This section configures specific task event
-                handlers; see :cylc:conf:`suite.rc[cylc][events]` for
+                handlers; see :cylc:conf:`flow.cylc[cylc][events]` for
                 suite event handlers.
 
                 Event handlers can be located in the suite ``bin/`` directory,
@@ -1078,7 +1085,7 @@
                     script without evaluation or manipulation by cylc, so any
                     variable assignment expression that is legal in the job
                     submission shell can be used.  White space around the
-                    ``=`` is allowed (as far as cylc's suite.rc parser is
+                    ``=`` is allowed (as far as cylc's flow.cylc parser is
                     concerned these are just normal configuration items).
 
                     Examples::
@@ -1089,7 +1096,7 @@
                        WAZ = ${FOO%.jpg}.png
                        NEXT_CYCLE = $( cylc cycle-point --offset=PT6H )
                        ZAZ = "${FOO#bar}"
-                       # ^ quoted to escape the suite.rc comment character
+                       # ^ quoted to escape the flow.cylc comment character
                 ''')
 
             with Conf('directives', desc='''
diff --git a/cylc/flow/config.py b/cylc/flow/config.py
index eda253e7048..9efa2991a9b 100644
--- a/cylc/flow/config.py
+++ b/cylc/flow/config.py
@@ -489,9 +489,9 @@ def __init__(
 
             self.cfg['scheduling']['special tasks'][s_type] = result
 
-        self.collapsed_families_rc = (
+        self.collapsed_families_config = (
             self.cfg['visualization']['collapsed families'])
-        for fam in self.collapsed_families_rc:
+        for fam in self.collapsed_families_config:
             if fam not in self.runtime['first-parent descendants']:
                 raise SuiteConfigError(
                     '[visualization]collapsed families: '
@@ -503,7 +503,7 @@ def __init__(
         elif is_reload:
             self.closed_families = []
         else:
-            self.closed_families = self.collapsed_families_rc
+            self.closed_families = self.collapsed_families_config
         for cfam in self.closed_families:
             if cfam not in self.runtime['descendants']:
                 self.closed_families.remove(cfam)
@@ -626,7 +626,7 @@ def __init__(
 
         # (Note that we're retaining 'default node attributes' even
         # though this could now be achieved by styling the root family,
-        # because putting default attributes for root in the suite.rc spec
+        # because putting default attributes for root in the flow.cylc spec
         # results in root appearing last in the ordered dict of node
         # names, so it overrides the styling for lesser groups and
         # nodes, whereas the reverse is needed - fixing this would
@@ -704,7 +704,7 @@ def __init__(
         self.mem_log("config.py: end init config")
 
     def process_initial_cycle_point(self):
-        """Validate and set initial cycle point from suiterc.
+        """Validate and set initial cycle point from flow.cylc.
 
         Sets:
             self.initial_point
@@ -1451,7 +1451,7 @@ def check_tasks(self):
         huge suites (several thousand tasks).
         Note:
           (a) self.cfg['runtime'][name]
-              contains the task definition sections of the suite.rc file.
+              contains the task definition sections of the flow.cylc file.
           (b) self.taskdefs[name]
               contains tasks that will be used, defined by the graph.
         Tasks (a) may be defined but not used (e.g. commented out of the
@@ -1569,10 +1569,10 @@ def generate_taskdefs(self, orig_expr, left_nodes, right, seq, suicide):
                 replicate(self.cfg['runtime'][name],
                           self.cfg['runtime']['root'])
                 if 'root' not in self.runtime['descendants']:
-                    # (happens when no runtimes are defined in the suite.rc)
+                    # (happens when no runtimes are defined in flow.cylc)
                     self.runtime['descendants']['root'] = []
                 if 'root' not in self.runtime['first-parent descendants']:
-                    # (happens when no runtimes are defined in the suite.rc)
+                    # (happens when no runtimes are defined in flow.cylc)
                     self.runtime['first-parent descendants']['root'] = []
                 self.runtime['parents'][name] = ['root']
                 self.runtime['linearized ancestors'][name] = [name, 'root']
@@ -1746,7 +1746,7 @@ def get_graph_raw(self, start_point_string, stop_point_string,
 
         if self.first_graph:
             self.first_graph = False
-            if not self.collapsed_families_rc and not ungroup_all:
+            if not self.collapsed_families_config and not ungroup_all:
                 # initially default to collapsing all families if
                 # "[visualization]collapsed families" not defined
                 group_all = True
@@ -1754,8 +1754,8 @@ def get_graph_raw(self, start_point_string, stop_point_string,
         first_parent_descendants = self.runtime['first-parent descendants']
         if group_all:
             # Group all family nodes
-            if self.collapsed_families_rc:
-                self.closed_families = copy(self.collapsed_families_rc)
+            if self.collapsed_families_config:
+                self.closed_families = copy(self.collapsed_families_config)
             else:
                 for fam in first_parent_descendants:
                     if fam != 'root':
diff --git a/cylc/flow/etc/flow-tests.rc.eg b/cylc/flow/etc/global-tests.cylc.eg
similarity index 62%
rename from cylc/flow/etc/flow-tests.rc.eg
rename to cylc/flow/etc/global-tests.cylc.eg
index 4ed68987b47..a9116dd9d18 100644
--- a/cylc/flow/etc/flow-tests.rc.eg
+++ b/cylc/flow/etc/global-tests.cylc.eg
@@ -3,16 +3,17 @@
 #------------------------------------------------------------------------------
 # Some functional tests need to modify or ignore installed global configuration
 # values; they therefore ignore the standard site and user global config files
-# and start from a special flow-tests.rc file instead. These should contain the
-# minimal essential settings (e.g. for host names) needed to run at your site.
+# and start from a special global-tests.cylc file instead. These should contain
+# the minimal essential settings (e.g. for host names) needed to run at your
+# site.
 #
-# See documentation in flow.rc.eg
+# See documentation in global.cylc.eg
 #
 #------------------------------------------------------------------------------
-## GLOBAL flow-tests.rc FILE LOCATIONS:
+## GLOBAL global-tests.cylc FILE LOCATIONS:
 #----------------
 # SITE:
-#   /etc/cylc/flow/<CYLC-VERSION>/flow-tests.rc
+#   /etc/cylc/flow/<CYLC-VERSION>/global-tests.cylc
 # USER:
-#   $HOME/.cylc/flow/<CYLC-VERSION>/flow-tests.rc
+#   $HOME/.cylc/flow/<CYLC-VERSION>/global-tests.cylc
 #------------------------------------------------------------------------------
diff --git a/cylc/flow/etc/flow.rc.eg b/cylc/flow/etc/global.cylc.eg
similarity index 68%
rename from cylc/flow/etc/flow.rc.eg
rename to cylc/flow/etc/global.cylc.eg
index 932846b3b18..5717febe3a7 100644
--- a/cylc/flow/etc/flow.rc.eg
+++ b/cylc/flow/etc/global.cylc.eg
@@ -1,23 +1,23 @@
 #------------------------------------------------------------------------------
-# How to create a site or user flow.rc global config file.
+# How to create a site or user global.cylc global config file.
 #------------------------------------------------------------------------------
 # The "cylc get-global-config" command prints global config defaults,
 # overridden by site global settings (if any), overridden by user global
 # settings (if any).
 #
 # To generate a new global config file:
-#   % cylc get-global-config > flow.rc
+#   % cylc get-global-config > global.cylc
 # Edit any settings that you need to modify.
 # Delete or comment out any seeting you do not need (to avoid inadvertently
 # overriding defaults or site settings that may change in the future).
 #
-# For available configuration items, see the global flow.rc reference in the
+# For available configuration items, see the global global.cylc reference in the
 # User Guide.
 #
-# GLOBAL flow.rc FILE LOCATIONS:
+# GLOBAL global.cylc FILE LOCATIONS:
 #----------------
 # SITE:
-#   /etc/cylc/flow/<CYLC-VERSION>/flow.rc
+#   /etc/cylc/flow/<CYLC-VERSION>/global.cylc
 # USER:
-#   $HOME/.cylc/flow/<CYLC-VERSION>/flow.rc
+#   $HOME/.cylc/flow/<CYLC-VERSION>/global.cylc
 #------------------------------------------------------------------------------
diff --git a/cylc/flow/etc/syntax/cylc-mode.el b/cylc/flow/etc/syntax/cylc-mode.el
index 31ebf31e0c3..3d9057899d9 100644
--- a/cylc/flow/etc/syntax/cylc-mode.el
+++ b/cylc/flow/etc/syntax/cylc-mode.el
@@ -1,7 +1,8 @@
 ;; ____________________________________________________________________________
 ;;
 ;; = cylc-mode.el =
-;;    Emacs syntax highlighting mode for Cylc suite definition (suite.rc) files
+;;    Emacs syntax highlighting mode for Cylc suite definition (flow.cylc)
+;;    files
 ;; ____________________________________________________________________________
 ;;
 ;; = Instructions =
@@ -36,7 +37,7 @@
 
 ;; Define the mode and the syntax highlighting for it
 (define-derived-mode cylc-mode fundamental-mode
-  "suite.rc" "Major mode for editing Cylc suite definition files"
+  "flow.cylc" "Major mode for editing Cylc suite definition files"
 
   ;; Note: ordered according to reverse application precedence, where
   ;; specification order for faces changes resultant highlighting
@@ -114,5 +115,10 @@
 
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("suite*.rc" . cylc-mode))
+(setq auto-mode-alist
+  (append
+    '(("suite*.rc" . cylc-mode)
+      ("*.cylc" . cylc-mode))
+   auto-mode-alist))
 
 (provide 'cylc-mode)
diff --git a/cylc/flow/etc/syntax/cylc.lang b/cylc/flow/etc/syntax/cylc.lang
index 8c19693c38f..5040a14a93e 100644
--- a/cylc/flow/etc/syntax/cylc.lang
+++ b/cylc/flow/etc/syntax/cylc.lang
@@ -4,11 +4,11 @@
  and other gtksourceview programs.
 
  = Instructions =
- 
+
  To use it, place or symlink this file in
  ~/.local/share/gtksourceview-2.0/language-specs/ - or, if possible,
  /usr/share/gtksourceview-2.0/language-specs/
- 
+
  If your installation uses GNOME 3, the '2.0' in the paths will need
  to be '3.0', and the version="2.0" string below will need changing
  as well.
@@ -38,10 +38,10 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="cylc-suite-rc" _name="cylc suite.rc" version="2.0" _section="Others">
+<language id="cylc-flow" _name="cylc flow.cylc" version="2.0" _section="Others">
   <metadata>
     <property name="mimetypes">jinja2</property>
-    <property name="globs">suite*.rc</property>
+    <property name="globs">suite*.rc;*.cylc</property>
     <property name="line-comment-start">#</property>
   </metadata>
 
@@ -83,7 +83,7 @@
       </include>
     </context>
     <context id="cylc-options" style-ref="option">
-      <!-- To regenerate this keyword list, create a minimal suite.rc file and run something like:
+      <!-- To regenerate this keyword list, create a minimal flow.cylc file and run something like:
         cylc get-config my-minimal-suite | sed "/^[^=]*$/d; s/=.*//g; s/^ *//g; s/ *$//g" | sort -r | uniq | sed "s/\(.*\)/<keyword>\1<\/keyword>/g"
         -->
         <keyword>work sub-directory</keyword>
@@ -239,7 +239,7 @@
     <!-- end cylc-specific -->
 
     <!-- taken from sh.lang -->
- 
+
     <!-- we cannot use def:shell-like-comment, because
          m4.lang needs to replace this context -->
     <context id="line-comment" style-ref="comment" end-at-line-end="true">
@@ -276,7 +276,7 @@
       <include>
         <context sub-pattern="0" where="start" style-ref="keyword"/>
         <context sub-pattern="0" where="end" style-ref="keyword"/>
-        <context ref="cylc-suite-rc"/>
+        <context ref="cylc-flow"/>
       </include>
     </context>
 
@@ -666,12 +666,12 @@
         <context style-ref="others">
           <match>[^\)\s]+\s*\)|;;</match>
         </context>
-        <context ref="cylc-suite-rc"/>
+        <context ref="cylc-flow"/>
       </include>
     </context>
     <!-- end sh.lang -->
 
-    <context id="cylc-suite-rc">
+    <context id="cylc-flow">
       <include>
         <!-- cylc-specific -->
         <context ref="cylc-section"/>
diff --git a/cylc/flow/etc/syntax/cylc.vim b/cylc/flow/etc/syntax/cylc.vim
index 22d40741401..5874f9ebe29 100644
--- a/cylc/flow/etc/syntax/cylc.vim
+++ b/cylc/flow/etc/syntax/cylc.vim
@@ -1,4 +1,4 @@
-" Syntax highlighting for cylc suite.rc files.
+" Syntax highlighting for Cylc files.
 " Author: Hilary Oliver, 2011-2014
 " see :help syntax
 "______________________________________________________________________
@@ -12,11 +12,9 @@
 "
 "|augroup filetype
 "|  au! BufRead,BufnewFile *suite*.rc   set filetype=cylc
+"|  au! BufRead,BufnewFile *.cylc   set filetype=cylc
 "|augroup END
 "
-" (the wildcard in '*suite.rc' handles temporary files generated
-"  by the 'cylc view' command, e.g. /tmp/foo.bar.QYrZ0q.suite.rc)
-
 " 3) If you want to open files with syntax folds initially open, then
 "    also add the following line to your $HOME/.vimrc file:
 "
@@ -26,7 +24,7 @@
 " comments: 'hi def link cylcComment Comment'). These can be customized in
 "  your .vimrc file for consistent highlighting across file types, e.g.:
 "
-"|hi Statement guifg=#22a8e3 gui=bold 
+"|hi Statement guifg=#22a8e3 gui=bold
 "|hi Normal guifg=#9096a4
 "|hi Comment guifg=#ff6900
 "|hi Type guifg=#28d45b gui=bold"
@@ -104,4 +102,4 @@ hi def link cylcEquals LineNr
 hi def link output Special
 hi def link suicide Special
 hi def link offset Special
-hi def link trigger Constant 
+hi def link trigger Constant
diff --git a/cylc/flow/etc/syntax/cylc.xml b/cylc/flow/etc/syntax/cylc.xml
index ad3b37b95d3..d11b6de157b 100644
--- a/cylc/flow/etc/syntax/cylc.xml
+++ b/cylc/flow/etc/syntax/cylc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Cylc suite.rc" section="Configuration" extensions="suite*.rc" mimetype="" version="1.0" kateversion="2.0" author="" license="GPL">
+<language name="Cylc flow.cylc" section="Configuration" extensions="suite*.rc;*.cylc" mimetype="" version="1.0" kateversion="2.0" author="" license="GPL">
 
 <!-- For use with Kate. To use it, place or symlink this file in ~/.kde/share/apps/katepart/syntax/,
  or if possible, /usr/share/kde4/apps/katepart/syntax/ -->
@@ -9,7 +9,7 @@
 
     <contexts>
       <context name="File" attribute="Normal Text" lineEndContext="#stay">
-        <!-- To regenerate this keyword list, create a minimal suite.rc file and run something like:
+        <!-- To regenerate this keyword list, create a minimal flow.cylc file and run something like:
         cylc get-config my-minimal-suite | sed "/^[^=]*$/d; s/=.*//g; s/^ *//g; s/ *$//g" | sort -r | uniq | sed "s/\(.*\)/<RegExpr attribute='Keyword' String=' \1 '\/>/g"
         The sort is in reverse order to allow longer keywords to take precedence over sub-sets. -->
 
@@ -159,7 +159,7 @@
       <itemData name="String" defStyleNum="dsString" />
     </itemDatas>
   </highlighting>
-  
+
   <general>
     <comments>
       <comment name="multiLine" start="{#" end="#}"/>
diff --git a/cylc/flow/hostuserutil.py b/cylc/flow/hostuserutil.py
index b242e8ccfda..f1ff39dd55a 100644
--- a/cylc/flow/hostuserutil.py
+++ b/cylc/flow/hostuserutil.py
@@ -131,7 +131,7 @@ def get_host(self):
         """Return the preferred identifier for the suite (or current) host.
 
         As specified by the "suite host self-identification" settings in the
-        site/user flow.rc files. This is mainly used for suite host
+        site/user global.cylc files. This is mainly used for suite host
         identification by task jobs.
 
         """
diff --git a/cylc/flow/main_loop/auto_restart.py b/cylc/flow/main_loop/auto_restart.py
index f80ed817fdc..f8d035f3e51 100644
--- a/cylc/flow/main_loop/auto_restart.py
+++ b/cylc/flow/main_loop/auto_restart.py
@@ -16,7 +16,7 @@
 """Automatically restart suites if they are running on bad servers.
 
 Loads in the global configuration to check if the server a suite is running
-on is listed in :cylc:conf:`flow.rc[suite servers]condemned hosts`.
+on is listed in :cylc:conf:`global.cylc[suite servers]condemned hosts`.
 
 This is useful if a host needs to be taken off-line e.g. for scheduled
 maintenance.
@@ -24,13 +24,13 @@
 This functionality is configured via the following site configuration
 settings:
 
-.. cylc-scope:: flow.rc
+.. cylc-scope:: global.cylc
 
 - :cylc:conf:`[suite servers]auto restart delay`
 - :cylc:conf:`[suite servers]condemned hosts`
 - :cylc:conf:`[suite servers]run hosts`
 
-.. cylc-scope:: flow.rc[suite servers]
+.. cylc-scope:: global.cylc[suite servers]
 
 The auto stop-restart feature has two modes:
 
diff --git a/cylc/flow/network/schema.py b/cylc/flow/network/schema.py
index 1e22905cbd1..614615ec011 100644
--- a/cylc/flow/network/schema.py
+++ b/cylc/flow/network/schema.py
@@ -1446,7 +1446,7 @@ class Meta:
 
             If the suite was started with Jinja2 template variables set on the
             command line (cylc run --set FOO=bar REG) the same template
-            settings apply to the reload (only changes to the suite.rc
+            settings apply to the reload (only changes to the flow.cylc
             file itself are reloaded).
 
             If the modified suite definition does not parse, failure to reload
diff --git a/cylc/flow/option_parsers.py b/cylc/flow/option_parsers.py
index c7e39c3b726..3012299d24a 100644
--- a/cylc/flow/option_parsers.py
+++ b/cylc/flow/option_parsers.py
@@ -208,7 +208,7 @@ def add_std_options(self):
                 metavar="CYCLE_POINT",
                 help=(
                     "Set the initial cycle point. "
-                    "Required if not defined in suite.rc."
+                    "Required if not defined in flow.cylc."
                 ),
                 action="store",
                 dest="icp",
diff --git a/cylc/flow/parsec/README.md b/cylc/flow/parsec/README.md
index 623eb90f34d..215f6bc5f9d 100644
--- a/cylc/flow/parsec/README.md
+++ b/cylc/flow/parsec/README.md
@@ -3,7 +3,7 @@
 A framework for constructing nested-INI-style config file formats with
 automatic parsing, validation, default values, on-the-fly item
 obsoletion, deprecation and upgrade, and site/user-style file override
-(e.g. User's ``flow.rc`` overrides site's overrides spec default values).
+(e.g. User's ``global.cylc`` overrides site's overrides spec default values).
 
 ###  Used in Cylc for:
 
@@ -28,7 +28,7 @@ defines the "file format" (next).
 
 ### File spec
 
-**E.g. ``cylc/flow/parsec/test_spec.py`` for ``cylc/flow/parsec/test.rc`` and Cylc file
+**E.g. ``cylc/flow/parsec/test_spec.py`` for ``cylc/flow/parsec/test.cylc`` and Cylc file
 specs in ``cylc/flow/cfgspec/``.**
 
 A nested dict that contains all legal items in their proper place, and
@@ -53,12 +53,12 @@ common use cases. Includes combine two config files with precedence order.
 
 ## Testing
 
-  * **``cylc/flow/parsec/test.rc``**
+  * **``cylc/flow/parsec/test.cylc``**
     An example config file that does (or should/will) contain all types of
     config item that parsec is supposed to support.
 
   * **``cylc/flow/parsec/test_spec.py``**
-    Defines a spec for ``test.rc``, and a unit test to parse, validate, and
+    Defines a spec for ``test.cylc``, and a unit test to parse, validate, and
     print the config file. Does not test deprecation/upgrade at this stage.
 
   * **``cylc/flow/parsec/upgrade.py``**
diff --git a/cylc/flow/parsec/empysupport.py b/cylc/flow/parsec/empysupport.py
index 8cb5c636110..4c88c0acf66 100644
--- a/cylc/flow/parsec/empysupport.py
+++ b/cylc/flow/parsec/empysupport.py
@@ -46,7 +46,7 @@ def empyprocess(flines, dir_, template_vars=None):
         ftempl.close()
         xtempl.close()
 
-    suiterc = []
+    flow_config = []
     for line in xsuite.splitlines():
         # EmPy leaves blank lines where source lines contain
         # only EmPy code; this matters if line continuation
@@ -55,7 +55,7 @@ def empyprocess(flines, dir_, template_vars=None):
             continue
             # restoring newlines here is only necessary for display by
         # the cylc view command:
-        # ##suiterc.append(line + '\n')
-        suiterc.append(line)
+        # ##flow_config.append(line + '\n')
+        flow_config.append(line)
 
-    return suiterc
+    return flow_config
diff --git a/cylc/flow/parsec/example/site.rc b/cylc/flow/parsec/example/site.cylc
similarity index 100%
rename from cylc/flow/parsec/example/site.rc
rename to cylc/flow/parsec/example/site.cylc
diff --git a/cylc/flow/parsec/example/test.py b/cylc/flow/parsec/example/test.py
index 1a7e5aa436a..eca609938a5 100755
--- a/cylc/flow/parsec/example/test.py
+++ b/cylc/flow/parsec/example/test.py
@@ -42,8 +42,8 @@ def check(self, sparse):
 
 cfg = Testcfg(SPEC)
 strict = False
-cfg.loadcfg(os.path.join(os.path.dirname(__file__), 'site.rc'))
-cfg.loadcfg(os.path.join(os.path.dirname(__file__), 'user.rc'))
+cfg.loadcfg(os.path.join(os.path.dirname(__file__), 'site.cylc'))
+cfg.loadcfg(os.path.join(os.path.dirname(__file__), 'user.cylc'))
 
 cfg.dump()
 cfg.dump(['list values'])
diff --git a/cylc/flow/parsec/example/user.rc b/cylc/flow/parsec/example/user.cylc
similarity index 100%
rename from cylc/flow/parsec/example/user.rc
rename to cylc/flow/parsec/example/user.cylc
diff --git a/cylc/flow/parsec/exceptions.py b/cylc/flow/parsec/exceptions.py
index 3a6130189a4..660fad47f7c 100644
--- a/cylc/flow/parsec/exceptions.py
+++ b/cylc/flow/parsec/exceptions.py
@@ -124,8 +124,9 @@ class IncludeFileNotFoundError(ParsecError):
     def __init__(self, flist):
         """Missing include file error.
 
-        E.g. for [DIR/top.rc, DIR/inc/sub.rc, DIR/inc/gone.rc]
-        "Include-file not found: inc/gone.rc via inc/sub.rc from DIR/top.rc"
+        E.g. for [DIR/top.cylc, DIR/inc/sub.cylc, DIR/inc/gone.cylc]
+        "Include-file not found: inc/gone.cylc via inc/sub.cylc from
+        DIR/top.cylc"
         """
         rflist = copy(flist)
         top_file = rflist[0]
diff --git a/cylc/flow/parsec/jinja2support.py b/cylc/flow/parsec/jinja2support.py
index dc6e5167012..1316593b888 100644
--- a/cylc/flow/parsec/jinja2support.py
+++ b/cylc/flow/parsec/jinja2support.py
@@ -226,7 +226,7 @@ def jinja2process(flines, dir_, template_vars=None):
         filename = None
         # extract source lines
         if exc.lineno and exc.source and not exc.filename:
-            # error in suite.rc or cylc include file
+            # error in flow.cylc or cylc include file
             lines = exc.source.splitlines()
         elif exc.lineno and exc.filename:
             # error in jinja2 include file
@@ -249,7 +249,7 @@ def jinja2process(flines, dir_, template_vars=None):
             lines = flines[max(lineno - CONTEXT_LINES, 0):lineno]
         raise Jinja2Error(exc, lines=lines)
 
-    suiterc = []
+    flow_config = []
     for line in lines:
         # Jinja2 leaves blank lines where source lines contain
         # only Jinja2 code; this matters if line continuation
@@ -258,7 +258,7 @@ def jinja2process(flines, dir_, template_vars=None):
             continue
             # restoring newlines here is only necessary for display by
         # the cylc view command:
-        # ##suiterc.append(line + '\n')
-        suiterc.append(line)
+        # ##flow_config.append(line + '\n')
+        flow_config.append(line)
 
-    return suiterc
+    return flow_config
diff --git a/cylc/flow/pathutil.py b/cylc/flow/pathutil.py
index 10c8e3eee8a..d7b6215fc5a 100644
--- a/cylc/flow/pathutil.py
+++ b/cylc/flow/pathutil.py
@@ -73,9 +73,9 @@ def get_suite_run_log_name(suite):
     return expandvars(path)
 
 
-def get_suite_run_rc_dir(suite, *args):
-    """Return suite run suite.rc log directory, join any extra args."""
-    return expandvars(get_suite_run_dir(suite, 'log', 'suiterc', *args))
+def get_suite_run_config_log_dir(suite, *args):
+    """Return suite run flow.cylc log directory, join any extra args."""
+    return expandvars(get_suite_run_dir(suite, 'log', 'flow-config', *args))
 
 
 def get_suite_run_pub_db_name(suite):
@@ -125,7 +125,7 @@ def make_suite_run_tree(suite):
         get_suite_run_dir(suite),
         get_suite_run_log_dir(suite),
         get_suite_run_job_dir(suite),
-        get_suite_run_rc_dir(suite),
+        get_suite_run_config_log_dir(suite),
         get_suite_run_share_dir(suite),
         get_suite_run_work_dir(suite),
     ):
diff --git a/cylc/flow/platforms.py b/cylc/flow/platforms.py
index b62989882d7..cbf440b65f8 100644
--- a/cylc/flow/platforms.py
+++ b/cylc/flow/platforms.py
@@ -29,15 +29,15 @@ def platform_from_name(platform_name=None, platforms=None):
     Find out which job platform to use given a list of possible platforms and
     a task platform string.
 
-    Verifies selected platform is present in global.rc file and returns it,
-    raises error if platform is not in global.rc or returns 'localhost' if
+    Verifies selected platform is present in global.cylc file and returns it,
+    raises error if platfrom is not in global.cylc or returns 'localhost' if
     no platform is initally selected.
 
     Args:
         platform_name (str):
             name of platform to be retrieved.
         platforms ():
-            globalrc platforms given as a dict for logic testing purposes
+            global.cylc platforms given as a dict for logic testing purposes
 
     Returns:
         platform (dict):
diff --git a/cylc/flow/resources.py b/cylc/flow/resources.py
index 45910813f9b..4cc82bbd200 100644
--- a/cylc/flow/resources.py
+++ b/cylc/flow/resources.py
@@ -25,8 +25,8 @@
 
 
 resource_names = [
-    'etc/flow.rc.eg',
-    'etc/flow-tests.rc.eg',
+    'etc/global.cylc.eg',
+    'etc/global-tests.cylc.eg',
     'etc/syntax/cylc-mode.el',
     'etc/syntax/cylc.lang',
     'etc/syntax/cylc.vim',
diff --git a/cylc/flow/scheduler.py b/cylc/flow/scheduler.py
index ab7b4943319..c5d4e6be2f6 100644
--- a/cylc/flow/scheduler.py
+++ b/cylc/flow/scheduler.py
@@ -61,7 +61,7 @@
 from cylc.flow.pathutil import (
     get_suite_run_dir,
     get_suite_run_log_dir,
-    get_suite_run_rc_dir,
+    get_suite_run_config_log_dir,
     get_suite_run_share_dir,
     get_suite_run_work_dir,
     get_suite_test_log_name,
@@ -182,8 +182,8 @@ class Scheduler:
     # configuration
     config: SuiteConfig = None  # flow config
     cylc_config: DictTree = None  # [cylc] config
-    suiterc: str = None
-    suiterc_update_time: float = None
+    flow_file: str = None
+    flow_file_update_time: float = None
 
     # directories
     suite_dir: str = None
@@ -261,7 +261,7 @@ def __init__(self, reg, options, is_restart=False):
 
         # directory information
         self.suite_dir = suite_files.get_suite_source_dir(self.suite)
-        self.suiterc = suite_files.get_suite_rc(self.suite)
+        self.flow_file = suite_files.get_flow_file(self.suite)
         self.suite_run_dir = get_suite_run_dir(self.suite)
         self.suite_work_dir = get_suite_run_work_dir(self.suite)
         self.suite_share_dir = get_suite_run_share_dir(self.suite)
@@ -400,7 +400,7 @@ async def configure(self):
         self.profiler.log_memory("scheduler.py: start configure")
         if self.is_restart:
             self.suite_db_mgr.restart_upgrade()
-            # This logic handles the lack of initial cycle point in "suite.rc".
+            # This logic handles lack of initial cycle point in "flow.cylc".
             # Things that can't change on suite reload.
             pri_dao = self.suite_db_mgr.get_pri_dao()
             pri_dao.select_suite_params(self._load_suite_params)
@@ -424,9 +424,9 @@ async def configure(self):
                     pass
                 copytree(suite_py, suite_run_py)
 
-        self.profiler.log_memory("scheduler.py: before load_suiterc")
-        self.load_suiterc()
-        self.profiler.log_memory("scheduler.py: after load_suiterc")
+        self.profiler.log_memory("scheduler.py: before load_flow_file")
+        self.load_flow_file()
+        self.profiler.log_memory("scheduler.py: after load_flow_file")
 
         self.suite_db_mgr.on_suite_start(self.is_restart)
 
@@ -1140,7 +1140,7 @@ def command_reload_suite(self):
         LOG.info("Reloading the suite definition.")
         old_tasks = set(self.config.get_task_name_list())
         self.suite_db_mgr.checkpoint("reload-init")
-        self.load_suiterc(is_reload=True)
+        self.load_flow_file(is_reload=True)
         self.broadcast_mgr.linearized_ancestors = (
             self.config.get_linearized_ancestors())
         self.pool.set_do_reload(self.config)
@@ -1231,12 +1231,12 @@ def _configure_contact(self):
         suite_files.dump_contact_file(self.suite, contact_data)
         self.contact_data = contact_data
 
-    def load_suiterc(self, is_reload=False):
+    def load_flow_file(self, is_reload=False):
         """Load, and log the suite definition."""
         # Local suite environment set therein.
         self.config = SuiteConfig(
             self.suite,
-            self.suiterc,
+            self.flow_file,
             self.options,
             self.template_vars,
             is_reload=is_reload,
@@ -1244,7 +1244,7 @@ def load_suiterc(self, is_reload=False):
             mem_log_func=self.profiler.log_memory,
             output_fname=os.path.join(
                 self.suite_run_dir,
-                suite_files.SuiteFiles.SUITE_RC + '.processed'),
+                suite_files.SuiteFiles.FLOW_FILE + '.processed'),
             run_dir=self.suite_run_dir,
             log_dir=self.suite_log_dir,
             work_dir=self.suite_work_dir,
@@ -1254,8 +1254,8 @@ def load_suiterc(self, is_reload=False):
             self.config.cfg['cylc'],
             glbl_cfg().get(['cylc'])
         )
-        self.suiterc_update_time = time()
-        # Dump the loaded suiterc for future reference.
+        self.flow_file_update_time = time()
+        # Dump the loaded flow.cylc file for future reference.
         time_str = get_current_time_string(
             override_use_utc=True, use_basic_format=True,
             display_sub_seconds=False
@@ -1266,8 +1266,8 @@ def load_suiterc(self, is_reload=False):
             load_type = "restart"
         else:
             load_type = "run"
-        file_name = get_suite_run_rc_dir(
-            self.suite, f"{time_str}-{load_type}.rc")
+        file_name = get_suite_run_config_log_dir(
+            self.suite, f"{time_str}-{load_type}.cylc")
         with open(file_name, "wb") as handle:
             handle.write(b"# cylc-version: %s\n" % CYLC_VERSION.encode())
             printcfg(self.config.cfg, none_str=None, handle=handle)
diff --git a/cylc/flow/scheduler_cli.py b/cylc/flow/scheduler_cli.py
index e603cb41393..0e030f65736 100644
--- a/cylc/flow/scheduler_cli.py
+++ b/cylc/flow/scheduler_cli.py
@@ -53,16 +53,16 @@
     # Run the suite registered with name REG.
     $ cylc run REG
 
-    # Register $PWD/suite.rc as $(basename $PWD) and run it.
+    # Register $PWD/flow.cylc as $(basename $PWD) and run it.
     # Note REG must be given explicitly if START_POINT is on the command line.
     $ cylc run
 
 A "cold start" (the default) starts from the suite initial cycle point
-(specified in the suite.rc or on the command line). Any dependence on tasks
+(specified in flow.cylc or on the command line). Any dependence on tasks
 prior to the suite initial cycle point is ignored.
 
 A "warm start" (-w/--warm) starts from a given cycle point later than the suite
-initial cycle point (specified in the suite.rc). Any dependence on tasks prior
+initial cycle point (specified in flow.cylc). Any dependence on tasks prior
 to the given warm start cycle point is ignored. The suite initial cycle point
 is preserved."""
 
@@ -305,7 +305,7 @@ def _start_print_blurb():
     )
     cylc_license = """
 The Cylc Suite Engine [%s]
-Copyright (C) 2008-2019 NIWA
+Copyright (C) 2008-2020 NIWA
 & British Crown (Met Office) & Contributors.
 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
 This program comes with ABSOLUTELY NO WARRANTY.
diff --git a/cylc/flow/scripts/cylc_broadcast.py b/cylc/flow/scripts/cylc_broadcast.py
index 06f08401acd..003151ef5ab 100755
--- a/cylc/flow/scripts/cylc_broadcast.py
+++ b/cylc/flow/scripts/cylc_broadcast.py
@@ -49,15 +49,15 @@
 To broadcast a variable to all tasks (quote items with internal spaces):
   % cylc broadcast -s "[environment]VERSE = the quick brown fox" REG
 To do the same with a file:
-  % cat >'broadcast.rc' <<'__RC__'
+  % cat >'broadcast.cylc' <<'__FLOW__'
   % [environment]
   %     VERSE = the quick brown fox
-  % __RC__
-  % cylc broadcast -F 'broadcast.rc' REG
+  % __FLOW__
+  % cylc broadcast -F 'broadcast.cylc' REG
 To cancel the same broadcast:
   % cylc broadcast --cancel "[environment]VERSE" REG
 If -F FILE was used, the same file can be used to cancel the broadcast:
-  % cylc broadcast -G 'broadcast.rc' REG
+  % cylc broadcast -G 'broadcast.cylc' REG
 
 Use -d/--display to see active broadcasts. Multiple --cancel options or
 multiple --set and --set-file options can be used on the same command line.
diff --git a/cylc/flow/scripts/cylc_check_versions.py b/cylc/flow/scripts/cylc_check_versions.py
index 878c0151674..35548adc82d 100755
--- a/cylc/flow/scripts/cylc_check_versions.py
+++ b/cylc/flow/scripts/cylc_check_versions.py
@@ -62,12 +62,12 @@ def get_option_parser():
 @cli_function(get_option_parser)
 def main(_, options, *args):
     # suite name or file path
-    suite, suiterc = parse_suite_arg(options, args[0])
+    suite, flow_file = parse_suite_arg(options, args[0])
 
     # extract task host platforms from the suite
     config = SuiteConfig(
         suite,
-        suiterc,
+        flow_file,
         options,
         load_template_vars(options.templatevars, options.templatevars_file))
 
diff --git a/cylc/flow/scripts/cylc_diff.py b/cylc/flow/scripts/cylc_diff.py
index 1760b1ce46a..a61882ba5d1 100755
--- a/cylc/flow/scripts/cylc_diff.py
+++ b/cylc/flow/scripts/cylc_diff.py
@@ -20,7 +20,7 @@
 
 Compare two suite definitions and display any differences.
 
-Differencing is done after parsing the suite.rc files so it takes
+Differencing is done after parsing the flow.cylc files so it takes
 account of default values that are not explicitly defined, it disregards
 the order of configuration items, and it sees any include-file content
 after inlining has occurred.
@@ -117,7 +117,7 @@ def get_option_parser():
 
     parser.add_option(
         "-n", "--nested",
-        help="print suite.rc section headings in nested form.",
+        help="print flow.cylc section headings in nested form.",
         action="store_true", default=False, dest="nested")
 
     return parser
@@ -125,23 +125,25 @@ def get_option_parser():
 
 @cli_function(get_option_parser)
 def main(parser, options, *args):
-    suite1, suite1rc = parse_suite_arg(options, args[0])
-    suite2, suite2rc = parse_suite_arg(options, args[1])
-    if suite1 == suite2:
+    suite1_name, suite1_config = parse_suite_arg(options, args[0])
+    suite2_name, suite2_config = parse_suite_arg(options, args[1])
+    if suite1_name == suite2_name:
         parser.error("You can't diff a single suite.")
-    print("Parsing %s (%s)" % (suite1, suite1rc))
+    print(f"Parsing {suite1_name} ({suite1_config})")
     template_vars = load_template_vars(
         options.templatevars, options.templatevars_file)
-    config1 = SuiteConfig(suite1, suite1rc, options, template_vars).cfg
-    print("Parsing %s (%s)" % (suite2, suite2rc))
+    config1 = SuiteConfig(
+        suite1_name, suite1_config, options, template_vars).cfg
+    print(f"Parsing {suite2_name} ({suite2_config})")
     config2 = SuiteConfig(
-        suite2, suite2rc, options, template_vars, is_reload=True).cfg
+        suite2_name, suite2_config, options, template_vars, is_reload=True).cfg
 
     if config1 == config2:
-        print("Suite definitions %s and %s are identical" % (suite1, suite2))
+        print(f"Suite definitions {suite1_name} and {suite2_name} are "
+              f"identical")
         sys.exit(0)
 
-    print("Suite definitions %s and %s differ" % (suite1, suite2))
+    print(f"Suite definitions {suite1_name} and {suite2_name} differ")
 
     suite1_only = {}
     suite2_only = {}
@@ -150,22 +152,16 @@ def main(parser, options, *args):
     diffdict(config1, config2, suite1_only, suite2_only, diff_1_2)
 
     if n_oone > 0:
-        print()
-        msg = str(n_oone) + ' items only in ' + suite1 + ' (<)'
-        print(msg)
+        print(f'\n{n_oone} items only in {suite1_name} (<)')
         prdict(suite1_only, '<', nested=options.nested)
 
     if n_otwo > 0:
-        print()
-        msg = str(n_otwo) + ' items only in ' + suite2 + ' (>)'
-        print(msg)
+        print(f'\n{n_otwo} items only in {suite2_name} (>)')
         prdict(suite2_only, '>', nested=options.nested)
 
     if n_diff > 0:
-        print()
-        msg = (str(n_diff) + ' common items differ ' +
-               suite1 + '(<) ' + suite2 + '(>)')
-        print(msg)
+        print(f'\n{n_diff} common items differ {suite1_name}(<) '
+              f'{suite2_name}(>)')
         prdict(diff_1_2, '', diff=True, nested=options.nested)
 
 
diff --git a/cylc/flow/scripts/cylc_edit.py b/cylc/flow/scripts/cylc_edit.py
index 308dc6f47ec..a31e3b196b7 100755
--- a/cylc/flow/scripts/cylc_edit.py
+++ b/cylc/flow/scripts/cylc_edit.py
@@ -24,11 +24,11 @@
 version can be viewed with 'cylc [prep] view -p'.
 
 1/cylc [prep] edit SUITE
-Change to the suite definition directory and edit the suite.rc file.
+Change to the suite definition directory and edit the flow.cylc file.
 
 2/ cylc [prep] edit -i,--inline SUITE
 Edit the suite with include-files inlined between special markers. The
-original suite.rc file is temporarily replaced so that the inlined
+original flow.cylc file is temporarily replaced so that the inlined
 version is "live" during editing (i.e. you can run suites during
 editing and cylc will pick up changes to the suite definition). The
 inlined file is then split into its constituent include-files
@@ -39,19 +39,19 @@
 3/ cylc [prep] edit --cleanup SUITE
 Remove backup files left by previous INLINED edit sessions.
 
-INLINED EDITING SAFETY: The suite.rc file and its include-files are
+INLINED EDITING SAFETY: The flow.cylc file and its include-files are
 automatically backed up prior to an inlined editing session. If the
 editor dies mid-session just invoke 'cylc edit -i' again to recover from
 the last saved inlined file. On exiting the editor, if any of the
 original include-files are found to have changed due to external
 intervention during editing you will be warned and the affected files
 will be written to new backups instead of overwriting the originals.
-Finally, the inlined suite.rc file is also backed up on exiting
+Finally, the inlined flow.cylc file is also backed up on exiting
 the editor, to allow recovery in case of accidental corruption of the
 include-file boundary markers in the inlined file.
 
 The edit process is spawned in the foreground as follows:
-  % <editor> suite.rc
+  % <editor> flow.cylc
 Where <editor> is defined in the cylc site/user config files.
 
 See also 'cylc [prep] view'."""
@@ -102,14 +102,14 @@ def get_option_parser():
 
 @cli_function(get_option_parser)
 def main(parser, options, *args):
-    suiterc = parse_suite_arg(options, args[0])[1]
+    flow_file = parse_suite_arg(options, args[0])[1]
 
     if options.geditor:
         editor = glbl_cfg().get(['editors', 'gui'])
     else:
         editor = glbl_cfg().get(['editors', 'terminal'])
 
-    suitedir = os.path.dirname(suiterc)
+    suitedir = os.path.dirname(flow_file)
 
     if options.cleanup:
         # remove backup files left by inlined editing sessions
@@ -121,13 +121,13 @@ def main(parser, options, *args):
         # move to suite def dir
         os.chdir(suitedir)
 
-        # edit the suite.rc file
-        if not os.path.isfile(suiterc):
-            raise UserInputError(f'file not found: {suiterc}')
+        # edit the flow.cylc file
+        if not os.path.isfile(flow_file):
+            raise UserInputError(f'file not found: {flow_file}')
 
         # in case editor has options, e.g. 'emacs -nw':
         command_list = re.split(' ', editor)
-        command_list.append(suiterc)
+        command_list.append(flow_file)
         command = ' '.join(command_list)
         # THIS BLOCKS UNTIL THE COMMAND COMPLETES
         retcode = call(command_list)
@@ -138,14 +138,14 @@ def main(parser, options, *args):
         # !!!EDITING FINISHED!!!
         sys.exit(0)
 
-    # read the suite.rc file
-    if os.path.isfile(suiterc):
+    # read the flow.cylc file
+    if os.path.isfile(flow_file):
         # back up the original
-        backup(suiterc)
+        backup(flow_file)
         # record original modtime
-        modtimes[suiterc] = os.stat(suiterc).st_mtime
+        modtimes[flow_file] = os.stat(flow_file).st_mtime
         # read the file
-        h = open(suiterc, 'r')
+        h = open(flow_file, 'r')
         lines0 = h.readlines()
         h.close()
         if lines0[0].startswith('# !WARNING! CYLC EDIT INLINED'):
@@ -154,14 +154,14 @@ def main(parser, options, *args):
             lines = lines0
         else:
             recovery = False
-            lines = inline(lines0, suitedir, suiterc, for_edit=True)
+            lines = inline(lines0, suitedir, flow_file, for_edit=True)
     else:
-        parser.error("File not found: " + suiterc)
+        parser.error(f"File not found: {flow_file}")
 
     lines = [i.rstrip() for i in lines]
 
     # overwrite the (now backed up) original with the inlined file:
-    h = open(suiterc, 'wb')
+    h = open(flow_file, 'wb')
     for line in lines:
         h.write((line + '\n').encode())
     h.close()
@@ -174,7 +174,7 @@ def main(parser, options, *args):
 
     # in case editor has options, e.g. 'emacs -nw':
     command_list = re.split(' ', editor)
-    command_list.append(suiterc)
+    command_list.append(flow_file)
     command = ' '.join(command_list)
     # THIS BLOCKS UNTIL THE COMMAND COMPLETES
     retcode = call(command_list)
@@ -185,22 +185,22 @@ def main(parser, options, *args):
 
     # Now back up the inlined file in case of absolute disaster, so as the
     # user or his editor corrupting the inlined-include-file marker lines.
-    inlined_suiterc_backup = (
-        suitedir + '/suite.rc.INLINED.EDIT.' +
+    inlined_flow_file_backup = (
+        suitedir + '/flow.cylc.INLINED.EDIT.' +
         get_current_time_string(override_use_utc=True, use_basic_format=True)
     )
-    copy(suiterc, inlined_suiterc_backup)
+    copy(flow_file, inlined_flow_file_backup)
 
     # read in the edited inlined file
-    h = open(suiterc, 'r')
+    h = open(flow_file, 'r')
     lines = h.readlines()
     h.close()
 
     # split it back into separate files
-    split_file(suitedir, lines, suiterc, recovery)
+    split_file(suitedir, lines, flow_file, recovery)
 
-    print(' + edited:', suiterc)
-    print(' + backup:', inlined_suiterc_backup)
+    print(f' + edited: {flow_file}')
+    print(f' + backup: {inlined_flow_file_backup}')
     print('INCLUDE-FILES WRITTEN:')
     for file in newfiles:
         f = re.sub(suitedir + '/', '', file)
diff --git a/cylc/flow/scripts/cylc_get_suite_config.py b/cylc/flow/scripts/cylc_get_suite_config.py
index ccafa01c97f..a568cc04da9 100755
--- a/cylc/flow/scripts/cylc_get_suite_config.py
+++ b/cylc/flow/scripts/cylc_get_suite_config.py
@@ -30,7 +30,7 @@
 can be changed with the -n/--null-value option.
 
 Example:
-  |# SUITE.RC
+  |# FLOW.CYLC
   |[runtime]
   |    [[modelX]]
   |        [[[environment]]]
@@ -113,7 +113,7 @@ def get_option_parser():
 
 @cli_function(get_option_parser)
 def main(parser, options, reg):
-    suite, suiterc = parse_suite_arg(options, reg)
+    suite, flow_file = parse_suite_arg(options, reg)
 
     if options.markup:
         prefix = '!cylc!'
@@ -122,7 +122,7 @@ def main(parser, options, reg):
 
     config = SuiteConfig(
         suite,
-        suiterc,
+        flow_file,
         options,
         load_template_vars(options.templatevars, options.templatevars_file))
     if options.tasks:
diff --git a/cylc/flow/scripts/cylc_graph.py b/cylc/flow/scripts/cylc_graph.py
index 130500f96ee..e8bce152b28 100755
--- a/cylc/flow/scripts/cylc_graph.py
+++ b/cylc/flow/scripts/cylc_graph.py
@@ -27,7 +27,7 @@
 from cylc.flow.cycling.loader import get_point
 from cylc.flow.exceptions import UserInputError, SuiteServiceFileError
 from cylc.flow.option_parsers import CylcOptionParser as COP
-from cylc.flow.suite_files import get_suite_rc
+from cylc.flow.suite_files import get_flow_file
 from cylc.flow.templatevars import load_template_vars
 from cylc.flow.terminal import cli_function
 
@@ -168,12 +168,12 @@ def graph_inheritance(config):
 def get_config(suite, opts, template_vars=None):
     """Return a SuiteConfig object for the provided reg / path."""
     try:
-        suiterc = get_suite_rc(suite)
+        flow_file = get_flow_file(suite)
     except SuiteServiceFileError:
         # could not find suite, assume we have been given a path instead
-        suiterc = suite
+        flow_file = suite
         suite = 'test'
-    return SuiteConfig(suite, suiterc, opts, template_vars=template_vars)
+    return SuiteConfig(suite, flow_file, opts, template_vars=template_vars)
 
 
 def get_option_parser():
@@ -212,7 +212,7 @@ def get_option_parser():
 
     parser.add_option(
         '--icp', action='store', default=None, metavar='CYCLE_POINT', help=(
-            'Set initial cycle point. Required if not defined in suite.rc.'))
+            'Set initial cycle point. Required if not defined in flow.cylc.'))
 
     return parser
 
diff --git a/cylc/flow/scripts/cylc_list.py b/cylc/flow/scripts/cylc_list.py
index d8a9df22da0..fb7db14d630 100755
--- a/cylc/flow/scripts/cylc_list.py
+++ b/cylc/flow/scripts/cylc_list.py
@@ -83,7 +83,7 @@ def get_option_parser():
 
 @cli_function(get_option_parser)
 def main(parser, options, reg):
-    suite, suiterc = parse_suite_arg(options, reg)
+    suite, flow_file = parse_suite_arg(options, reg)
 
     if options.all_tasks and options.all_namespaces:
         parser.error("Choose either -a or -n")
@@ -114,7 +114,7 @@ def main(parser, options, reg):
               file=sys.stderr)
     config = SuiteConfig(
         suite,
-        suiterc,
+        flow_file,
         options,
         load_template_vars(options.templatevars, options.templatevars_file))
     if options.tree:
diff --git a/cylc/flow/scripts/cylc_register.py b/cylc/flow/scripts/cylc_register.py
index d1d6bf44cbd..84c56b9bbdb 100755
--- a/cylc/flow/scripts/cylc_register.py
+++ b/cylc/flow/scripts/cylc_register.py
@@ -29,13 +29,13 @@
 Suite names can be hierarchical, corresponding to the path under ~/cylc-run.
 
   % cylc register dogs/fido PATH
-Register PATH/suite.rc as dogs/fido, with run directory ~/cylc-run/dogs/fido.
+Register PATH/flow.cylc as dogs/fido, with run directory ~/cylc-run/dogs/fido.
 
   % cylc register dogs/fido
-Register $PWD/suite.rc as dogs/fido.
+Register $PWD/flow.cylc as dogs/fido.
 
   % cylc register
-Register $PWD/suite.rc as the parent directory name: $(basename $PWD).
+Register $PWD/flow.cylc as the parent directory name: $(basename $PWD).
 
 The same suite can be registered with multiple names; this results in multiple
 suite run directories that link to the same suite definition.
diff --git a/cylc/flow/scripts/cylc_reload.py b/cylc/flow/scripts/cylc_reload.py
index b8e98762f54..fa0cb26467b 100755
--- a/cylc/flow/scripts/cylc_reload.py
+++ b/cylc/flow/scripts/cylc_reload.py
@@ -25,7 +25,7 @@
 
 If the suite was started with Jinja2 template variables set on the command line
 (cylc run --set FOO=bar REG) the same template settings apply to the reload
-(only changes to the suite.rc file itself are reloaded).
+(only changes to the flow.cylc file itself are reloaded).
 
 If the modified suite definition does not parse, failure to reload will
 be reported but no harm will be done to the running suite."""
diff --git a/cylc/flow/scripts/cylc_search.py b/cylc/flow/scripts/cylc_search.py
index fb19aca325f..fa70202d120 100755
--- a/cylc/flow/scripts/cylc_search.py
+++ b/cylc/flow/scripts/cylc_search.py
@@ -74,20 +74,20 @@ def get_option_parser():
 
 @cli_function(get_option_parser)
 def main(parser, options, reg, *patterns):
-    suite, suiterc = parse_suite_arg(options, reg)
+    suite, flow_file = parse_suite_arg(options, reg)
 
     # cylc search SUITE PATTERN
     pattern = '|'.join(patterns)
 
-    suitedir = os.path.dirname(suiterc)
+    suitedir = os.path.dirname(flow_file)
 
-    if os.path.isfile(suiterc):
-        h = open(suiterc, 'r')
+    if os.path.isfile(flow_file):
+        h = open(flow_file, 'r')
         lines = h.readlines()
         h.close()
-        lines = inline(lines, suitedir, suiterc, for_grep=True)
+        lines = inline(lines, suitedir, flow_file, for_grep=True)
     else:
-        parser.error("File not found: " + suiterc)
+        parser.error(f"File not found: {flow_file}")
 
     sections = deque(['(top)'])
 
@@ -137,7 +137,7 @@ def main(parser, options, reg, *patterns):
                 curr_file = os.path.join(suitedir, inc_file)
                 line_no = inc_line_count
             else:
-                curr_file = suiterc
+                curr_file = flow_file
                 line_no = line_count
 
             if curr_file != prev_file:
diff --git a/cylc/flow/scripts/cylc_validate.py b/cylc/flow/scripts/cylc_validate.py
index 7a3a6bd1db3..f60ac9411fd 100755
--- a/cylc/flow/scripts/cylc_validate.py
+++ b/cylc/flow/scripts/cylc_validate.py
@@ -56,7 +56,7 @@ def parse_args():
 
     parser.add_option(
         "--output", "-o",
-        help="Specify a file name to dump the processed suite.rc.",
+        help="Specify a file name to dump the processed flow.cylc.",
         metavar="FILENAME", action="store", dest="output")
 
     parser.add_option(
@@ -85,10 +85,10 @@ def main(_, options, reg):
             if isinstance(handler.formatter, CylcLogFormatter):
                 handler.formatter.configure(timestamp=False)
 
-    suite, suiterc = parse_suite_arg(options, reg)
+    suite, flow_file = parse_suite_arg(options, reg)
     cfg = SuiteConfig(
         suite,
-        suiterc,
+        flow_file,
         options,
         load_template_vars(options.templatevars, options.templatevars_file),
         output_fname=options.output, mem_log_func=profiler.log_memory)
diff --git a/cylc/flow/scripts/cylc_view.py b/cylc/flow/scripts/cylc_view.py
index 46430819f19..2beda995c3b 100755
--- a/cylc/flow/scripts/cylc_view.py
+++ b/cylc/flow/scripts/cylc_view.py
@@ -18,11 +18,11 @@
 
 """cylc [prep] view [OPTIONS] ARGS
 
-View a read-only temporary copy of suite NAME's suite.rc file, in your
+View a read-only temporary copy of suite NAME's flow.cylc file, in your
 editor, after optional include-file inlining and Jinja2 preprocessing.
 
 The edit process is spawned in the foreground as follows:
-  % <editor> suite.rc
+  % <editor> flow.cylc
 Where <editor> can be set in cylc global config.
 
 For remote host or owner, the suite will be printed to stdout unless
@@ -114,14 +114,14 @@ def get_option_parser():
 
 @cli_function(get_option_parser)
 def main(parser, options, reg):
-    suite, suiterc = parse_suite_arg(options, reg)
+    suite, flow_file = parse_suite_arg(options, reg)
 
     if options.geditor:
         editor = glbl_cfg().get(['editors', 'gui'])
     else:
         editor = glbl_cfg().get(['editors', 'terminal'])
 
-    # read in the suite.rc file
+    # read in the flow.cylc file
     viewcfg = {'mark': options.mark,
                'single': options.single,
                'label': options.label,
@@ -132,7 +132,7 @@ def main(parser, options, reg):
                           or options.process),
                }
     lines = read_and_proc(
-        suiterc,
+        flow_file,
         load_template_vars(options.templatevars, options.templatevars_file),
         viewcfg=viewcfg, asedit=options.asedit)
 
@@ -143,7 +143,7 @@ def main(parser, options, reg):
 
     # write to a temporary file
     viewfile = NamedTemporaryFile(
-        suffix=".suite.rc", prefix=suite.replace('/', '_') + '.',
+        suffix=".flow.cylc", prefix=suite.replace('/', '_') + '.',
     )
     for line in lines:
         viewfile.write((line + '\n').encode())
diff --git a/cylc/flow/subprocctx.py b/cylc/flow/subprocctx.py
index 80c9c91ef6d..8354da92c92 100644
--- a/cylc/flow/subprocctx.py
+++ b/cylc/flow/subprocctx.py
@@ -113,7 +113,7 @@ class SubFuncContext(SubProcContext):
     Attributes:
         # See also parent class attributes.
         .label (str):
-            function label under [xtriggers] in suite.rc
+            function label under [xtriggers] in flow.cylc
         .func_name (str):
             function name
         .func_args (list):
diff --git a/cylc/flow/suite_files.py b/cylc/flow/suite_files.py
index 1cf65ee9478..915a66f0693 100644
--- a/cylc/flow/suite_files.py
+++ b/cylc/flow/suite_files.py
@@ -13,6 +13,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 """Suite service files management."""
 
 # Note: Some modules are NOT imported in the header. Expensive modules are only
@@ -120,8 +121,11 @@ def __init__(self, key_type, key_owner, full_key_path=None,
 class SuiteFiles:
     """Files and directories located in the suite directory."""
 
+    FLOW_FILE = 'flow.cylc'
+    """The workflow configuration file."""
+
     SUITE_RC = 'suite.rc'
-    """The suite configuration file."""
+    """Deprecated workflow configuration file."""
 
     class Service:
         """The directory containing Cylc system files."""
@@ -330,11 +334,11 @@ def get_contact_file(reg):
         get_suite_srv_dir(reg), SuiteFiles.Service.CONTACT)
 
 
-def get_suite_rc(reg, suite_owner=None):
-    """Return the suite.rc path of a suite."""
+def get_flow_file(reg, suite_owner=None):
+    """Return the path of a suite's flow.cylc file."""
     return os.path.join(
         get_suite_source_dir(reg, suite_owner),
-        SuiteFiles.SUITE_RC)
+        SuiteFiles.FLOW_FILE)
 
 
 def get_suite_source_dir(reg, suite_owner=None):
@@ -352,13 +356,15 @@ def get_suite_source_dir(reg, suite_owner=None):
             # suite exists but is not yet registered
             register(reg=reg, source=suite_d)
             return suite_d
-        else:
-            raise SuiteServiceFileError("Suite not found %s" % reg)
+        raise SuiteServiceFileError(f"Suite not found: {reg}")
     else:
-        if os.path.isabs(source):
-            return source
-        else:
-            return os.path.normpath(os.path.join(srv_d, source))
+        if not os.path.isabs(source):
+            source = os.path.normpath(os.path.join(srv_d, source))
+        flow_file_path = os.path.join(source, SuiteFiles.FLOW_FILE)
+        if not os.path.exists(flow_file_path):
+            # suite exists but is probably using deprecated suite.rc
+            register(reg=reg, source=source)
+        return source
 
 
 def get_suite_srv_dir(reg, suite_owner=None):
@@ -391,7 +397,7 @@ def load_contact_file(reg, owner=None, host=None):
 
 
 def parse_suite_arg(options, arg):
-    """From CLI arg "SUITE", return suite name and suite.rc path.
+    """From CLI arg "SUITE", return suite name and flow.cylc path.
 
     If arg is a registered suite, suite name is the registered name.
     If arg is a directory, suite name is the base name of the
@@ -402,13 +408,23 @@ def parse_suite_arg(options, arg):
     if arg == '.':
         arg = os.getcwd()
     try:
-        path = get_suite_rc(arg, options.suite_owner)
+        path = get_flow_file(arg, options.suite_owner)
         name = arg
     except SuiteServiceFileError:
         arg = os.path.abspath(arg)
         if os.path.isdir(arg):
-            path = os.path.join(arg, SuiteFiles.SUITE_RC)
+            path = os.path.join(arg, SuiteFiles.FLOW_FILE)
             name = os.path.basename(arg)
+            if not os.path.exists(path):
+                # Probably using deprecated suite.rc
+                path = os.path.join(arg, SuiteFiles.SUITE_RC)
+                if not os.path.exists(path):
+                    raise SuiteServiceFileError(
+                        f'no flow.cylc or suite.rc in {arg}')
+                else:
+                    LOG.warning(
+                        f'The filename "{SuiteFiles.SUITE_RC}" is deprecated '
+                        f'in favor of "{SuiteFiles.FLOW_FILE}".')
         else:
             path = arg
             name = os.path.basename(os.path.dirname(arg))
@@ -422,7 +438,7 @@ def register(reg=None, source=None, redirect=False, rundir=None):
 
     Args:
         reg (str): suite name, default basename($PWD).
-        source (str): directory location of suite.rc file, default $PWD.
+        source (str): directory location of flow.cylc file, default $PWD.
         redirect (bool): allow reuse of existing name and run directory.
         rundir (str): for overriding the default cylc-run directory.
 
@@ -431,7 +447,7 @@ def register(reg=None, source=None, redirect=False, rundir=None):
 
     Raise:
         SuiteServiceFileError:
-            No suite.rc file found in source location.
+            No flow.cylc file found in source location.
             Illegal name (can look like a relative path, but not absolute).
             Another suite already has this name (unless --redirect).
     """
@@ -449,15 +465,25 @@ def register(reg=None, source=None, redirect=False, rundir=None):
             "suite name cannot be an absolute path: %s" % reg)
 
     if source is not None:
-        if os.path.basename(source) == SuiteFiles.SUITE_RC:
+        if os.path.basename(source) == SuiteFiles.FLOW_FILE:
             source = os.path.dirname(source)
     else:
         source = os.getcwd()
 
-    # suite.rc must exist so we can detect accidentally reversed args.
+    # flow.cylc must exist so we can detect accidentally reversed args.
     source = os.path.abspath(source)
-    if not os.path.isfile(os.path.join(source, SuiteFiles.SUITE_RC)):
-        raise SuiteServiceFileError("no suite.rc in %s" % source)
+    flow_file_path = os.path.join(source, SuiteFiles.FLOW_FILE)
+    if not os.path.isfile(flow_file_path):
+        # If using deprecated suite.rc, symlink it into flow.cylc:
+        suite_rc_path = os.path.join(source, SuiteFiles.SUITE_RC)
+        if os.path.isfile(suite_rc_path):
+            os.symlink(suite_rc_path, flow_file_path)
+            LOG.warning(
+                f'The filename "{SuiteFiles.SUITE_RC}" is deprecated in favor '
+                f'of "{SuiteFiles.FLOW_FILE}". Symlink created.')
+        else:
+            raise SuiteServiceFileError(
+                f'no flow.cylc or suite.rc in {source}')
 
     # Create service dir if necessary.
     srv_d = get_suite_srv_dir(reg)
@@ -590,7 +616,7 @@ def get_suite_title(reg):
     * Assume title is not in an include-file.
     """
     title = NO_TITLE
-    for line in open(get_suite_rc(reg), 'rb'):
+    for line in open(get_flow_file(reg), 'rb'):
         line = line.decode()
         if line.lstrip().startswith("[meta]"):
             # continue : title comes inside [meta] section
diff --git a/etc/bin/defn-order-test.py b/etc/bin/defn-order-test.py
index 24bbf355621..bfeb7e314db 100755
--- a/etc/bin/defn-order-test.py
+++ b/etc/bin/defn-order-test.py
@@ -21,7 +21,7 @@
 
 # This is a standalone performance test of the algorithm used in gcylc to
 # sort namespaces into "definition order", i.e. the order in which they are
-# defined in the suite.rc file.
+# defined in the flow.cylc file.
 
 # Number of namespaces.
 N = 10000
diff --git a/etc/bin/run-functional-tests b/etc/bin/run-functional-tests
index d90617ce854..a188e4d2c69 100755
--- a/etc/bin/run-functional-tests
+++ b/etc/bin/run-functional-tests
@@ -27,13 +27,13 @@ NPROC is the number of concurrent processes to run, which defaults to the
 global config "process pool size" setting.
 
 The tests ignore normal site/user global config and instead use:
-   <site-global-config>/flow-tests.rc
-   <user-global-config>/flow-tests.rc
+   <site-global-config>/global-tests.cylc
+   <user-global-config>/global-tests.cylc
    (See "cylc get-global --print-site-dir/--print-user-dir for locations).
 These should specify test job hosts under the [test battery] section, plus any
 other critical settings settings, including [hosts] configuration for test job
 hosts (and special batchview commands like qcat if available). Additional
-global config items can be added on the fly using the create_test_globalrc
+global config items can be added on the fly using the create_test_global_config
 shell function defined in the test_header.
 
 Suite run directories are only cleaned up for passing tests on the suite host.
diff --git a/etc/bin/start-group-demo.sh b/etc/bin/start-group-demo.sh
index 21c9bde359a..1b19ac47f76 100755
--- a/etc/bin/start-group-demo.sh
+++ b/etc/bin/start-group-demo.sh
@@ -18,7 +18,7 @@
 
 cd "$(mktemp -d)" || exit 1
 
-cat > suite.rc <<__EOF__
+cat > flow.cylc <<__EOF__
 title = "gcylc task state color theme demo"
 description = """Generate a lot of possible task states,
 to show what they look like live in gcylc."""
@@ -98,8 +98,8 @@ for GROUP in nwp tst opr; do
     fi
     SUITE=${GROUP}-$N
     mkdir -p $DEST/$SUITE
-    cp -r suite.rc $DEST/$SUITE
-    perl -pi -e "s/\[cylc\]/title = $GROUP suite $N\ngroup = $GROUP\n[cylc]/" $DEST/$SUITE/suite.rc
+    cp -r flow.cylc $DEST/$SUITE
+    perl -pi -e "s/\[cylc\]/title = $GROUP suite $N\ngroup = $GROUP\n[cylc]/" $DEST/$SUITE/flow.cylc
     cylc reg $DEST/$SUITE $DEST/$SUITE
     cylc run $DEST/$SUITE > /dev/null &
   done
diff --git a/etc/syntax/reference-files/suite.rc b/etc/syntax/reference-files/flow.cylc
similarity index 100%
rename from etc/syntax/reference-files/suite.rc
rename to etc/syntax/reference-files/flow.cylc
diff --git a/etc/syntax/reference-files/suite_empy.rc b/etc/syntax/reference-files/flow_empy.cylc
similarity index 100%
rename from etc/syntax/reference-files/suite_empy.rc
rename to etc/syntax/reference-files/flow_empy.cylc
diff --git a/etc/syntax/reference-files/suite_jinja2.rc b/etc/syntax/reference-files/flow_jinja2.cylc
similarity index 100%
rename from etc/syntax/reference-files/suite_jinja2.rc
rename to etc/syntax/reference-files/flow_jinja2.cylc
diff --git a/tests/flakyfunctional/cyclers/19-async_integer/suite.rc b/tests/flakyfunctional/cyclers/19-async_integer/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/cyclers/19-async_integer/suite.rc
rename to tests/flakyfunctional/cyclers/19-async_integer/flow.cylc
diff --git a/tests/flakyfunctional/cyclers/30-r1_at_icp_or/suite.rc b/tests/flakyfunctional/cyclers/30-r1_at_icp_or/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/cyclers/30-r1_at_icp_or/suite.rc
rename to tests/flakyfunctional/cyclers/30-r1_at_icp_or/flow.cylc
diff --git a/tests/flakyfunctional/cylc-get-config/04-dummy-mode-output/suite.rc b/tests/flakyfunctional/cylc-get-config/04-dummy-mode-output/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/cylc-get-config/04-dummy-mode-output/suite.rc
rename to tests/flakyfunctional/cylc-get-config/04-dummy-mode-output/flow.cylc
diff --git a/tests/flakyfunctional/cylc-poll/03-poll-all/suite.rc b/tests/flakyfunctional/cylc-poll/03-poll-all/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/cylc-poll/03-poll-all/suite.rc
rename to tests/flakyfunctional/cylc-poll/03-poll-all/flow.cylc
diff --git a/tests/flakyfunctional/cylc-poll/16-execution-time-limit.t b/tests/flakyfunctional/cylc-poll/16-execution-time-limit.t
index 1e4f2aacb14..fddbe24e4c1 100755
--- a/tests/flakyfunctional/cylc-poll/16-execution-time-limit.t
+++ b/tests/flakyfunctional/cylc-poll/16-execution-time-limit.t
@@ -19,7 +19,7 @@
 . "$(dirname "$0")/test_header"
 #-------------------------------------------------------------------------------
 set_test_number 4
-create_test_globalrc '
+create_test_global_config '
 [platforms]
    [[localhost]]
         communication method = poll
diff --git a/tests/flakyfunctional/cylc-poll/16-execution-time-limit/suite.rc b/tests/flakyfunctional/cylc-poll/16-execution-time-limit/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/cylc-poll/16-execution-time-limit/suite.rc
rename to tests/flakyfunctional/cylc-poll/16-execution-time-limit/flow.cylc
diff --git a/tests/flakyfunctional/cylc-show/00-simple/suite.rc b/tests/flakyfunctional/cylc-show/00-simple/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/cylc-show/00-simple/suite.rc
rename to tests/flakyfunctional/cylc-show/00-simple/flow.cylc
diff --git a/tests/flakyfunctional/cylc-show/04-multi/suite.rc b/tests/flakyfunctional/cylc-show/04-multi/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/cylc-show/04-multi/suite.rc
rename to tests/flakyfunctional/cylc-show/04-multi/flow.cylc
diff --git a/tests/flakyfunctional/cylc-take-checkpoints/00-basic/suite.rc b/tests/flakyfunctional/cylc-take-checkpoints/00-basic/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/cylc-take-checkpoints/00-basic/suite.rc
rename to tests/flakyfunctional/cylc-take-checkpoints/00-basic/flow.cylc
diff --git a/tests/flakyfunctional/database/00-simple/suite.rc b/tests/flakyfunctional/database/00-simple/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/database/00-simple/suite.rc
rename to tests/flakyfunctional/database/00-simple/flow.cylc
diff --git a/tests/flakyfunctional/database/01-broadcast/suite.rc b/tests/flakyfunctional/database/01-broadcast/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/database/01-broadcast/suite.rc
rename to tests/flakyfunctional/database/01-broadcast/flow.cylc
diff --git a/tests/flakyfunctional/database/02-retry/suite.rc b/tests/flakyfunctional/database/02-retry/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/database/02-retry/suite.rc
rename to tests/flakyfunctional/database/02-retry/flow.cylc
diff --git a/tests/flakyfunctional/events/01-task.t b/tests/flakyfunctional/events/01-task.t
index 489876c8c7e..94cc6fc9a5b 100755
--- a/tests/flakyfunctional/events/01-task.t
+++ b/tests/flakyfunctional/events/01-task.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -21,7 +21,7 @@
 set_test_number 3
 #-------------------------------------------------------------------------------
 install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
-create_test_globalrc '
+create_test_global_config '
 [platforms]
     [[test platform]]
         hosts = NOHOST.NODOMAIN
diff --git a/tests/flakyfunctional/events/01-task/suite.rc b/tests/flakyfunctional/events/01-task/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/events/01-task/suite.rc
rename to tests/flakyfunctional/events/01-task/flow.cylc
diff --git a/tests/flakyfunctional/events/05-timeout-ref-dummy/suite.rc b/tests/flakyfunctional/events/05-timeout-ref-dummy/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/events/05-timeout-ref-dummy/suite.rc
rename to tests/flakyfunctional/events/05-timeout-ref-dummy/flow.cylc
diff --git a/tests/flakyfunctional/events/31-dont-stall-succeeded/suite.rc b/tests/flakyfunctional/events/31-dont-stall-succeeded/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/events/31-dont-stall-succeeded/suite.rc
rename to tests/flakyfunctional/events/31-dont-stall-succeeded/flow.cylc
diff --git a/tests/flakyfunctional/events/39-task-event-template-all/suite.rc b/tests/flakyfunctional/events/39-task-event-template-all/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/events/39-task-event-template-all/suite.rc
rename to tests/flakyfunctional/events/39-task-event-template-all/flow.cylc
diff --git a/tests/flakyfunctional/events/40-stall-despite-clock-trig/suite.rc b/tests/flakyfunctional/events/40-stall-despite-clock-trig/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/events/40-stall-despite-clock-trig/suite.rc
rename to tests/flakyfunctional/events/40-stall-despite-clock-trig/flow.cylc
diff --git a/tests/flakyfunctional/events/44-timeout.t b/tests/flakyfunctional/events/44-timeout.t
index d7a710320d4..5493039b029 100755
--- a/tests/flakyfunctional/events/44-timeout.t
+++ b/tests/flakyfunctional/events/44-timeout.t
@@ -22,7 +22,7 @@
 
 set_test_number 4
 
-create_test_globalrc "
+create_test_global_config "
 process pool timeout = PT10S" ""
 
 install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
diff --git a/tests/flakyfunctional/events/44-timeout/suite.rc b/tests/flakyfunctional/events/44-timeout/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/events/44-timeout/suite.rc
rename to tests/flakyfunctional/events/44-timeout/flow.cylc
diff --git a/tests/flakyfunctional/execution-time-limit/00-background.t b/tests/flakyfunctional/execution-time-limit/00-background.t
index 3108a5d5cf6..bb9a309bd01 100755
--- a/tests/flakyfunctional/execution-time-limit/00-background.t
+++ b/tests/flakyfunctional/execution-time-limit/00-background.t
@@ -25,7 +25,7 @@ install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 
 CYLC_TEST_BATCH_SYS=${TEST_NAME_BASE##??-}
 
-create_test_globalrc "" "
+create_test_global_config "" "
 [platforms]
 [[hydra]]
 hosts = localhost
diff --git a/tests/flakyfunctional/execution-time-limit/00-background/suite.rc b/tests/flakyfunctional/execution-time-limit/00-background/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/execution-time-limit/00-background/suite.rc
rename to tests/flakyfunctional/execution-time-limit/00-background/flow.cylc
diff --git a/tests/flakyfunctional/execution-time-limit/04-poll/suite.rc b/tests/flakyfunctional/execution-time-limit/04-poll/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/execution-time-limit/04-poll/suite.rc
rename to tests/flakyfunctional/execution-time-limit/04-poll/flow.cylc
diff --git a/tests/flakyfunctional/hold-release/13-ready-restart/suite.rc b/tests/flakyfunctional/hold-release/13-ready-restart/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/hold-release/13-ready-restart/suite.rc
rename to tests/flakyfunctional/hold-release/13-ready-restart/flow.cylc
diff --git a/tests/flakyfunctional/hold-release/14-hold-kill/suite.rc b/tests/flakyfunctional/hold-release/14-hold-kill/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/hold-release/14-hold-kill/suite.rc
rename to tests/flakyfunctional/hold-release/14-hold-kill/flow.cylc
diff --git a/tests/flakyfunctional/hold-release/15-hold-after/suite.rc b/tests/flakyfunctional/hold-release/15-hold-after/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/hold-release/15-hold-after/suite.rc
rename to tests/flakyfunctional/hold-release/15-hold-after/flow.cylc
diff --git a/tests/flakyfunctional/integer-cycling/00-satellite/suite.rc b/tests/flakyfunctional/integer-cycling/00-satellite/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/integer-cycling/00-satellite/suite.rc
rename to tests/flakyfunctional/integer-cycling/00-satellite/flow.cylc
diff --git a/tests/flakyfunctional/job-submission/05-activity-log/suite.rc b/tests/flakyfunctional/job-submission/05-activity-log/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/job-submission/05-activity-log/suite.rc
rename to tests/flakyfunctional/job-submission/05-activity-log/flow.cylc
diff --git a/tests/flakyfunctional/job-submission/18-check-chunking.t b/tests/flakyfunctional/job-submission/18-check-chunking.t
index 00c113de8e5..017d66e958f 100644
--- a/tests/flakyfunctional/job-submission/18-check-chunking.t
+++ b/tests/flakyfunctional/job-submission/18-check-chunking.t
@@ -20,11 +20,11 @@
 . "$(dirname "$0")/test_header"
 set_test_number 3
 
-create_test_globalrc '
+create_test_global_config '
 process pool size = 1
 ' ''
 
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     [[events]]
         abort on inactivity = True
@@ -45,7 +45,7 @@ sleep $((RANDOM % 10))
 wait
 sleep $((RANDOM % 5))
 """
-__SUITERC__
+__FLOW_CONFIG__
 
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
diff --git a/tests/flakyfunctional/job-submission/19-chatty.t b/tests/flakyfunctional/job-submission/19-chatty.t
index 6909d6e080a..208e47f018e 100755
--- a/tests/flakyfunctional/job-submission/19-chatty.t
+++ b/tests/flakyfunctional/job-submission/19-chatty.t
@@ -24,7 +24,7 @@ skip_darwin 'atrun hard to configure on Mac OS'
 
 set_test_number 14
 
-create_test_globalrc "
+create_test_global_config "
 process pool timeout = PT10S" "
 [platforms]
 [[griffin]]
diff --git a/tests/flakyfunctional/job-submission/19-chatty/suite.rc b/tests/flakyfunctional/job-submission/19-chatty/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/job-submission/19-chatty/suite.rc
rename to tests/flakyfunctional/job-submission/19-chatty/flow.cylc
diff --git a/tests/flakyfunctional/modes/03-dummy-env/suite.rc b/tests/flakyfunctional/modes/03-dummy-env/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/modes/03-dummy-env/suite.rc
rename to tests/flakyfunctional/modes/03-dummy-env/flow.cylc
diff --git a/tests/flakyfunctional/registration/02-on-the-fly.t b/tests/flakyfunctional/registration/02-on-the-fly.t
index d504ad4919f..de6b4a0c44c 100755
--- a/tests/flakyfunctional/registration/02-on-the-fly.t
+++ b/tests/flakyfunctional/registration/02-on-the-fly.t
@@ -25,7 +25,7 @@ TEST_NAME="${TEST_NAME_BASE}-pwd"
 
 TESTD="cylctb-cheese-${CYLC_TEST_TIME_INIT}"
 mkdir "${TESTD}"
-cat >> "${TESTD}/suite.rc" <<'__SUITE_RC__'
+cat >> "${TESTD}/flow.cylc" <<'__FLOW_CONFIG__'
 [meta]
     title = the quick brown fox
 [scheduling]
@@ -34,7 +34,7 @@ cat >> "${TESTD}/suite.rc" <<'__SUITE_RC__'
 [runtime]
     [[foo]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 
 cd "${TESTD}" || exit 1
 run_ok "${TEST_NAME}-run" cylc run --hold
@@ -50,7 +50,7 @@ purge_suite "${TESTD}"
 TESTD="cylctb-${CYLC_TEST_TIME_INIT}/${TEST_NAME_BASE}"
 
 mkdir -p "${RUN_DIR}/${TESTD}"
-cat >> "${RUN_DIR}/${TESTD}/suite.rc" <<'__SUITE_RC__'
+cat >> "${RUN_DIR}/${TESTD}/flow.cylc" <<'__FLOW_CONFIG__'
 [meta]
     title = the quick brown fox
 [scheduling]
@@ -59,7 +59,7 @@ cat >> "${RUN_DIR}/${TESTD}/suite.rc" <<'__SUITE_RC__'
 [runtime]
     [[foo]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 
 TEST_NAME="${TEST_NAME_BASE}-cylc-run-dir"
 run_ok "${TEST_NAME}-run" cylc run --hold "${TESTD}"
@@ -73,7 +73,7 @@ purge_suite "${TESTD}"
 #------------------------------------------------------------------------------
 # Test `cylc run` REG for an un-registered suite
 mkdir -p "${RUN_DIR}/${TESTD}"
-cat >> "${RUN_DIR}/${TESTD}/suite.rc" <<'__SUITE_RC__'
+cat >> "${RUN_DIR}/${TESTD}/flow.cylc" <<'__FLOW_CONFIG__'
 [meta]
     title = the quick brown fox
 [sched]
@@ -82,7 +82,7 @@ cat >> "${RUN_DIR}/${TESTD}/suite.rc" <<'__SUITE_RC__'
 [runtime]
     [[foo]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 
 TEST_NAME="${TEST_NAME_BASE}-cylc-run-dir-2"
 run_fail "${TEST_NAME}-validate" cylc validate "${TESTD}"
diff --git a/tests/flakyfunctional/restart/14-multicycle/suite.rc b/tests/flakyfunctional/restart/14-multicycle/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/restart/14-multicycle/suite.rc
rename to tests/flakyfunctional/restart/14-multicycle/flow.cylc
diff --git a/tests/flakyfunctional/restart/19-checkpoint.t b/tests/flakyfunctional/restart/19-checkpoint.t
index 515c84ab43e..fa9e1103e8b 100755
--- a/tests/flakyfunctional/restart/19-checkpoint.t
+++ b/tests/flakyfunctional/restart/19-checkpoint.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -25,7 +25,7 @@ date-remove() {
 set_test_number 8
 
 install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
-cp -p 'suite.rc' 'suite1.rc'
+cp -p 'flow.cylc' 'flow1.cylc'
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 
@@ -92,7 +92,7 @@ suite_run_fail "${TEST_NAME_BASE}-restart-1" \
 
 # Restart from a checkpoint before the reload should allow the suite to proceed
 # normally.
-cp -p 'suite1.rc' 'suite.rc'
+cp -p 'flow1.cylc' 'flow.cylc'
 suite_run_ok "${TEST_NAME_BASE}-restart-2" \
     timeout 120 cylc restart "${SUITE_NAME}" \
     --checkpoint=1 --debug --no-detach --reference-test
diff --git a/tests/flakyfunctional/restart/19-checkpoint/suite.rc b/tests/flakyfunctional/restart/19-checkpoint/flow.cylc
similarity index 95%
rename from tests/flakyfunctional/restart/19-checkpoint/suite.rc
rename to tests/flakyfunctional/restart/19-checkpoint/flow.cylc
index 1e5b54a6fcc..08d443ec9c0 100644
--- a/tests/flakyfunctional/restart/19-checkpoint/suite.rc
+++ b/tests/flakyfunctional/restart/19-checkpoint/flow.cylc
@@ -25,7 +25,7 @@ if [[ "${CYLC_TASK_CYCLE_POINT}" == '2017' ]]; then
     cylc__job__poll_grep_suite_log -F \
         'INFO - Command succeeded: hold_suite()'
     sleep 2
-    (cd "${CYLC_SUITE_DEF_PATH}"; cp -p 'suite2.rc' 'suite.rc')
+    (cd "${CYLC_SUITE_DEF_PATH}"; cp -p 'flow2.cylc' 'flow.cylc')
     cylc reload "${CYLC_SUITE_NAME}"
     cylc__job__poll_grep_suite_log 'Reload completed'
     cylc spawn "${CYLC_SUITE_NAME}" 't1.2017'
diff --git a/tests/flakyfunctional/restart/19-checkpoint/suite2.rc b/tests/flakyfunctional/restart/19-checkpoint/flow2.cylc
similarity index 100%
rename from tests/flakyfunctional/restart/19-checkpoint/suite2.rc
rename to tests/flakyfunctional/restart/19-checkpoint/flow2.cylc
diff --git a/tests/flakyfunctional/restart/21-task-elapsed/suite.rc b/tests/flakyfunctional/restart/21-task-elapsed/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/restart/21-task-elapsed/suite.rc
rename to tests/flakyfunctional/restart/21-task-elapsed/flow.cylc
diff --git a/tests/flakyfunctional/restart/39-auto-restart-no-suitable-host.t b/tests/flakyfunctional/restart/39-auto-restart-no-suitable-host.t
index 9c6cce0e565..c32cf8168db 100644
--- a/tests/flakyfunctional/restart/39-auto-restart-no-suitable-host.t
+++ b/tests/flakyfunctional/restart/39-auto-restart-no-suitable-host.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -18,7 +18,7 @@
 . "$(dirname "$0")/test_header"
 set_test_number 5
 
-BASE_GLOBALRC="
+BASE_GLOBAL_CONFIG="
 [cylc]
     [[main loop]]
         plugins = health check, auto restart
@@ -42,8 +42,8 @@ init_suite "${TEST_NAME_BASE}" <<< '
         P1D = foo
 '
 
-create_test_globalrc '' "
-${BASE_GLOBALRC}
+create_test_global_config '' "
+${BASE_GLOBAL_CONFIG}
 [suite servers]
     run hosts = localhost
 "
@@ -51,8 +51,8 @@ ${BASE_GLOBALRC}
 cylc run "${SUITE_NAME}" --debug
 poll_suite_running
 
-create_test_globalrc '' "
-${BASE_GLOBALRC}
+create_test_global_config '' "
+${BASE_GLOBAL_CONFIG}
 [suite servers]
     run hosts = localhost
     condemned hosts = $(get_fqdn_by_host)
diff --git a/tests/flakyfunctional/restart/40-auto-restart-force-stop.t b/tests/flakyfunctional/restart/40-auto-restart-force-stop.t
index 2c41d145637..8fc8280fec0 100644
--- a/tests/flakyfunctional/restart/40-auto-restart-force-stop.t
+++ b/tests/flakyfunctional/restart/40-auto-restart-force-stop.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -18,7 +18,7 @@
 . "$(dirname "$0")/test_header"
 set_test_number 4
 
-BASE_GLOBALRC="
+BASE_GLOBAL_CONFIG="
 [cylc]
     [[main loop]]
         plugins = health check, auto restart
@@ -38,8 +38,8 @@ init_suite "${TEST_NAME_BASE}" <<< '
         R1 = foo
 '
 
-create_test_globalrc '' "
-${BASE_GLOBALRC}
+create_test_global_config '' "
+${BASE_GLOBAL_CONFIG}
 [suite servers]
     run hosts = localhost
 "
@@ -47,8 +47,8 @@ ${BASE_GLOBALRC}
 cylc run "${SUITE_NAME}" --hold
 poll_suite_running
 
-create_test_globalrc '' "
-${BASE_GLOBALRC}
+create_test_global_config '' "
+${BASE_GLOBAL_CONFIG}
 [suite servers]
     run hosts = localhost
     condemned hosts = $(get_fqdn_by_host)!
diff --git a/tests/flakyfunctional/restart/46-stop-clock-time.t b/tests/flakyfunctional/restart/46-stop-clock-time.t
index 914c35d9b88..ed3bc1a6ef5 100644
--- a/tests/flakyfunctional/restart/46-stop-clock-time.t
+++ b/tests/flakyfunctional/restart/46-stop-clock-time.t
@@ -33,7 +33,7 @@ set_test_number 6
 # At t2.1, stop suite
 # Restart
 # Suite runs to stop clock time, reset stop clock time
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     [[parameters]]
         i = 1..10
@@ -55,7 +55,7 @@ cylc stop -w "$(date --date="@${CLOCKTIME}" +%FT%T%:z)" "${CYLC_SUITE_NAME}"
 """
     [[t<i=2>]]
         script = cylc stop "${CYLC_SUITE_NAME}"
-__SUITERC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 
diff --git a/tests/flakyfunctional/restart/47-no-auto-stop.t b/tests/flakyfunctional/restart/47-no-auto-stop.t
index 4209960cbf2..8df0913cc80 100644
--- a/tests/flakyfunctional/restart/47-no-auto-stop.t
+++ b/tests/flakyfunctional/restart/47-no-auto-stop.t
@@ -34,7 +34,7 @@ set_test_number 8
 # At t2.1, stop suite
 # Restart, should retain auto shutdown
 # Suite runs to final task, then fails on inactivity after 10s
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     [[parameters]]
         i = 1..10
@@ -50,7 +50,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
         script = true
     [[t<i=2>]]
         script = cylc stop "${CYLC_SUITE_NAME}"
-__SUITERC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 
diff --git a/tests/flakyfunctional/shutdown/02-no-dir/suite.rc b/tests/flakyfunctional/shutdown/02-no-dir/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/shutdown/02-no-dir/suite.rc
rename to tests/flakyfunctional/shutdown/02-no-dir/flow.cylc
diff --git a/tests/flakyfunctional/special/04-clock-triggered/suite.rc b/tests/flakyfunctional/special/04-clock-triggered/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/special/04-clock-triggered/suite.rc
rename to tests/flakyfunctional/special/04-clock-triggered/flow.cylc
diff --git a/tests/flakyfunctional/xtriggers/00-wall_clock/suite.rc b/tests/flakyfunctional/xtriggers/00-wall_clock/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/xtriggers/00-wall_clock/suite.rc
rename to tests/flakyfunctional/xtriggers/00-wall_clock/flow.cylc
diff --git a/tests/flakyfunctional/xtriggers/01-suite_state/suite.rc b/tests/flakyfunctional/xtriggers/01-suite_state/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/xtriggers/01-suite_state/suite.rc
rename to tests/flakyfunctional/xtriggers/01-suite_state/flow.cylc
diff --git a/tests/flakyfunctional/xtriggers/01-suite_state/upstream/suite.rc b/tests/flakyfunctional/xtriggers/01-suite_state/upstream/flow.cylc
similarity index 100%
rename from tests/flakyfunctional/xtriggers/01-suite_state/upstream/suite.rc
rename to tests/flakyfunctional/xtriggers/01-suite_state/upstream/flow.cylc
diff --git a/tests/functional/api-suite-info/00-get-graph-raw-1/suite.rc b/tests/functional/api-suite-info/00-get-graph-raw-1/flow.cylc
similarity index 100%
rename from tests/functional/api-suite-info/00-get-graph-raw-1/suite.rc
rename to tests/functional/api-suite-info/00-get-graph-raw-1/flow.cylc
diff --git a/tests/functional/api-suite-info/01-get-graph-raw-2/suite.rc b/tests/functional/api-suite-info/01-get-graph-raw-2/flow.cylc
similarity index 100%
rename from tests/functional/api-suite-info/01-get-graph-raw-2/suite.rc
rename to tests/functional/api-suite-info/01-get-graph-raw-2/flow.cylc
diff --git a/tests/functional/api-suite-info/02-get-graph-raw-3/suite.rc b/tests/functional/api-suite-info/02-get-graph-raw-3/flow.cylc
similarity index 100%
rename from tests/functional/api-suite-info/02-get-graph-raw-3/suite.rc
rename to tests/functional/api-suite-info/02-get-graph-raw-3/flow.cylc
diff --git a/tests/functional/api-suite-info/03-get-graph-raw-4/suite.rc b/tests/functional/api-suite-info/03-get-graph-raw-4/flow.cylc
similarity index 100%
rename from tests/functional/api-suite-info/03-get-graph-raw-4/suite.rc
rename to tests/functional/api-suite-info/03-get-graph-raw-4/flow.cylc
diff --git a/tests/functional/authentication/00-shared-fs/suite.rc b/tests/functional/authentication/00-shared-fs/flow.cylc
similarity index 100%
rename from tests/functional/authentication/00-shared-fs/suite.rc
rename to tests/functional/authentication/00-shared-fs/flow.cylc
diff --git a/tests/functional/authentication/01-remote-suite-same-name/suite.rc b/tests/functional/authentication/01-remote-suite-same-name/flow.cylc
similarity index 100%
rename from tests/functional/authentication/01-remote-suite-same-name/suite.rc
rename to tests/functional/authentication/01-remote-suite-same-name/flow.cylc
diff --git a/tests/functional/authentication/02-suite2-stop-suite1.t b/tests/functional/authentication/02-suite2-stop-suite1.t
index 45fd0ed2443..5383a31501e 100755
--- a/tests/functional/authentication/02-suite2-stop-suite1.t
+++ b/tests/functional/authentication/02-suite2-stop-suite1.t
@@ -24,12 +24,12 @@ RUND="$RUN_DIR"
 NAME1="cylctb-${CYLC_TEST_TIME_INIT}/${TEST_SOURCE_DIR_BASE}/${TEST_NAME_BASE}-1"
 NAME2="cylctb-${CYLC_TEST_TIME_INIT}/${TEST_SOURCE_DIR_BASE}/${TEST_NAME_BASE}-2"
 SUITE1_RUND="${RUND}/${NAME1}"
-mkdir -p "${SUITE1_RUND}" 
-cp -p "${TEST_SOURCE_DIR}/basic/suite.rc" "${SUITE1_RUND}"
+mkdir -p "${SUITE1_RUND}"
+cp -p "${TEST_SOURCE_DIR}/basic/flow.cylc" "${SUITE1_RUND}"
 cylc register "${NAME1}" "${SUITE1_RUND}"
 SUITE2_RUND="${RUND}/${NAME2}"
 mkdir -p "${SUITE2_RUND}"
-cat >"${SUITE2_RUND}/suite.rc" <<__SUITERC__
+cat >"${SUITE2_RUND}/flow.cylc" <<__FLOW_CONFIG__
 [cylc]
     [[events]]
         abort if any task fails=True
@@ -39,7 +39,7 @@ cat >"${SUITE2_RUND}/suite.rc" <<__SUITERC__
 [runtime]
     [[t1]]
         script=cylc shutdown "${NAME1}"
-__SUITERC__
+__FLOW_CONFIG__
 cylc register "${NAME2}" "${SUITE2_RUND}"
 cylc run --no-detach "${NAME1}" 1>'1.out' 2>&1 &
 SUITE_RUN_DIR="${SUITE1_RUND}" poll_suite_running
diff --git a/tests/functional/authentication/basic/suite.rc b/tests/functional/authentication/basic/flow.cylc
similarity index 100%
rename from tests/functional/authentication/basic/suite.rc
rename to tests/functional/authentication/basic/flow.cylc
diff --git a/tests/functional/broadcast/00-simple/suite.rc b/tests/functional/broadcast/00-simple/flow.cylc
similarity index 100%
rename from tests/functional/broadcast/00-simple/suite.rc
rename to tests/functional/broadcast/00-simple/flow.cylc
diff --git a/tests/functional/broadcast/02-inherit/suite.rc b/tests/functional/broadcast/02-inherit/flow.cylc
similarity index 100%
rename from tests/functional/broadcast/02-inherit/suite.rc
rename to tests/functional/broadcast/02-inherit/flow.cylc
diff --git a/tests/functional/broadcast/03-expire/suite.rc b/tests/functional/broadcast/03-expire/flow.cylc
similarity index 100%
rename from tests/functional/broadcast/03-expire/suite.rc
rename to tests/functional/broadcast/03-expire/flow.cylc
diff --git a/tests/functional/broadcast/04-empty/suite.rc b/tests/functional/broadcast/04-empty/flow.cylc
similarity index 100%
rename from tests/functional/broadcast/04-empty/suite.rc
rename to tests/functional/broadcast/04-empty/flow.cylc
diff --git a/tests/functional/broadcast/05-bad-point/suite.rc b/tests/functional/broadcast/05-bad-point/flow.cylc
similarity index 100%
rename from tests/functional/broadcast/05-bad-point/suite.rc
rename to tests/functional/broadcast/05-bad-point/flow.cylc
diff --git a/tests/functional/broadcast/06-bad-namespace/suite.rc b/tests/functional/broadcast/06-bad-namespace/flow.cylc
similarity index 100%
rename from tests/functional/broadcast/06-bad-namespace/suite.rc
rename to tests/functional/broadcast/06-bad-namespace/flow.cylc
diff --git a/tests/functional/broadcast/07-timeout/suite.rc b/tests/functional/broadcast/07-timeout/flow.cylc
similarity index 100%
rename from tests/functional/broadcast/07-timeout/suite.rc
rename to tests/functional/broadcast/07-timeout/flow.cylc
diff --git a/tests/functional/broadcast/08-space/suite.rc b/tests/functional/broadcast/08-space/flow.cylc
similarity index 100%
rename from tests/functional/broadcast/08-space/suite.rc
rename to tests/functional/broadcast/08-space/flow.cylc
diff --git a/tests/functional/broadcast/09-remote/suite.rc b/tests/functional/broadcast/09-remote/flow.cylc
similarity index 100%
rename from tests/functional/broadcast/09-remote/suite.rc
rename to tests/functional/broadcast/09-remote/flow.cylc
diff --git a/tests/functional/broadcast/10-file-1/broadcast.rc b/tests/functional/broadcast/10-file-1/broadcast.cylc
similarity index 100%
rename from tests/functional/broadcast/10-file-1/broadcast.rc
rename to tests/functional/broadcast/10-file-1/broadcast.cylc
diff --git a/tests/functional/broadcast/10-file-1/suite.rc b/tests/functional/broadcast/10-file-1/flow.cylc
similarity index 64%
rename from tests/functional/broadcast/10-file-1/suite.rc
rename to tests/functional/broadcast/10-file-1/flow.cylc
index a65098a66de..e955e317742 100644
--- a/tests/functional/broadcast/10-file-1/suite.rc
+++ b/tests/functional/broadcast/10-file-1/flow.cylc
@@ -6,7 +6,7 @@
 [runtime]
     [[t1]]
         script = """
-cylc broadcast -n 't2' -F "${CYLC_SUITE_DEF_PATH}/broadcast.rc" "${CYLC_SUITE_NAME}"
+cylc broadcast -n 't2' -F "${CYLC_SUITE_DEF_PATH}/broadcast.cylc" "${CYLC_SUITE_NAME}"
 """
     [[t2]]
         script = false
diff --git a/tests/functional/broadcast/11-file-2/broadcast-1.rc b/tests/functional/broadcast/11-file-2/broadcast-1.cylc
similarity index 100%
rename from tests/functional/broadcast/11-file-2/broadcast-1.rc
rename to tests/functional/broadcast/11-file-2/broadcast-1.cylc
diff --git a/tests/functional/broadcast/11-file-2/broadcast-2.rc b/tests/functional/broadcast/11-file-2/broadcast-2.cylc
similarity index 100%
rename from tests/functional/broadcast/11-file-2/broadcast-2.rc
rename to tests/functional/broadcast/11-file-2/broadcast-2.cylc
diff --git a/tests/functional/broadcast/11-file-2/suite.rc b/tests/functional/broadcast/11-file-2/flow.cylc
similarity index 67%
rename from tests/functional/broadcast/11-file-2/suite.rc
rename to tests/functional/broadcast/11-file-2/flow.cylc
index b949e1cb8a8..38168ba4917 100644
--- a/tests/functional/broadcast/11-file-2/suite.rc
+++ b/tests/functional/broadcast/11-file-2/flow.cylc
@@ -7,8 +7,8 @@
     [[t1]]
         script = """
 cylc broadcast -n 't2' \
-    -F "${CYLC_SUITE_DEF_PATH}/broadcast-1.rc" \
-    -F "${CYLC_SUITE_DEF_PATH}/broadcast-2.rc" \
+    -F "${CYLC_SUITE_DEF_PATH}/broadcast-1.cylc" \
+    -F "${CYLC_SUITE_DEF_PATH}/broadcast-2.cylc" \
     "${CYLC_SUITE_NAME}"
 """
     [[t2]]
diff --git a/tests/functional/broadcast/12-file-stdin/broadcast.rc b/tests/functional/broadcast/12-file-stdin/broadcast.cylc
similarity index 100%
rename from tests/functional/broadcast/12-file-stdin/broadcast.rc
rename to tests/functional/broadcast/12-file-stdin/broadcast.cylc
diff --git a/tests/functional/broadcast/12-file-stdin/suite.rc b/tests/functional/broadcast/12-file-stdin/flow.cylc
similarity index 82%
rename from tests/functional/broadcast/12-file-stdin/suite.rc
rename to tests/functional/broadcast/12-file-stdin/flow.cylc
index 9515b41295c..c9096d22e58 100644
--- a/tests/functional/broadcast/12-file-stdin/suite.rc
+++ b/tests/functional/broadcast/12-file-stdin/flow.cylc
@@ -7,7 +7,7 @@
     [[t1]]
         script = """
 cylc broadcast -n 't2' -F - "${CYLC_SUITE_NAME}" \
-    <"${CYLC_SUITE_DEF_PATH}/broadcast.rc"
+    <"${CYLC_SUITE_DEF_PATH}/broadcast.cylc"
 """
     [[t2]]
         script = false
diff --git a/tests/functional/broadcast/13-file-cancel/broadcast-1.rc b/tests/functional/broadcast/13-file-cancel/broadcast-1.cylc
similarity index 100%
rename from tests/functional/broadcast/13-file-cancel/broadcast-1.rc
rename to tests/functional/broadcast/13-file-cancel/broadcast-1.cylc
diff --git a/tests/functional/broadcast/13-file-cancel/broadcast-2.rc b/tests/functional/broadcast/13-file-cancel/broadcast-2.cylc
similarity index 100%
rename from tests/functional/broadcast/13-file-cancel/broadcast-2.rc
rename to tests/functional/broadcast/13-file-cancel/broadcast-2.cylc
diff --git a/tests/functional/broadcast/13-file-cancel/flow.cylc b/tests/functional/broadcast/13-file-cancel/flow.cylc
new file mode 100644
index 00000000000..1a67d34b03a
--- /dev/null
+++ b/tests/functional/broadcast/13-file-cancel/flow.cylc
@@ -0,0 +1,13 @@
+[cylc]
+    UTC mode = True
+[scheduling]
+    [[graph]]
+        R1 = "t1 => t2"
+[runtime]
+    [[t1]]
+        script = """
+cylc broadcast -n 't2' -F "${CYLC_SUITE_DEF_PATH}/broadcast-1.cylc" "${CYLC_SUITE_NAME}"
+cylc broadcast -n 't2' -G "${CYLC_SUITE_DEF_PATH}/broadcast-2.cylc" "${CYLC_SUITE_NAME}"
+"""
+    [[t2]]
+        script = false
diff --git a/tests/functional/broadcast/13-file-cancel/suite.rc b/tests/functional/broadcast/13-file-cancel/suite.rc
deleted file mode 100644
index 97344533513..00000000000
--- a/tests/functional/broadcast/13-file-cancel/suite.rc
+++ /dev/null
@@ -1,13 +0,0 @@
-[cylc]
-    UTC mode = True
-[scheduling]
-    [[graph]]
-        R1 = "t1 => t2"
-[runtime]
-    [[t1]]
-        script = """
-cylc broadcast -n 't2' -F "${CYLC_SUITE_DEF_PATH}/broadcast-1.rc" "${CYLC_SUITE_NAME}"
-cylc broadcast -n 't2' -G "${CYLC_SUITE_DEF_PATH}/broadcast-2.rc" "${CYLC_SUITE_NAME}"
-"""
-    [[t2]]
-        script = false
diff --git a/tests/functional/cli/00-cycle-points/suite.rc b/tests/functional/cli/00-cycle-points/flow.cylc
similarity index 100%
rename from tests/functional/cli/00-cycle-points/suite.rc
rename to tests/functional/cli/00-cycle-points/flow.cylc
diff --git a/tests/functional/cli/02-now.t b/tests/functional/cli/02-now.t
index 7e9078b1b62..c9f89649384 100755
--- a/tests/functional/cli/02-now.t
+++ b/tests/functional/cli/02-now.t
@@ -21,7 +21,7 @@
 
 . "$(dirname "$0")/test_header"
 set_test_number 13
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     [[events]]
         abort on stalled = true
@@ -33,7 +33,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
 [runtime]
     [[foo]]
         script = wait; cylc stop --now --now "${CYLC_SUITE_NAME}"
-__SUITERC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate --icp='now' "${SUITE_NAME}"
 
diff --git a/tests/functional/clock-expire/00-basic/suite.rc b/tests/functional/clock-expire/00-basic/flow.cylc
similarity index 100%
rename from tests/functional/clock-expire/00-basic/suite.rc
rename to tests/functional/clock-expire/00-basic/flow.cylc
diff --git a/tests/functional/cyclers/0000_rollunder/suite.rc b/tests/functional/cyclers/0000_rollunder/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/0000_rollunder/suite.rc
rename to tests/functional/cyclers/0000_rollunder/flow.cylc
diff --git a/tests/functional/cyclers/21-360_calendar/suite.rc b/tests/functional/cyclers/21-360_calendar/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/21-360_calendar/suite.rc
rename to tests/functional/cyclers/21-360_calendar/flow.cylc
diff --git a/tests/functional/cyclers/28-implicit-disallowed/suite.rc b/tests/functional/cyclers/28-implicit-disallowed/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/28-implicit-disallowed/suite.rc
rename to tests/functional/cyclers/28-implicit-disallowed/flow.cylc
diff --git a/tests/functional/cyclers/36-icp_fcp_notation/suite.rc b/tests/functional/cyclers/36-icp_fcp_notation/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/36-icp_fcp_notation/suite.rc
rename to tests/functional/cyclers/36-icp_fcp_notation/flow.cylc
diff --git a/tests/functional/cyclers/47-icp_fcp_notation/suite.rc b/tests/functional/cyclers/47-icp_fcp_notation/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/47-icp_fcp_notation/suite.rc
rename to tests/functional/cyclers/47-icp_fcp_notation/flow.cylc
diff --git a/tests/functional/cyclers/49-365_calendar/suite.rc b/tests/functional/cyclers/49-365_calendar/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/49-365_calendar/suite.rc
rename to tests/functional/cyclers/49-365_calendar/flow.cylc
diff --git a/tests/functional/cyclers/50-366_calendar/suite.rc b/tests/functional/cyclers/50-366_calendar/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/50-366_calendar/suite.rc
rename to tests/functional/cyclers/50-366_calendar/flow.cylc
diff --git a/tests/functional/cyclers/9999_rollover/suite.rc b/tests/functional/cyclers/9999_rollover/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/9999_rollover/suite.rc
rename to tests/functional/cyclers/9999_rollover/flow.cylc
diff --git a/tests/functional/cyclers/aeon/suite.rc b/tests/functional/cyclers/aeon/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/aeon/suite.rc
rename to tests/functional/cyclers/aeon/flow.cylc
diff --git a/tests/functional/cyclers/daily/suite.rc b/tests/functional/cyclers/daily/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/daily/suite.rc
rename to tests/functional/cyclers/daily/flow.cylc
diff --git a/tests/functional/cyclers/daily_final/suite.rc b/tests/functional/cyclers/daily_final/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/daily_final/suite.rc
rename to tests/functional/cyclers/daily_final/flow.cylc
diff --git a/tests/functional/cyclers/day_of_week/suite.rc b/tests/functional/cyclers/day_of_week/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/day_of_week/suite.rc
rename to tests/functional/cyclers/day_of_week/flow.cylc
diff --git a/tests/functional/cyclers/exclusions/suite.rc b/tests/functional/cyclers/exclusions/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/exclusions/suite.rc
rename to tests/functional/cyclers/exclusions/flow.cylc
diff --git a/tests/functional/cyclers/exclusions_advanced/suite.rc b/tests/functional/cyclers/exclusions_advanced/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/exclusions_advanced/suite.rc
rename to tests/functional/cyclers/exclusions_advanced/flow.cylc
diff --git a/tests/functional/cyclers/hourly/suite.rc b/tests/functional/cyclers/hourly/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/hourly/suite.rc
rename to tests/functional/cyclers/hourly/flow.cylc
diff --git a/tests/functional/cyclers/integer1/suite.rc b/tests/functional/cyclers/integer1/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/integer1/suite.rc
rename to tests/functional/cyclers/integer1/flow.cylc
diff --git a/tests/functional/cyclers/integer_exclusions_advanced/suite.rc b/tests/functional/cyclers/integer_exclusions_advanced/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/integer_exclusions_advanced/suite.rc
rename to tests/functional/cyclers/integer_exclusions_advanced/flow.cylc
diff --git a/tests/functional/cyclers/monthly/suite.rc b/tests/functional/cyclers/monthly/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/monthly/suite.rc
rename to tests/functional/cyclers/monthly/flow.cylc
diff --git a/tests/functional/cyclers/monthly_complex/suite.rc b/tests/functional/cyclers/monthly_complex/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/monthly_complex/suite.rc
rename to tests/functional/cyclers/monthly_complex/flow.cylc
diff --git a/tests/functional/cyclers/multidaily/suite.rc b/tests/functional/cyclers/multidaily/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/multidaily/suite.rc
rename to tests/functional/cyclers/multidaily/flow.cylc
diff --git a/tests/functional/cyclers/multidaily_local/suite.rc b/tests/functional/cyclers/multidaily_local/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/multidaily_local/suite.rc
rename to tests/functional/cyclers/multidaily_local/flow.cylc
diff --git a/tests/functional/cyclers/multihourly/suite.rc b/tests/functional/cyclers/multihourly/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/multihourly/suite.rc
rename to tests/functional/cyclers/multihourly/flow.cylc
diff --git a/tests/functional/cyclers/multimonthly/suite.rc b/tests/functional/cyclers/multimonthly/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/multimonthly/suite.rc
rename to tests/functional/cyclers/multimonthly/flow.cylc
diff --git a/tests/functional/cyclers/multiweekly/suite.rc b/tests/functional/cyclers/multiweekly/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/multiweekly/suite.rc
rename to tests/functional/cyclers/multiweekly/flow.cylc
diff --git a/tests/functional/cyclers/multiyearly/suite.rc b/tests/functional/cyclers/multiyearly/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/multiyearly/suite.rc
rename to tests/functional/cyclers/multiyearly/flow.cylc
diff --git a/tests/functional/cyclers/offset_final/suite.rc b/tests/functional/cyclers/offset_final/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/offset_final/suite.rc
rename to tests/functional/cyclers/offset_final/flow.cylc
diff --git a/tests/functional/cyclers/offset_initial/suite.rc b/tests/functional/cyclers/offset_initial/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/offset_initial/suite.rc
rename to tests/functional/cyclers/offset_initial/flow.cylc
diff --git a/tests/functional/cyclers/r1_final/suite.rc b/tests/functional/cyclers/r1_final/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/r1_final/suite.rc
rename to tests/functional/cyclers/r1_final/flow.cylc
diff --git a/tests/functional/cyclers/r1_initial/suite.rc b/tests/functional/cyclers/r1_initial/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/r1_initial/suite.rc
rename to tests/functional/cyclers/r1_initial/flow.cylc
diff --git a/tests/functional/cyclers/r1_initial_back_comp_standalone_line/suite.rc b/tests/functional/cyclers/r1_initial_back_comp_standalone_line/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/r1_initial_back_comp_standalone_line/suite.rc
rename to tests/functional/cyclers/r1_initial_back_comp_standalone_line/flow.cylc
diff --git a/tests/functional/cyclers/r1_initial_immortal/suite.rc b/tests/functional/cyclers/r1_initial_immortal/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/r1_initial_immortal/suite.rc
rename to tests/functional/cyclers/r1_initial_immortal/flow.cylc
diff --git a/tests/functional/cyclers/r1_middle/suite.rc b/tests/functional/cyclers/r1_middle/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/r1_middle/suite.rc
rename to tests/functional/cyclers/r1_middle/flow.cylc
diff --git a/tests/functional/cyclers/r1_multi_start/suite.rc b/tests/functional/cyclers/r1_multi_start/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/r1_multi_start/suite.rc
rename to tests/functional/cyclers/r1_multi_start/flow.cylc
diff --git a/tests/functional/cyclers/r1_restricted/suite.rc b/tests/functional/cyclers/r1_restricted/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/r1_restricted/suite.rc
rename to tests/functional/cyclers/r1_restricted/flow.cylc
diff --git a/tests/functional/cyclers/r5_final/suite.rc b/tests/functional/cyclers/r5_final/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/r5_final/suite.rc
rename to tests/functional/cyclers/r5_final/flow.cylc
diff --git a/tests/functional/cyclers/r5_initial-integer/suite.rc b/tests/functional/cyclers/r5_initial-integer/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/r5_initial-integer/suite.rc
rename to tests/functional/cyclers/r5_initial-integer/flow.cylc
diff --git a/tests/functional/cyclers/r5_initial/suite.rc b/tests/functional/cyclers/r5_initial/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/r5_initial/suite.rc
rename to tests/functional/cyclers/r5_initial/flow.cylc
diff --git a/tests/functional/cyclers/rmany_reverse/suite.rc b/tests/functional/cyclers/rmany_reverse/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/rmany_reverse/suite.rc
rename to tests/functional/cyclers/rmany_reverse/flow.cylc
diff --git a/tests/functional/cyclers/rnone_reverse/suite.rc b/tests/functional/cyclers/rnone_reverse/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/rnone_reverse/suite.rc
rename to tests/functional/cyclers/rnone_reverse/flow.cylc
diff --git a/tests/functional/cyclers/subhourly/suite.rc b/tests/functional/cyclers/subhourly/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/subhourly/suite.rc
rename to tests/functional/cyclers/subhourly/flow.cylc
diff --git a/tests/functional/cyclers/weekly/suite.rc b/tests/functional/cyclers/weekly/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/weekly/suite.rc
rename to tests/functional/cyclers/weekly/flow.cylc
diff --git a/tests/functional/cyclers/yearly/suite.rc b/tests/functional/cyclers/yearly/flow.cylc
similarity index 100%
rename from tests/functional/cyclers/yearly/suite.rc
rename to tests/functional/cyclers/yearly/flow.cylc
diff --git a/tests/functional/cylc-cat-log/00-local/suite.rc b/tests/functional/cylc-cat-log/00-local/flow.cylc
similarity index 100%
rename from tests/functional/cylc-cat-log/00-local/suite.rc
rename to tests/functional/cylc-cat-log/00-local/flow.cylc
diff --git a/tests/functional/cylc-cat-log/01-remote.t b/tests/functional/cylc-cat-log/01-remote.t
index 7d6c840f495..4e75431f5c8 100755
--- a/tests/functional/cylc-cat-log/01-remote.t
+++ b/tests/functional/cylc-cat-log/01-remote.t
@@ -21,7 +21,7 @@ export CYLC_TEST_IS_GENERIC=false
 #-------------------------------------------------------------------------------
 require_remote_platform
 set_test_number 14
-create_test_globalrc "" "
+create_test_global_config "" "
 [platforms]
    [[${CYLC_TEST_PLATFORM}]]
        retrieve job logs = False"
diff --git a/tests/functional/cylc-cat-log/01-remote/suite.rc b/tests/functional/cylc-cat-log/01-remote/flow.cylc
similarity index 100%
rename from tests/functional/cylc-cat-log/01-remote/suite.rc
rename to tests/functional/cylc-cat-log/01-remote/flow.cylc
diff --git a/tests/functional/cylc-cat-log/02-remote-custom-runtime-viewer-pbs.t b/tests/functional/cylc-cat-log/02-remote-custom-runtime-viewer-pbs.t
index 84f6ded7c72..b870edccecd 100755
--- a/tests/functional/cylc-cat-log/02-remote-custom-runtime-viewer-pbs.t
+++ b/tests/functional/cylc-cat-log/02-remote-custom-runtime-viewer-pbs.t
@@ -35,7 +35,7 @@ CYLC_TEST_DIRECTIVES="$( \
 export CYLC_TEST_HOST CYLC_TEST_DIRECTIVES
 set_test_number 2
 
-create_test_globalrc "" "
+create_test_global_config "" "
 [platforms]
     [[${CYLC_TEST_HOST}]]
         [[[batch systems]]]
diff --git a/tests/functional/cylc-cat-log/02-remote-custom-runtime-viewer-pbs/suite.rc b/tests/functional/cylc-cat-log/02-remote-custom-runtime-viewer-pbs/flow.cylc
similarity index 100%
rename from tests/functional/cylc-cat-log/02-remote-custom-runtime-viewer-pbs/suite.rc
rename to tests/functional/cylc-cat-log/02-remote-custom-runtime-viewer-pbs/flow.cylc
diff --git a/tests/functional/cylc-cat-log/04-local-tail.t b/tests/functional/cylc-cat-log/04-local-tail.t
index cc70f576bb9..4dbffe05f34 100755
--- a/tests/functional/cylc-cat-log/04-local-tail.t
+++ b/tests/functional/cylc-cat-log/04-local-tail.t
@@ -20,7 +20,7 @@
 #-------------------------------------------------------------------------------
 set_test_number 3
 install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
-create_test_globalrc "" "
+create_test_global_config "" "
 [platforms]
    [[localhost]]
         tail command template = $PWD/bin/my-tailer.sh %(filename)s
diff --git a/tests/functional/cylc-cat-log/04-local-tail/suite.rc b/tests/functional/cylc-cat-log/04-local-tail/flow.cylc
similarity index 100%
rename from tests/functional/cylc-cat-log/04-local-tail/suite.rc
rename to tests/functional/cylc-cat-log/04-local-tail/flow.cylc
diff --git a/tests/functional/cylc-cat-log/05-remote-tail.t b/tests/functional/cylc-cat-log/05-remote-tail.t
index 63831eb0ac1..24056fb9438 100755
--- a/tests/functional/cylc-cat-log/05-remote-tail.t
+++ b/tests/functional/cylc-cat-log/05-remote-tail.t
@@ -27,7 +27,7 @@ SSH='ssh -oBatchMode=yes -oConnectTimeout=5'
 SCP='scp -oBatchMode=yes -oConnectTimeout=5'
 $SSH -n "${CYLC_TEST_HOST}" "mkdir -p cylc-run/.bin"
 # shellcheck disable=SC2016
-create_test_globalrc "" "
+create_test_global_config "" "
 [platforms]
    [[$CYLC_TEST_PLATFORM]]
         tail command template = \$HOME/cylc-run/.bin/my-tailer.sh %(filename)s"
diff --git a/tests/functional/cylc-cat-log/05-remote-tail/suite.rc b/tests/functional/cylc-cat-log/05-remote-tail/flow.cylc
similarity index 100%
rename from tests/functional/cylc-cat-log/05-remote-tail/suite.rc
rename to tests/functional/cylc-cat-log/05-remote-tail/flow.cylc
diff --git a/tests/functional/cylc-cat-log/09-cat-running/suite.rc b/tests/functional/cylc-cat-log/09-cat-running/flow.cylc
similarity index 100%
rename from tests/functional/cylc-cat-log/09-cat-running/suite.rc
rename to tests/functional/cylc-cat-log/09-cat-running/flow.cylc
diff --git a/tests/functional/cylc-cat-log/10-remote-no-retrieve.t b/tests/functional/cylc-cat-log/10-remote-no-retrieve.t
index 53f79c8fa2f..a4b4119495a 100755
--- a/tests/functional/cylc-cat-log/10-remote-no-retrieve.t
+++ b/tests/functional/cylc-cat-log/10-remote-no-retrieve.t
@@ -24,7 +24,7 @@ export CYLC_TEST_IS_GENERIC=false
 require_remote_platform
 set_test_number 5
 
-create_test_globalrc "" "
+create_test_global_config "" "
 [platforms]
    [[${CYLC_TEST_PLATFORM}]]
        retrieve job logs = False"
diff --git a/tests/functional/cylc-cat-log/11-remote-retrieve.t b/tests/functional/cylc-cat-log/11-remote-retrieve.t
index 637dae3d5c8..70a96bce37f 100755
--- a/tests/functional/cylc-cat-log/11-remote-retrieve.t
+++ b/tests/functional/cylc-cat-log/11-remote-retrieve.t
@@ -23,7 +23,7 @@ export CYLC_TEST_IS_GENERIC=false
 require_remote_platform
 set_test_number 7
 
-create_test_globalrc "" "
+create_test_global_config "" "
 [platforms]
    [[${CYLC_TEST_PLATFORM}]]
        retrieve job logs = True"
diff --git a/tests/functional/cylc-cat-log/editor/bin/run_tests.sh b/tests/functional/cylc-cat-log/editor/bin/run_tests.sh
index 3bd74a65b79..e95192f63dd 100644
--- a/tests/functional/cylc-cat-log/editor/bin/run_tests.sh
+++ b/tests/functional/cylc-cat-log/editor/bin/run_tests.sh
@@ -18,7 +18,7 @@
 set_test_number 16
 
 # Configure a fake editor that just copies a job file to ${DESTFILE}.
-create_test_globalrc '' '
+create_test_global_config '' '
 [editors]
     terminal = my-editor
     gui = my-editor'
diff --git a/tests/functional/cylc-cat-log/editor/suite.rc b/tests/functional/cylc-cat-log/editor/flow.cylc
similarity index 100%
rename from tests/functional/cylc-cat-log/editor/suite.rc
rename to tests/functional/cylc-cat-log/editor/flow.cylc
diff --git a/tests/functional/cylc-cat-log/remote-simple/suite.rc b/tests/functional/cylc-cat-log/remote-simple/flow.cylc
similarity index 100%
rename from tests/functional/cylc-cat-log/remote-simple/suite.rc
rename to tests/functional/cylc-cat-log/remote-simple/flow.cylc
diff --git a/tests/functional/cylc-diff/00-basic.t b/tests/functional/cylc-diff/00-basic.t
index 1e1c0b03429..3f98bdc89fb 100755
--- a/tests/functional/cylc-diff/00-basic.t
+++ b/tests/functional/cylc-diff/00-basic.t
@@ -20,31 +20,31 @@
 
 set_test_number 3
 
-init_suite "${TEST_NAME_BASE}-1" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}-1" <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = foo => bar
 [runtime]
     [[foo, bar]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 # shellcheck disable=SC2153
 SUITE_NAME1="${SUITE_NAME}"
-init_suite "${TEST_NAME_BASE}-2" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}-2" <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = food => barley
 [runtime]
     [[food, barley]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 # shellcheck disable=SC2153
 SUITE_NAME2="${SUITE_NAME}"
 
 run_ok "${TEST_NAME_BASE}" cylc diff "${SUITE_NAME1}" "${SUITE_NAME2}"
 cmp_ok "${TEST_NAME_BASE}.stdout" <<__OUT__
-Parsing ${SUITE_NAME1} (${TEST_DIR}/${SUITE_NAME1}/suite.rc)
-Parsing ${SUITE_NAME2} (${TEST_DIR}/${SUITE_NAME2}/suite.rc)
+Parsing ${SUITE_NAME1} (${TEST_DIR}/${SUITE_NAME1}/flow.cylc)
+Parsing ${SUITE_NAME2} (${TEST_DIR}/${SUITE_NAME2}/flow.cylc)
 Suite definitions ${SUITE_NAME1} and ${SUITE_NAME2} differ
 
 2 items only in ${SUITE_NAME1} (<)
diff --git a/tests/functional/cylc-diff/01-same.t b/tests/functional/cylc-diff/01-same.t
index 5f5f594502c..11f6abc3266 100755
--- a/tests/functional/cylc-diff/01-same.t
+++ b/tests/functional/cylc-diff/01-same.t
@@ -15,20 +15,20 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
-# Test for "cylc diff" with 2 suites pointing to same "suite.rc".
+# Test for "cylc diff" with 2 suites pointing to same "flow.cylc".
 . "$(dirname "$0")/test_header"
 
 set_test_number 3
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = foo => bar
 [runtime]
     [[foo, bar]]
         script = true
-__SUITE_RC__
-init_suite "${TEST_NAME_BASE}-1" "${PWD}/suite.rc"
+__FLOW_CONFIG__
+init_suite "${TEST_NAME_BASE}-1" "${PWD}/flow.cylc"
 # shellcheck disable=SC2153
 SUITE_NAME1="${SUITE_NAME}"
 # shellcheck disable=SC2153
@@ -37,8 +37,8 @@ cylc register "${SUITE_NAME2}" "${TEST_DIR}/${SUITE_NAME1}" 2>'/dev/null'
 
 run_ok "${TEST_NAME_BASE}" cylc diff "${SUITE_NAME1}" "${SUITE_NAME2}"
 cmp_ok "${TEST_NAME_BASE}.stdout" <<__OUT__
-Parsing ${SUITE_NAME1} (${TEST_DIR}/${SUITE_NAME1}/suite.rc)
-Parsing ${SUITE_NAME2} (${TEST_DIR}/${SUITE_NAME1}/suite.rc)
+Parsing ${SUITE_NAME1} (${TEST_DIR}/${SUITE_NAME1}/flow.cylc)
+Parsing ${SUITE_NAME2} (${TEST_DIR}/${SUITE_NAME1}/flow.cylc)
 Suite definitions ${SUITE_NAME1} and ${SUITE_NAME2} are identical
 __OUT__
 cmp_ok "${TEST_NAME_BASE}.stderr" <'/dev/null'
diff --git a/tests/functional/cylc-diff/02-identical.t b/tests/functional/cylc-diff/02-identical.t
index 845bb892ec0..409221e9af9 100755
--- a/tests/functional/cylc-diff/02-identical.t
+++ b/tests/functional/cylc-diff/02-identical.t
@@ -20,31 +20,31 @@
 
 set_test_number 3
 
-init_suite "${TEST_NAME_BASE}-1" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}-1" <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = foo => bar
 [runtime]
     [[foo, bar]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 # shellcheck disable=SC2153
 SUITE_NAME1="${SUITE_NAME}"
-init_suite "${TEST_NAME_BASE}-2" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}-2" <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = foo => bar
 [runtime]
     [[foo, bar]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 # shellcheck disable=SC2153
 SUITE_NAME2="${SUITE_NAME}"
 
 run_ok "${TEST_NAME_BASE}" cylc diff "${SUITE_NAME1}" "${SUITE_NAME2}"
 cmp_ok "${TEST_NAME_BASE}.stdout" <<__OUT__
-Parsing ${SUITE_NAME1} (${TEST_DIR}/${SUITE_NAME1}/suite.rc)
-Parsing ${SUITE_NAME2} (${TEST_DIR}/${SUITE_NAME2}/suite.rc)
+Parsing ${SUITE_NAME1} (${TEST_DIR}/${SUITE_NAME1}/flow.cylc)
+Parsing ${SUITE_NAME2} (${TEST_DIR}/${SUITE_NAME2}/flow.cylc)
 Suite definitions ${SUITE_NAME1} and ${SUITE_NAME2} are identical
 __OUT__
 cmp_ok "${TEST_NAME_BASE}.stderr" <'/dev/null'
diff --git a/tests/functional/cylc-diff/03-icp.t b/tests/functional/cylc-diff/03-icp.t
index fb5d801c544..28552b8b112 100755
--- a/tests/functional/cylc-diff/03-icp.t
+++ b/tests/functional/cylc-diff/03-icp.t
@@ -20,7 +20,7 @@
 
 set_test_number 3
 
-init_suite "${TEST_NAME_BASE}-1" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}-1" <<'__FLOW_CONFIG__'
 [cylc]
     UTC mode = True
 [scheduling]
@@ -29,10 +29,10 @@ init_suite "${TEST_NAME_BASE}-1" <<'__SUITE_RC__'
 [runtime]
     [[foo, bar]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 # shellcheck disable=SC2153
 SUITE_NAME1="${SUITE_NAME}"
-init_suite "${TEST_NAME_BASE}-2" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}-2" <<'__FLOW_CONFIG__'
 [cylc]
     UTC mode = True
 [scheduling]
@@ -41,15 +41,15 @@ init_suite "${TEST_NAME_BASE}-2" <<'__SUITE_RC__'
 [runtime]
     [[food, barley]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 # shellcheck disable=SC2153
 SUITE_NAME2="${SUITE_NAME}"
 
 run_ok "${TEST_NAME_BASE}" \
     cylc diff --icp=2020 "${SUITE_NAME1}" "${SUITE_NAME2}"
 cmp_ok "${TEST_NAME_BASE}.stdout" <<__OUT__
-Parsing ${SUITE_NAME1} (${TEST_DIR}/${SUITE_NAME1}/suite.rc)
-Parsing ${SUITE_NAME2} (${TEST_DIR}/${SUITE_NAME2}/suite.rc)
+Parsing ${SUITE_NAME1} (${TEST_DIR}/${SUITE_NAME1}/flow.cylc)
+Parsing ${SUITE_NAME2} (${TEST_DIR}/${SUITE_NAME2}/flow.cylc)
 Suite definitions ${SUITE_NAME1} and ${SUITE_NAME2} differ
 
 2 items only in ${SUITE_NAME1} (<)
diff --git a/tests/functional/cylc-diff/04-icp-2.t b/tests/functional/cylc-diff/04-icp-2.t
index f27139fe1c4..ecd1ec351f6 100755
--- a/tests/functional/cylc-diff/04-icp-2.t
+++ b/tests/functional/cylc-diff/04-icp-2.t
@@ -20,7 +20,7 @@
 
 set_test_number 3
 
-init_suite "${TEST_NAME_BASE}-1" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}-1" <<'__FLOW_CONFIG__'
 [cylc]
     UTC mode = True
 [scheduling]
@@ -29,10 +29,10 @@ init_suite "${TEST_NAME_BASE}-1" <<'__SUITE_RC__'
 [runtime]
     [[foo, bar]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 # shellcheck disable=SC2153
 SUITE_NAME1="${SUITE_NAME}"
-init_suite "${TEST_NAME_BASE}-2" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}-2" <<'__FLOW_CONFIG__'
 [cylc]
     UTC mode = True
 [scheduling]
@@ -42,15 +42,15 @@ init_suite "${TEST_NAME_BASE}-2" <<'__SUITE_RC__'
 [runtime]
     [[food, barley]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 # shellcheck disable=SC2153
 SUITE_NAME2="${SUITE_NAME}"
 
 run_ok "${TEST_NAME_BASE}" \
     cylc diff --icp=2020 "${SUITE_NAME1}" "${SUITE_NAME2}"
 cmp_ok "${TEST_NAME_BASE}.stdout" <<__OUT__
-Parsing ${SUITE_NAME1} (${TEST_DIR}/${SUITE_NAME1}/suite.rc)
-Parsing ${SUITE_NAME2} (${TEST_DIR}/${SUITE_NAME2}/suite.rc)
+Parsing ${SUITE_NAME1} (${TEST_DIR}/${SUITE_NAME1}/flow.cylc)
+Parsing ${SUITE_NAME2} (${TEST_DIR}/${SUITE_NAME2}/flow.cylc)
 Suite definitions ${SUITE_NAME1} and ${SUITE_NAME2} differ
 
 2 items only in ${SUITE_NAME1} (<)
diff --git a/tests/functional/cylc-edit/00-basic.t b/tests/functional/cylc-edit/00-basic.t
index f546f10666c..b27ce818bbd 100644
--- a/tests/functional/cylc-edit/00-basic.t
+++ b/tests/functional/cylc-edit/00-basic.t
@@ -25,7 +25,7 @@ TEST_NAME="${TEST_NAME_BASE}-validate-before"
 run_fail "${TEST_NAME}" cylc validate "${SUITE_NAME}"
 
 TEST_NAME="${TEST_NAME_BASE}"
-create_test_globalrc '' '
+create_test_global_config '' '
 [editors]
     terminal = my-edit'
 PATH=$PWD/bin:$PATH run_ok "${TEST_NAME}" cylc edit -i "${SUITE_NAME}"
diff --git a/tests/functional/cylc-edit/00-basic/flow.cylc b/tests/functional/cylc-edit/00-basic/flow.cylc
new file mode 100644
index 00000000000..e8f29cb075e
--- /dev/null
+++ b/tests/functional/cylc-edit/00-basic/flow.cylc
@@ -0,0 +1,8 @@
+#!jinja2
+[meta]
+    title=foo
+    description=A test flow.cylc with includes
+[cylc]
+UTC mode=True # Ignore DST
+%include include/flow-scheduling.cylc
+%include include/flow-runtime.cylc
diff --git a/tests/functional/cylc-edit/00-basic/include/suite-runtime.rc b/tests/functional/cylc-edit/00-basic/include/flow-runtime.cylc
similarity index 100%
rename from tests/functional/cylc-edit/00-basic/include/suite-runtime.rc
rename to tests/functional/cylc-edit/00-basic/include/flow-runtime.cylc
diff --git a/tests/functional/cylc-edit/00-basic/include/suite-scheduling.rc b/tests/functional/cylc-edit/00-basic/include/flow-scheduling.cylc
similarity index 100%
rename from tests/functional/cylc-edit/00-basic/include/suite-scheduling.rc
rename to tests/functional/cylc-edit/00-basic/include/flow-scheduling.cylc
diff --git a/tests/functional/cylc-edit/00-basic/suite.rc b/tests/functional/cylc-edit/00-basic/suite.rc
deleted file mode 100644
index 1f386c6979e..00000000000
--- a/tests/functional/cylc-edit/00-basic/suite.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-#!jinja2
-[meta]
-    title=foo
-    description=A test suite.rc with includes
-[cylc]
-UTC mode=True # Ignore DST
-%include include/suite-scheduling.rc
-%include include/suite-runtime.rc
diff --git a/tests/functional/cylc-get-config/00-simple.t b/tests/functional/cylc-get-config/00-simple.t
index 79705312b99..cc303c21728 100755
--- a/tests/functional/cylc-get-config/00-simple.t
+++ b/tests/functional/cylc-get-config/00-simple.t
@@ -20,7 +20,7 @@
 #-------------------------------------------------------------------------------
 set_test_number 19
 #-------------------------------------------------------------------------------
-init_suite "${TEST_NAME_BASE}" "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/suite.rc"
+init_suite "${TEST_NAME_BASE}" "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/flow.cylc"
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-all"
 run_ok "${TEST_NAME}" cylc get-config "${SUITE_NAME}"
diff --git a/tests/functional/cylc-get-config/00-simple/suite.rc b/tests/functional/cylc-get-config/00-simple/flow.cylc
similarity index 100%
rename from tests/functional/cylc-get-config/00-simple/suite.rc
rename to tests/functional/cylc-get-config/00-simple/flow.cylc
diff --git a/tests/functional/cylc-get-config/01-no-final.t b/tests/functional/cylc-get-config/01-no-final.t
index a7fa1ad1d43..13512e800ae 100755
--- a/tests/functional/cylc-get-config/01-no-final.t
+++ b/tests/functional/cylc-get-config/01-no-final.t
@@ -20,7 +20,7 @@
 #-------------------------------------------------------------------------------
 set_test_number 2
 #-------------------------------------------------------------------------------
-init_suite "${TEST_NAME_BASE}" "$TEST_SOURCE_DIR/${TEST_NAME_BASE}/suite.rc"
+init_suite "${TEST_NAME_BASE}" "$TEST_SOURCE_DIR/${TEST_NAME_BASE}/flow.cylc"
 #-------------------------------------------------------------------------------
 TEST_NAME=${TEST_NAME_BASE}-all
 run_ok "${TEST_NAME}" cylc get-config "${SUITE_NAME}" --item='[scheduling]final cycle point'
diff --git a/tests/functional/cylc-get-config/01-no-final/suite.rc b/tests/functional/cylc-get-config/01-no-final/flow.cylc
similarity index 100%
rename from tests/functional/cylc-get-config/01-no-final/suite.rc
rename to tests/functional/cylc-get-config/01-no-final/flow.cylc
diff --git a/tests/functional/cylc-get-config/02-cycling.t b/tests/functional/cylc-get-config/02-cycling.t
index df1cf094294..206a7896a12 100755
--- a/tests/functional/cylc-get-config/02-cycling.t
+++ b/tests/functional/cylc-get-config/02-cycling.t
@@ -20,7 +20,7 @@
 
 set_test_number 2
 
-init_suite "${TEST_NAME_BASE}" "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/suite.rc"
+init_suite "${TEST_NAME_BASE}" "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/flow.cylc"
 
 run_ok "${TEST_NAME_BASE}" cylc get-config "${SUITE_NAME}"
 run_ok "${TEST_NAME_BASE}-validate" \
diff --git a/tests/functional/cylc-get-config/02-cycling/suite.rc b/tests/functional/cylc-get-config/02-cycling/flow.cylc
similarity index 100%
rename from tests/functional/cylc-get-config/02-cycling/suite.rc
rename to tests/functional/cylc-get-config/02-cycling/flow.cylc
diff --git a/tests/functional/cylc-get-config/03-icp.t b/tests/functional/cylc-get-config/03-icp.t
index 2840b129b2f..7c33549804b 100755
--- a/tests/functional/cylc-get-config/03-icp.t
+++ b/tests/functional/cylc-get-config/03-icp.t
@@ -20,7 +20,7 @@
 
 set_test_number 3
 
-init_suite "${TEST_NAME_BASE}" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     UTC mode = True
 [scheduling]
@@ -29,7 +29,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITE_RC__'
 [runtime]
     [[foo, bar]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}" cylc get-config --icp=20200101T0000Z "${SUITE_NAME}"
 contains_ok "${TEST_NAME_BASE}.stdout" <<__OUT__
diff --git a/tests/functional/cylc-get-config/05-param-vars/suite.rc b/tests/functional/cylc-get-config/05-param-vars/flow.cylc
similarity index 100%
rename from tests/functional/cylc-get-config/05-param-vars/suite.rc
rename to tests/functional/cylc-get-config/05-param-vars/flow.cylc
diff --git a/tests/functional/cylc-get-config/06-compat.t b/tests/functional/cylc-get-config/06-compat.t
index f8076f84787..42fda7125f6 100644
--- a/tests/functional/cylc-get-config/06-compat.t
+++ b/tests/functional/cylc-get-config/06-compat.t
@@ -21,7 +21,7 @@
 
 set_test_number 3
 
-cat >'suite.rc' <<'__SUITERC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     initial cycle point = next(T00)
     [[dependencies]]
@@ -40,10 +40,10 @@ cat >'suite.rc' <<'__SUITERC__'
             graph = t1 => t2
         [[[ P1D!(01T, 11T) ]]]
             graph = t3
-__SUITERC__
-run_ok "${TEST_NAME_BASE}-validate" cylc validate 'suite.rc'
+__FLOW_CONFIG__
+run_ok "${TEST_NAME_BASE}-validate" cylc validate 'flow.cylc'
 run_ok "${TEST_NAME_BASE}-dependencies" \
-    cylc get-config --item='[scheduling][graph]' 'suite.rc'
+    cylc get-config --item='[scheduling][graph]' 'flow.cylc'
 cmp_ok "${TEST_NAME_BASE}-dependencies.stdout" <<'__OUT__'
 R1 = """
     r1
diff --git a/tests/functional/cylc-get-cylc-version/00-basic/suite.rc b/tests/functional/cylc-get-cylc-version/00-basic/flow.cylc
similarity index 100%
rename from tests/functional/cylc-get-cylc-version/00-basic/suite.rc
rename to tests/functional/cylc-get-cylc-version/00-basic/flow.cylc
diff --git a/tests/functional/cylc-get-site-config/01-defaults.t b/tests/functional/cylc-get-site-config/01-defaults.t
index a72f446690f..dda3611ee76 100644
--- a/tests/functional/cylc-get-site-config/01-defaults.t
+++ b/tests/functional/cylc-get-site-config/01-defaults.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -21,12 +21,12 @@
 
 set_test_number 1
 
-# Empty it (of non-default flow-tests.rc items, which would then be retrieved
+# Empty it (of non-default global-tests.cylc items, which would then be retrieved
 # by "cylc get-global-config" below).
-echo '' > "$CYLC_CONF_PATH/flow.rc"
+echo '' > "$CYLC_CONF_PATH/global.cylc"
 
 # Replace it entirely with system defaults.
-cylc get-global-config > "$CYLC_CONF_PATH/flow.rc"
+cylc get-global-config > "$CYLC_CONF_PATH/global.cylc"
 
 # Check that the new file parses OK.
 run_ok "${TEST_NAME_BASE}" cylc get-global-config
diff --git a/tests/functional/cylc-get-site-config/02-jinja2.t b/tests/functional/cylc-get-site-config/02-jinja2.t
index 2d9ccc74646..175ad3f2a6e 100644
--- a/tests/functional/cylc-get-site-config/02-jinja2.t
+++ b/tests/functional/cylc-get-site-config/02-jinja2.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -20,7 +20,7 @@
 . "$(dirname "$0")/test_header"
 set_test_number 3
 
-create_test_globalrc '#!jinja2' '
+create_test_global_config '#!jinja2' '
 {% set UTC_MODE = True %}
 [cylc]
     UTC mode = {{UTC_MODE}}'
diff --git a/tests/functional/cylc-get-site-config/03-host-bool-override.t b/tests/functional/cylc-get-site-config/03-host-bool-override.t
index c5d6bb8afd8..04297d1e0ca 100644
--- a/tests/functional/cylc-get-site-config/03-host-bool-override.t
+++ b/tests/functional/cylc-get-site-config/03-host-bool-override.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -20,7 +20,7 @@
 . "$(dirname "$0")/test_header"
 set_test_number 3
 
-create_test_globalrc '' '
+create_test_global_config '' '
 [platforms]
     [[localhost]]
         use login shell = True
diff --git a/tests/functional/cylc-get-site-config/04-homeless.t b/tests/functional/cylc-get-site-config/04-homeless.t
index 8bfffa9313a..51ce47ffd07 100644
--- a/tests/functional/cylc-get-site-config/04-homeless.t
+++ b/tests/functional/cylc-get-site-config/04-homeless.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -20,7 +20,7 @@
 . "$(dirname "$0")/test_header"
 set_test_number 3
 
-create_test_globalrc '' ''
+create_test_global_config '' ''
 
 run_ok "${TEST_NAME_BASE}" \
     env -u HOME \
diff --git a/tests/functional/cylc-get-site-config/05-host-bool-override.t b/tests/functional/cylc-get-site-config/05-host-bool-override.t
index c06e2a6db03..43dc360ae4e 100644
--- a/tests/functional/cylc-get-site-config/05-host-bool-override.t
+++ b/tests/functional/cylc-get-site-config/05-host-bool-override.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -21,7 +21,7 @@
 set_test_number 2
 
 mkdir etc/
-cat etc/flow.rc <<'__hi__'
+cat etc/global.cylc <<'__hi__'
 [platforms]
     [[desktop\d\d|laptop\d\d]]
     [[sugar]]
diff --git a/tests/functional/cylc-get-suite-contact/00-basic.t b/tests/functional/cylc-get-suite-contact/00-basic.t
index 339e9b32354..447bff4dcf8 100644
--- a/tests/functional/cylc-get-suite-contact/00-basic.t
+++ b/tests/functional/cylc-get-suite-contact/00-basic.t
@@ -18,7 +18,7 @@
 # Test "cylc get-suite-contact" basic usage.
 . "$(dirname "$0")/test_header"
 set_test_number 6
-init_suite "${TEST_NAME_BASE}" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     cycle point format = %Y
 [scheduling]
@@ -28,7 +28,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITE_RC__'
 [runtime]
     [[t1]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 run_fail "${TEST_NAME_BASE}-get-suite-contact-1" \
diff --git a/tests/functional/cylc-graph-diff/00-simple-control/suite.rc b/tests/functional/cylc-graph-diff/00-simple-control/flow.cylc
similarity index 100%
rename from tests/functional/cylc-graph-diff/00-simple-control/suite.rc
rename to tests/functional/cylc-graph-diff/00-simple-control/flow.cylc
diff --git a/tests/functional/cylc-graph-diff/00-simple-diffs/suite.rc b/tests/functional/cylc-graph-diff/00-simple-diffs/flow.cylc
similarity index 100%
rename from tests/functional/cylc-graph-diff/00-simple-diffs/suite.rc
rename to tests/functional/cylc-graph-diff/00-simple-diffs/flow.cylc
diff --git a/tests/functional/cylc-graph-diff/01-icp.t b/tests/functional/cylc-graph-diff/01-icp.t
index ea630b14d73..6e1010296a7 100755
--- a/tests/functional/cylc-graph-diff/01-icp.t
+++ b/tests/functional/cylc-graph-diff/01-icp.t
@@ -20,7 +20,7 @@
 
 set_test_number 3
 
-init_suite "${TEST_NAME_BASE}-1" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}-1" <<'__FLOW_CONFIG__'
 [cylc]
     UTC mode = True
 [scheduling]
@@ -29,10 +29,10 @@ init_suite "${TEST_NAME_BASE}-1" <<'__SUITE_RC__'
 [runtime]
     [[foo, bar]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 # shellcheck disable=SC2153
 SUITE_NAME1="${SUITE_NAME}"
-init_suite "${TEST_NAME_BASE}-2" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}-2" <<'__FLOW_CONFIG__'
 [cylc]
     UTC mode = True
 [scheduling]
@@ -41,7 +41,7 @@ init_suite "${TEST_NAME_BASE}-2" <<'__SUITE_RC__'
 [runtime]
     [[food, barley]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 # shellcheck disable=SC2153
 SUITE_NAME2="${SUITE_NAME}"
 
diff --git a/tests/functional/cylc-kill/00-multi-hosts-compat/suite.rc b/tests/functional/cylc-kill/00-multi-hosts-compat/flow.cylc
similarity index 100%
rename from tests/functional/cylc-kill/00-multi-hosts-compat/suite.rc
rename to tests/functional/cylc-kill/00-multi-hosts-compat/flow.cylc
diff --git a/tests/functional/cylc-kill/01-multi-hosts/suite.rc b/tests/functional/cylc-kill/01-multi-hosts/flow.cylc
similarity index 100%
rename from tests/functional/cylc-kill/01-multi-hosts/suite.rc
rename to tests/functional/cylc-kill/01-multi-hosts/flow.cylc
diff --git a/tests/functional/cylc-kill/02-submitted/suite.rc b/tests/functional/cylc-kill/02-submitted/flow.cylc
similarity index 100%
rename from tests/functional/cylc-kill/02-submitted/suite.rc
rename to tests/functional/cylc-kill/02-submitted/flow.cylc
diff --git a/tests/functional/cylc-list/01-icp.t b/tests/functional/cylc-list/01-icp.t
index ac51e2351ab..1fcd4ac80b4 100755
--- a/tests/functional/cylc-list/01-icp.t
+++ b/tests/functional/cylc-list/01-icp.t
@@ -20,7 +20,7 @@
 
 set_test_number 3
 
-init_suite "${TEST_NAME_BASE}" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     UTC mode = True
 [scheduling]
@@ -29,7 +29,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITE_RC__'
 [runtime]
     [[foo, bar]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}" cylc list --icp=20200101T0000Z "${SUITE_NAME}"
 cmp_ok "${TEST_NAME_BASE}.stdout" <<__OUT__
diff --git a/tests/functional/cylc-list/suite/suite.rc b/tests/functional/cylc-list/suite/flow.cylc
similarity index 100%
rename from tests/functional/cylc-list/suite/suite.rc
rename to tests/functional/cylc-list/suite/flow.cylc
diff --git a/tests/functional/cylc-message/00-ssh.t b/tests/functional/cylc-message/00-ssh.t
index ab751c1f583..4270ebb7173 100755
--- a/tests/functional/cylc-message/00-ssh.t
+++ b/tests/functional/cylc-message/00-ssh.t
@@ -26,7 +26,7 @@ skip_all 'ssh task comm not currently functional'
 require_remote_platform
 set_test_number 3
 
-create_test_globalrc '' "
+create_test_global_config '' "
 [platforms]
     [[${CYLC_TEST_PLATFORM}-ssh]]
         hosts = ${CYLC_TEST_HOST}
diff --git a/tests/functional/cylc-message/00-ssh/suite.rc b/tests/functional/cylc-message/00-ssh/flow.cylc
similarity index 100%
rename from tests/functional/cylc-message/00-ssh/suite.rc
rename to tests/functional/cylc-message/00-ssh/flow.cylc
diff --git a/tests/functional/cylc-message/01-newline/suite.rc b/tests/functional/cylc-message/01-newline/flow.cylc
similarity index 100%
rename from tests/functional/cylc-message/01-newline/suite.rc
rename to tests/functional/cylc-message/01-newline/flow.cylc
diff --git a/tests/functional/cylc-message/02-multi/suite.rc b/tests/functional/cylc-message/02-multi/flow.cylc
similarity index 100%
rename from tests/functional/cylc-message/02-multi/suite.rc
rename to tests/functional/cylc-message/02-multi/flow.cylc
diff --git a/tests/functional/cylc-ping/00-simple/suite.rc b/tests/functional/cylc-ping/00-simple/flow.cylc
similarity index 100%
rename from tests/functional/cylc-ping/00-simple/suite.rc
rename to tests/functional/cylc-ping/00-simple/flow.cylc
diff --git a/tests/functional/cylc-ping/03-check-keys-local.t b/tests/functional/cylc-ping/03-check-keys-local.t
index 4c1587bf2c8..49bd712639f 100644
--- a/tests/functional/cylc-ping/03-check-keys-local.t
+++ b/tests/functional/cylc-ping/03-check-keys-local.t
@@ -18,14 +18,14 @@
 # Checks ZMQ keys are created and deleted on shutdown - local.
 . "$(dirname "$0")/test_header"
 set_test_number 10
-init_suite "${TEST_NAME_BASE}" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     cycle point format = %Y
 [scheduling]
     initial cycle point = 2020
     [[graph]]
         R1 = t1
-__SUITE_RC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 
diff --git a/tests/functional/cylc-ping/04-check-keys-remote.t b/tests/functional/cylc-ping/04-check-keys-remote.t
index 8d65041389e..62e989142eb 100644
--- a/tests/functional/cylc-ping/04-check-keys-remote.t
+++ b/tests/functional/cylc-ping/04-check-keys-remote.t
@@ -22,7 +22,7 @@ require_remote_platform
 
 set_test_number 4
 
-init_suite "${TEST_NAME_BASE}" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 #!jinja2
 [cylc]
 [scheduling]
@@ -34,7 +34,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITE_RC__'
         platform = {{CYLC_TEST_PLATFORM}}
     [[held]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}" \
     -s "CYLC_TEST_PLATFORM=${CYLC_TEST_PLATFORM}"
diff --git a/tests/functional/cylc-poll/00-basic/suite.rc b/tests/functional/cylc-poll/00-basic/flow.cylc
similarity index 100%
rename from tests/functional/cylc-poll/00-basic/suite.rc
rename to tests/functional/cylc-poll/00-basic/flow.cylc
diff --git a/tests/functional/cylc-poll/01-task-failed/suite.rc b/tests/functional/cylc-poll/01-task-failed/flow.cylc
similarity index 100%
rename from tests/functional/cylc-poll/01-task-failed/suite.rc
rename to tests/functional/cylc-poll/01-task-failed/flow.cylc
diff --git a/tests/functional/cylc-poll/02-task-submit-failed.t b/tests/functional/cylc-poll/02-task-submit-failed.t
index d1f09eed1d1..21607003ec4 100755
--- a/tests/functional/cylc-poll/02-task-submit-failed.t
+++ b/tests/functional/cylc-poll/02-task-submit-failed.t
@@ -20,7 +20,7 @@
 skip_darwin 'atrun hard to configure on Mac OS'
 set_test_number 2
 
-create_test_globalrc "" "
+create_test_global_config "" "
 [platforms]
 [[crocodile]]
   hosts = localhost
diff --git a/tests/functional/cylc-poll/02-task-submit-failed/suite.rc b/tests/functional/cylc-poll/02-task-submit-failed/flow.cylc
similarity index 100%
rename from tests/functional/cylc-poll/02-task-submit-failed/suite.rc
rename to tests/functional/cylc-poll/02-task-submit-failed/flow.cylc
diff --git a/tests/functional/cylc-poll/04-poll-multi-hosts/suite.rc b/tests/functional/cylc-poll/04-poll-multi-hosts/flow.cylc
similarity index 100%
rename from tests/functional/cylc-poll/04-poll-multi-hosts/suite.rc
rename to tests/functional/cylc-poll/04-poll-multi-hosts/flow.cylc
diff --git a/tests/functional/cylc-poll/05-poll-multi-messages/suite.rc b/tests/functional/cylc-poll/05-poll-multi-messages/flow.cylc
similarity index 100%
rename from tests/functional/cylc-poll/05-poll-multi-messages/suite.rc
rename to tests/functional/cylc-poll/05-poll-multi-messages/flow.cylc
diff --git a/tests/functional/cylc-poll/06-loadleveler.t b/tests/functional/cylc-poll/06-loadleveler.t
index ca305395f0a..0e41509510e 100755
--- a/tests/functional/cylc-poll/06-loadleveler.t
+++ b/tests/functional/cylc-poll/06-loadleveler.t
@@ -33,7 +33,7 @@ fi
 export CYLC_TEST_BATCH_TASK_HOST CYLC_TEST_BATCH_SITE_DIRECTIVES
 set_test_number 2
 
-create_test_globalrc "" "
+create_test_global_config "" "
 [platforms]
     [[loadleveler-platform]]
         hosts = $CYLC_TEST_BATCH_TASK_HOST
diff --git a/tests/functional/cylc-poll/06-loadleveler/suite.rc b/tests/functional/cylc-poll/06-loadleveler/flow.cylc
similarity index 100%
rename from tests/functional/cylc-poll/06-loadleveler/suite.rc
rename to tests/functional/cylc-poll/06-loadleveler/flow.cylc
diff --git a/tests/functional/cylc-poll/07-pbs/suite.rc b/tests/functional/cylc-poll/07-pbs/flow.cylc
similarity index 100%
rename from tests/functional/cylc-poll/07-pbs/suite.rc
rename to tests/functional/cylc-poll/07-pbs/flow.cylc
diff --git a/tests/functional/cylc-poll/08-slurm/suite.rc b/tests/functional/cylc-poll/08-slurm/flow.cylc
similarity index 100%
rename from tests/functional/cylc-poll/08-slurm/suite.rc
rename to tests/functional/cylc-poll/08-slurm/flow.cylc
diff --git a/tests/functional/cylc-poll/09-lsf/suite.rc b/tests/functional/cylc-poll/09-lsf/flow.cylc
similarity index 100%
rename from tests/functional/cylc-poll/09-lsf/suite.rc
rename to tests/functional/cylc-poll/09-lsf/flow.cylc
diff --git a/tests/functional/cylc-poll/10-basic-compat/suite.rc b/tests/functional/cylc-poll/10-basic-compat/flow.cylc
similarity index 100%
rename from tests/functional/cylc-poll/10-basic-compat/suite.rc
rename to tests/functional/cylc-poll/10-basic-compat/flow.cylc
diff --git a/tests/functional/cylc-poll/11-event-time/suite.rc b/tests/functional/cylc-poll/11-event-time/flow.cylc
similarity index 100%
rename from tests/functional/cylc-poll/11-event-time/suite.rc
rename to tests/functional/cylc-poll/11-event-time/flow.cylc
diff --git a/tests/functional/cylc-poll/13-comm-method.t b/tests/functional/cylc-poll/13-comm-method.t
index d064187888b..1ace1eb38f8 100755
--- a/tests/functional/cylc-poll/13-comm-method.t
+++ b/tests/functional/cylc-poll/13-comm-method.t
@@ -15,14 +15,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
-# Test poll intervals is used from both flow.rc and suite.rc
+# Test poll intervals is used from both global.cylc and flow.cylc
 . "$(dirname "${0}")/test_header"
 #-------------------------------------------------------------------------------
 set_test_number 6
 install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 #-------------------------------------------------------------------------------
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
-create_test_globalrc '
+create_test_global_config '
 [platforms]
    [[localhost]]
         communication method = poll
diff --git a/tests/functional/cylc-poll/13-comm-method/suite.rc b/tests/functional/cylc-poll/13-comm-method/flow.cylc
similarity index 100%
rename from tests/functional/cylc-poll/13-comm-method/suite.rc
rename to tests/functional/cylc-poll/13-comm-method/flow.cylc
diff --git a/tests/functional/cylc-poll/14-intervals.t b/tests/functional/cylc-poll/14-intervals.t
index 03235a75fbf..ebba66c17d1 100755
--- a/tests/functional/cylc-poll/14-intervals.t
+++ b/tests/functional/cylc-poll/14-intervals.t
@@ -22,7 +22,7 @@ set_test_number 6
 install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 #-------------------------------------------------------------------------------
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
-create_test_globalrc '
+create_test_global_config '
 [platforms]
    [[localhost]]
         submission polling intervals = PT2S,6*PT10S
diff --git a/tests/functional/cylc-poll/14-intervals/suite.rc b/tests/functional/cylc-poll/14-intervals/flow.cylc
similarity index 100%
rename from tests/functional/cylc-poll/14-intervals/suite.rc
rename to tests/functional/cylc-poll/14-intervals/flow.cylc
diff --git a/tests/functional/cylc-poll/15-job-st-file-no-batch/suite.rc b/tests/functional/cylc-poll/15-job-st-file-no-batch/flow.cylc
similarity index 100%
rename from tests/functional/cylc-poll/15-job-st-file-no-batch/suite.rc
rename to tests/functional/cylc-poll/15-job-st-file-no-batch/flow.cylc
diff --git a/tests/functional/cylc-poll/17-pbs-cant-connect/suite.rc b/tests/functional/cylc-poll/17-pbs-cant-connect/flow.cylc
similarity index 100%
rename from tests/functional/cylc-poll/17-pbs-cant-connect/suite.rc
rename to tests/functional/cylc-poll/17-pbs-cant-connect/flow.cylc
diff --git a/tests/functional/cylc-remove/00-simple/suite.rc b/tests/functional/cylc-remove/00-simple/flow.cylc
similarity index 100%
rename from tests/functional/cylc-remove/00-simple/suite.rc
rename to tests/functional/cylc-remove/00-simple/flow.cylc
diff --git a/tests/functional/cylc-remove/02-cycling/suite.rc b/tests/functional/cylc-remove/02-cycling/flow.cylc
similarity index 100%
rename from tests/functional/cylc-remove/02-cycling/suite.rc
rename to tests/functional/cylc-remove/02-cycling/flow.cylc
diff --git a/tests/functional/cylc-run/02-format.t b/tests/functional/cylc-run/02-format.t
index 859412601e4..2836307c226 100644
--- a/tests/functional/cylc-run/02-format.t
+++ b/tests/functional/cylc-run/02-format.t
@@ -22,14 +22,14 @@
 
 set_test_number 7
 
-init_suite "${TEST_NAME_BASE}" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [scheduling]
     [[dependencies]]
         R1 = foo
 [runtime]
     [[foo]]
         script = cylc stop --now --now "${CYLC_SUITE_NAME}"
-__SUITE_RC__
+__FLOW_CONFIG__
 
 TEST_NAME="${TEST_NAME_BASE}-validate"
 run_ok "${TEST_NAME}" cylc validate "${SUITE_NAME}"
diff --git a/tests/functional/cylc-scan/01-scan.t b/tests/functional/cylc-scan/01-scan.t
index c4c888077d7..37373a0e1bf 100644
--- a/tests/functional/cylc-scan/01-scan.t
+++ b/tests/functional/cylc-scan/01-scan.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -20,14 +20,14 @@
 #-------------------------------------------------------------------------------
 set_test_number 8
 #-------------------------------------------------------------------------------
-init_suite "${TEST_NAME_BASE}" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = foo
 [runtime]
     [[foo]]
         script = sleep 60
-__SUITE_RC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 run_ok "${TEST_NAME_BASE}-run" cylc run "${SUITE_NAME}"
diff --git a/tests/functional/cylc-scan/02-sigstop.t b/tests/functional/cylc-scan/02-sigstop.t
index a19f1918dc2..6510ca93ab6 100644
--- a/tests/functional/cylc-scan/02-sigstop.t
+++ b/tests/functional/cylc-scan/02-sigstop.t
@@ -22,7 +22,7 @@ install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 run_ok "${TEST_NAME_BASE}-run" cylc run --hold "${SUITE_NAME}"
-cylc__job__poll_grep_suite_log "Suite held"
+poll_grep_suite_log "Suite held"
 SUITE_PID=$(cylc get-suite-contact "${SUITE_NAME}" | \
   awk '/CYLC_SUITE_PROCESS/ {print $1}' | sed -e 's/^.*=//')
 
diff --git a/tests/functional/cylc-scan/02-sigstop/suite.rc b/tests/functional/cylc-scan/02-sigstop/flow.cylc
similarity index 100%
rename from tests/functional/cylc-scan/02-sigstop/suite.rc
rename to tests/functional/cylc-scan/02-sigstop/flow.cylc
diff --git a/tests/functional/cylc-scan/04-outputs/suite.rc b/tests/functional/cylc-scan/04-outputs/flow.cylc
similarity index 100%
rename from tests/functional/cylc-scan/04-outputs/suite.rc
rename to tests/functional/cylc-scan/04-outputs/flow.cylc
diff --git a/tests/functional/cylc-search/00-basic.t b/tests/functional/cylc-search/00-basic.t
index df95eea6371..8452a4b62a8 100644
--- a/tests/functional/cylc-search/00-basic.t
+++ b/tests/functional/cylc-search/00-basic.t
@@ -25,7 +25,7 @@ TEST_NAME="${TEST_NAME_BASE}"
 run_ok "${TEST_NAME}" cylc search "${SUITE_NAME}" 'initial cycle point'
 cmp_ok "${TEST_NAME}.stdout" <<__OUT__
 
-FILE: ${PWD}/include/suite-scheduling.rc
+FILE: ${PWD}/include/flow-scheduling.cylc
    SECTION: [scheduling]
       (2): initial cycle point=20130101
 __OUT__
diff --git a/tests/functional/cylc-search/00-basic/flow.cylc b/tests/functional/cylc-search/00-basic/flow.cylc
new file mode 100644
index 00000000000..e8f29cb075e
--- /dev/null
+++ b/tests/functional/cylc-search/00-basic/flow.cylc
@@ -0,0 +1,8 @@
+#!jinja2
+[meta]
+    title=foo
+    description=A test flow.cylc with includes
+[cylc]
+UTC mode=True # Ignore DST
+%include include/flow-scheduling.cylc
+%include include/flow-runtime.cylc
diff --git a/tests/functional/cylc-search/00-basic/include/suite-runtime.rc b/tests/functional/cylc-search/00-basic/include/flow-runtime.cylc
similarity index 100%
rename from tests/functional/cylc-search/00-basic/include/suite-runtime.rc
rename to tests/functional/cylc-search/00-basic/include/flow-runtime.cylc
diff --git a/tests/functional/cylc-search/00-basic/include/suite-scheduling.rc b/tests/functional/cylc-search/00-basic/include/flow-scheduling.cylc
similarity index 100%
rename from tests/functional/cylc-search/00-basic/include/suite-scheduling.rc
rename to tests/functional/cylc-search/00-basic/include/flow-scheduling.cylc
diff --git a/tests/functional/cylc-search/00-basic/suite.rc b/tests/functional/cylc-search/00-basic/suite.rc
deleted file mode 100644
index 1f386c6979e..00000000000
--- a/tests/functional/cylc-search/00-basic/suite.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-#!jinja2
-[meta]
-    title=foo
-    description=A test suite.rc with includes
-[cylc]
-UTC mode=True # Ignore DST
-%include include/suite-scheduling.rc
-%include include/suite-runtime.rc
diff --git a/tests/functional/cylc-show/05-complex/suite.rc b/tests/functional/cylc-show/05-complex/flow.cylc
similarity index 100%
rename from tests/functional/cylc-show/05-complex/suite.rc
rename to tests/functional/cylc-show/05-complex/flow.cylc
diff --git a/tests/functional/cylc-show/clock-triggered-non-utc-mode/suite.rc b/tests/functional/cylc-show/clock-triggered-non-utc-mode/flow.cylc
similarity index 100%
rename from tests/functional/cylc-show/clock-triggered-non-utc-mode/suite.rc
rename to tests/functional/cylc-show/clock-triggered-non-utc-mode/flow.cylc
diff --git a/tests/functional/cylc-show/clock-triggered/suite.rc b/tests/functional/cylc-show/clock-triggered/flow.cylc
similarity index 100%
rename from tests/functional/cylc-show/clock-triggered/suite.rc
rename to tests/functional/cylc-show/clock-triggered/flow.cylc
diff --git a/tests/functional/cylc-subscribe/01-subscribe.t b/tests/functional/cylc-subscribe/01-subscribe.t
index a6b330fd4f5..45db7dea8c8 100644
--- a/tests/functional/cylc-subscribe/01-subscribe.t
+++ b/tests/functional/cylc-subscribe/01-subscribe.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -20,14 +20,14 @@
 #-------------------------------------------------------------------------------
 set_test_number 6
 #-------------------------------------------------------------------------------
-init_suite "${TEST_NAME_BASE}" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = foo => bar => wiq => qux
 [runtime]
     [[foo, bar, wiq, qux]]
         script = sleep 2
-__SUITE_RC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 run_ok "${TEST_NAME_BASE}-run" cylc run "${SUITE_NAME}"
diff --git a/tests/functional/cylc-trigger/00-compat/suite.rc b/tests/functional/cylc-trigger/00-compat/flow.cylc
similarity index 100%
rename from tests/functional/cylc-trigger/00-compat/suite.rc
rename to tests/functional/cylc-trigger/00-compat/flow.cylc
diff --git a/tests/functional/cylc-trigger/01-queued/suite.rc b/tests/functional/cylc-trigger/01-queued/flow.cylc
similarity index 100%
rename from tests/functional/cylc-trigger/01-queued/suite.rc
rename to tests/functional/cylc-trigger/01-queued/flow.cylc
diff --git a/tests/functional/cylc-trigger/02-filter-failed/suite.rc b/tests/functional/cylc-trigger/02-filter-failed/flow.cylc
similarity index 100%
rename from tests/functional/cylc-trigger/02-filter-failed/suite.rc
rename to tests/functional/cylc-trigger/02-filter-failed/flow.cylc
diff --git a/tests/functional/cylc-trigger/04-filter-names/suite.rc b/tests/functional/cylc-trigger/04-filter-names/flow.cylc
similarity index 100%
rename from tests/functional/cylc-trigger/04-filter-names/suite.rc
rename to tests/functional/cylc-trigger/04-filter-names/flow.cylc
diff --git a/tests/functional/cylc-trigger/05-filter-cycles/suite.rc b/tests/functional/cylc-trigger/05-filter-cycles/flow.cylc
similarity index 100%
rename from tests/functional/cylc-trigger/05-filter-cycles/suite.rc
rename to tests/functional/cylc-trigger/05-filter-cycles/flow.cylc
diff --git a/tests/functional/cylc-view/00-single-inc/suite.rc b/tests/functional/cylc-view/00-single-inc/flow.cylc
similarity index 100%
rename from tests/functional/cylc-view/00-single-inc/suite.rc
rename to tests/functional/cylc-view/00-single-inc/flow.cylc
diff --git a/tests/functional/database/03-remote/suite.rc b/tests/functional/database/03-remote/flow.cylc
similarity index 100%
rename from tests/functional/database/03-remote/suite.rc
rename to tests/functional/database/03-remote/flow.cylc
diff --git a/tests/functional/database/04-lock-recover/suite.rc b/tests/functional/database/04-lock-recover/flow.cylc
similarity index 100%
rename from tests/functional/database/04-lock-recover/suite.rc
rename to tests/functional/database/04-lock-recover/flow.cylc
diff --git a/tests/functional/database/05-lock-recover-100/suite.rc b/tests/functional/database/05-lock-recover-100/flow.cylc
similarity index 100%
rename from tests/functional/database/05-lock-recover-100/suite.rc
rename to tests/functional/database/05-lock-recover-100/flow.cylc
diff --git a/tests/functional/database/06-task-message/suite.rc b/tests/functional/database/06-task-message/flow.cylc
similarity index 100%
rename from tests/functional/database/06-task-message/suite.rc
rename to tests/functional/database/06-task-message/flow.cylc
diff --git a/tests/functional/deprecations/00-pre-cylc8/suite.rc b/tests/functional/deprecations/00-pre-cylc8/flow.cylc
similarity index 100%
rename from tests/functional/deprecations/00-pre-cylc8/suite.rc
rename to tests/functional/deprecations/00-pre-cylc8/flow.cylc
diff --git a/tests/functional/deprecations/01-cylc8-basic/suite.rc b/tests/functional/deprecations/01-cylc8-basic/flow.cylc
similarity index 100%
rename from tests/functional/deprecations/01-cylc8-basic/suite.rc
rename to tests/functional/deprecations/01-cylc8-basic/flow.cylc
diff --git a/tests/functional/deprecations/02-overwrite/suite.rc b/tests/functional/deprecations/02-overwrite/flow.cylc
similarity index 100%
rename from tests/functional/deprecations/02-overwrite/suite.rc
rename to tests/functional/deprecations/02-overwrite/flow.cylc
diff --git a/tests/functional/deprecations/03-suiterc.t b/tests/functional/deprecations/03-suiterc.t
new file mode 100644
index 00000000000..5989956515b
--- /dev/null
+++ b/tests/functional/deprecations/03-suiterc.t
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+# THIS FILE IS PART OF THE CYLC SUITE ENGINE.
+# Copyright (C) NIWA & British Crown (Met Office) & Contributors.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#------------------------------------------------------------------------------
+# Test backwards compatibility for suite.rc files
+
+. "$(dirname "$0")/test_header"
+set_test_number 3
+
+init_suiterc() {
+    local TEST_NAME="$1"
+    local FLOW_CONFIG="${2:--}"
+    SUITE_NAME="cylctb-${CYLC_TEST_TIME_INIT}/${TEST_SOURCE_DIR_BASE}/${TEST_NAME}"
+    mkdir -p "${TEST_DIR}/${SUITE_NAME}/"
+    cat "${FLOW_CONFIG}" >"${TEST_DIR}/${SUITE_NAME}/suite.rc"
+    cd "${TEST_DIR}/${SUITE_NAME}" || exit
+}
+
+init_suiterc "${TEST_NAME_BASE}" <<'__FLOW__'
+[scheduling]
+    [[graph]]
+        R1 = foo => bar
+__FLOW__
+
+TEST_NAME="${TEST_NAME_BASE}-validate"
+run_ok "${TEST_NAME}" cylc validate .
+
+TEST_NAME="${TEST_NAME_BASE}-register"
+run_ok "${TEST_NAME}" cylc register "${SUITE_NAME}"
+
+exists_ok "flow.cylc"
+
+purge_suite "${SUITE_NAME}"
diff --git a/tests/functional/directives/01-at/suite.rc b/tests/functional/directives/01-at/flow.cylc
similarity index 100%
rename from tests/functional/directives/01-at/suite.rc
rename to tests/functional/directives/01-at/flow.cylc
diff --git a/tests/functional/directives/loadleveler/suite.rc b/tests/functional/directives/loadleveler/flow.cylc
similarity index 100%
rename from tests/functional/directives/loadleveler/suite.rc
rename to tests/functional/directives/loadleveler/flow.cylc
diff --git a/tests/functional/directives/pbs/suite.rc b/tests/functional/directives/pbs/flow.cylc
similarity index 100%
rename from tests/functional/directives/pbs/suite.rc
rename to tests/functional/directives/pbs/flow.cylc
diff --git a/tests/functional/directives/slurm/suite.rc b/tests/functional/directives/slurm/flow.cylc
similarity index 100%
rename from tests/functional/directives/slurm/suite.rc
rename to tests/functional/directives/slurm/flow.cylc
diff --git a/tests/functional/empy/00-simple.t b/tests/functional/empy/00-simple.t
index 9f87807410a..bb3a26ab291 100644
--- a/tests/functional/empy/00-simple.t
+++ b/tests/functional/empy/00-simple.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -26,9 +26,9 @@ set_test_number 2
 install_suite "${TEST_NAME_BASE}" '00-simple'
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-validate"
-run_ok "${TEST_NAME}" cylc validate -o 'suite.rc.processed' "${SUITE_NAME}"
+run_ok "${TEST_NAME}" cylc validate -o 'flow.cylc.processed' "${SUITE_NAME}"
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-check-expansion"
-cmp_ok 'suite.rc.processed' "${TEST_SOURCE_DIR}/00-simple/suite.rc-expanded"
+cmp_ok 'flow.cylc.processed' "${TEST_SOURCE_DIR}/00-simple/flow.cylc-expanded"
 #-------------------------------------------------------------------------------
 purge_suite "${SUITE_NAME}"
diff --git a/tests/functional/empy/00-simple/suite.rc b/tests/functional/empy/00-simple/flow.cylc
similarity index 100%
rename from tests/functional/empy/00-simple/suite.rc
rename to tests/functional/empy/00-simple/flow.cylc
diff --git a/tests/functional/empy/00-simple/suite.rc-expanded b/tests/functional/empy/00-simple/flow.cylc-expanded
similarity index 100%
rename from tests/functional/empy/00-simple/suite.rc-expanded
rename to tests/functional/empy/00-simple/flow.cylc-expanded
diff --git a/tests/functional/env-filter/00-filter.t b/tests/functional/env-filter/00-filter.t
index 8c7f0314927..f5f9c213a95 100644
--- a/tests/functional/env-filter/00-filter.t
+++ b/tests/functional/env-filter/00-filter.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -18,10 +18,10 @@
 # Test environment filtering
 . "$(dirname "$0")/test_header"
 #-------------------------------------------------------------------------------
-set_test_number 13 
+set_test_number 13
 #-------------------------------------------------------------------------------
 # a test suite that uses environment filtering:
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = "foo & bar & baz & qux"
@@ -48,7 +48,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
     [[qux]]
         [[[environment]]]
             QUX = qux
-__SUITERC__
+__FLOW_CONFIG__
 #-------------------------------------------------------------------------------
 # check validation
 TEST_NAME="${TEST_NAME_BASE}-validate"
diff --git a/tests/functional/events/02-multi.t b/tests/functional/events/02-multi.t
index 81d7dcc9c2a..877b846b49b 100755
--- a/tests/functional/events/02-multi.t
+++ b/tests/functional/events/02-multi.t
@@ -21,7 +21,7 @@
 
 set_test_number 3
 
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [scheduling]
    [[graph]]
       R1 = t1
@@ -30,7 +30,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
         script=true
         [[[events]]]
             started handler = echo %(suite)s, echo %(name)s, echo %(start_time)s
-__SUITERC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 
diff --git a/tests/functional/events/08-task-event-handler-retry.t b/tests/functional/events/08-task-event-handler-retry.t
index 199be73d9e3..6a116d6e357 100755
--- a/tests/functional/events/08-task-event-handler-retry.t
+++ b/tests/functional/events/08-task-event-handler-retry.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -21,7 +21,7 @@ set_test_number 3
 
 OPT_SET=
 if [[ "${TEST_NAME_BASE}" == *-globalcfg ]]; then
-    create_test_globalrc "" "
+    create_test_global_config "" "
 [task events]
     handlers = hello-event-handler %(name)s %(event)s %(suite_url)s %(suite_uuid)s %(task_url)s %(message)s %(point)s %(submit_num)s %(id)s
     handler events=succeeded, failed
diff --git a/tests/functional/events/08-task-event-handler-retry/suite.rc b/tests/functional/events/08-task-event-handler-retry/flow.cylc
similarity index 100%
rename from tests/functional/events/08-task-event-handler-retry/suite.rc
rename to tests/functional/events/08-task-event-handler-retry/flow.cylc
diff --git a/tests/functional/events/09-task-event-mail.t b/tests/functional/events/09-task-event-mail.t
index f2013fa00f4..692fd1285cb 100755
--- a/tests/functional/events/09-task-event-mail.t
+++ b/tests/functional/events/09-task-event-mail.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -24,7 +24,7 @@ set_test_number 5
 mock_smtpd_init
 OPT_SET=
 if [[ "${TEST_NAME_BASE}" == *-globalcfg ]]; then
-    create_test_globalrc "" "
+    create_test_global_config "" "
 [cylc]
     [[events]]
         mail footer = see: http://localhost/stuff/%(owner)s/%(suite)s/
diff --git a/tests/functional/events/09-task-event-mail/suite.rc b/tests/functional/events/09-task-event-mail/flow.cylc
similarity index 100%
rename from tests/functional/events/09-task-event-mail/suite.rc
rename to tests/functional/events/09-task-event-mail/flow.cylc
diff --git a/tests/functional/events/10-task-event-job-logs-retrieve.t b/tests/functional/events/10-task-event-job-logs-retrieve.t
index 916cd564f8e..2957c194443 100755
--- a/tests/functional/events/10-task-event-job-logs-retrieve.t
+++ b/tests/functional/events/10-task-event-job-logs-retrieve.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -22,7 +22,7 @@ export CYLC_TEST_IS_GENERIC=false
 require_remote_platform
 set_test_number 4
 OPT_SET=
-create_test_globalrc "" "
+create_test_global_config "" "
     [platforms]
         [[${CYLC_TEST_PLATFORM}]]
             retrieve job logs = True
diff --git a/tests/functional/events/10-task-event-job-logs-retrieve/suite.rc b/tests/functional/events/10-task-event-job-logs-retrieve/flow.cylc
similarity index 100%
rename from tests/functional/events/10-task-event-job-logs-retrieve/suite.rc
rename to tests/functional/events/10-task-event-job-logs-retrieve/flow.cylc
diff --git a/tests/functional/events/11-cycle-task-event-job-logs-retrieve/suite.rc b/tests/functional/events/11-cycle-task-event-job-logs-retrieve/flow.cylc
similarity index 100%
rename from tests/functional/events/11-cycle-task-event-job-logs-retrieve/suite.rc
rename to tests/functional/events/11-cycle-task-event-job-logs-retrieve/flow.cylc
diff --git a/tests/functional/events/15-host-task-event-handler-retry-globalcfg.t b/tests/functional/events/15-host-task-event-handler-retry-globalcfg.t
index 94514fb8b0b..06339c03e24 100755
--- a/tests/functional/events/15-host-task-event-handler-retry-globalcfg.t
+++ b/tests/functional/events/15-host-task-event-handler-retry-globalcfg.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -21,7 +21,7 @@ export CYLC_TEST_IS_GENERIC=false
 require_remote_platform
 set_test_number 4
 
-create_test_globalrc "" "
+create_test_global_config "" "
 [platforms]
     [[${CYLC_TEST_PLATFORM}]]
         task event handler retry delays=3*PT1S
diff --git a/tests/functional/events/16-task-event-job-logs-register-globalcfg/suite.rc b/tests/functional/events/16-task-event-job-logs-register-globalcfg/flow.cylc
similarity index 100%
rename from tests/functional/events/16-task-event-job-logs-register-globalcfg/suite.rc
rename to tests/functional/events/16-task-event-job-logs-register-globalcfg/flow.cylc
diff --git a/tests/functional/events/17-task-event-job-logs-retrieve-command.t b/tests/functional/events/17-task-event-job-logs-retrieve-command.t
index 804a8b8e352..c662a0babc0 100755
--- a/tests/functional/events/17-task-event-job-logs-retrieve-command.t
+++ b/tests/functional/events/17-task-event-job-logs-retrieve-command.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -22,7 +22,7 @@ export CYLC_TEST_IS_GENERIC=false
 require_remote_platform
 set_test_number 3
 
-create_test_globalrc "" "
+create_test_global_config "" "
 [platforms]
     [[${CYLC_TEST_PLATFORM}]]
         retrieve job logs = True
diff --git a/tests/functional/events/18-suite-event-mail.t b/tests/functional/events/18-suite-event-mail.t
index f765818fe2a..d83b1437fd7 100755
--- a/tests/functional/events/18-suite-event-mail.t
+++ b/tests/functional/events/18-suite-event-mail.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -24,7 +24,7 @@ set_test_number 3
 mock_smtpd_init
 OPT_SET=
 if [[ "${TEST_NAME_BASE}" == *-globalcfg ]]; then
-    create_test_globalrc "" "
+    create_test_global_config "" "
 [cylc]
     [[events]]
         mail events = startup, shutdown
diff --git a/tests/functional/events/18-suite-event-mail/suite.rc b/tests/functional/events/18-suite-event-mail/flow.cylc
similarity index 100%
rename from tests/functional/events/18-suite-event-mail/suite.rc
rename to tests/functional/events/18-suite-event-mail/flow.cylc
diff --git a/tests/functional/events/20-suite-event-handlers.t b/tests/functional/events/20-suite-event-handlers.t
index da0e0f5d58a..9f66b408615 100755
--- a/tests/functional/events/20-suite-event-handlers.t
+++ b/tests/functional/events/20-suite-event-handlers.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -20,7 +20,7 @@
 set_test_number 4
 OPT_SET=
 if [[ "${TEST_NAME_BASE}" == *-globalcfg ]]; then
-    create_test_globalrc "" "
+    create_test_global_config "" "
 [cylc]
     [[events]]
         handlers = echo 'Your %(suite)s suite has a %(event)s event and URL %(suite_url)s and suite-priority as %(suite-priority)s and suite-UUID as %(suite_uuid)s.'
diff --git a/tests/functional/events/20-suite-event-handlers/suite.rc b/tests/functional/events/20-suite-event-handlers/flow.cylc
similarity index 100%
rename from tests/functional/events/20-suite-event-handlers/suite.rc
rename to tests/functional/events/20-suite-event-handlers/flow.cylc
diff --git a/tests/functional/events/23-suite-stalled-handler/suite.rc b/tests/functional/events/23-suite-stalled-handler/flow.cylc
similarity index 100%
rename from tests/functional/events/23-suite-stalled-handler/suite.rc
rename to tests/functional/events/23-suite-stalled-handler/flow.cylc
diff --git a/tests/functional/events/24-abort-on-stalled/suite.rc b/tests/functional/events/24-abort-on-stalled/flow.cylc
similarity index 100%
rename from tests/functional/events/24-abort-on-stalled/suite.rc
rename to tests/functional/events/24-abort-on-stalled/flow.cylc
diff --git a/tests/functional/events/25-held-not-stalled/suite.rc b/tests/functional/events/25-held-not-stalled/flow.cylc
similarity index 100%
rename from tests/functional/events/25-held-not-stalled/suite.rc
rename to tests/functional/events/25-held-not-stalled/flow.cylc
diff --git a/tests/functional/events/26-suite-stalled-dump-prereq/suite.rc b/tests/functional/events/26-suite-stalled-dump-prereq/flow.cylc
similarity index 100%
rename from tests/functional/events/26-suite-stalled-dump-prereq/suite.rc
rename to tests/functional/events/26-suite-stalled-dump-prereq/flow.cylc
diff --git a/tests/functional/events/27-suite-stalled-dump-prereq-fam/suite.rc b/tests/functional/events/27-suite-stalled-dump-prereq-fam/flow.cylc
similarity index 100%
rename from tests/functional/events/27-suite-stalled-dump-prereq-fam/suite.rc
rename to tests/functional/events/27-suite-stalled-dump-prereq-fam/flow.cylc
diff --git a/tests/functional/events/28-inactivity/suite.rc b/tests/functional/events/28-inactivity/flow.cylc
similarity index 100%
rename from tests/functional/events/28-inactivity/suite.rc
rename to tests/functional/events/28-inactivity/flow.cylc
diff --git a/tests/functional/events/29-task-event-mail-1/suite.rc b/tests/functional/events/29-task-event-mail-1/flow.cylc
similarity index 100%
rename from tests/functional/events/29-task-event-mail-1/suite.rc
rename to tests/functional/events/29-task-event-mail-1/flow.cylc
diff --git a/tests/functional/events/30-task-event-mail-2.t b/tests/functional/events/30-task-event-mail-2.t
index 02b71c1a35c..2f759305c1b 100755
--- a/tests/functional/events/30-task-event-mail-2.t
+++ b/tests/functional/events/30-task-event-mail-2.t
@@ -24,7 +24,7 @@ set_test_number 5
 mock_smtpd_init
 OPT_SET=
 if [[ "${TEST_NAME_BASE}" == *-globalcfg ]]; then
-    create_test_globalrc "" "
+    create_test_global_config "" "
 [cylc]
     [[events]]
         mail footer = see: http://localhost/stuff/%(owner)s/%(suite)s/
diff --git a/tests/functional/events/30-task-event-mail-2/suite.rc b/tests/functional/events/30-task-event-mail-2/flow.cylc
similarity index 100%
rename from tests/functional/events/30-task-event-mail-2/suite.rc
rename to tests/functional/events/30-task-event-mail-2/flow.cylc
diff --git a/tests/functional/events/32-task-event-job-logs-retrieve-2/suite.rc b/tests/functional/events/32-task-event-job-logs-retrieve-2/flow.cylc
similarity index 100%
rename from tests/functional/events/32-task-event-job-logs-retrieve-2/suite.rc
rename to tests/functional/events/32-task-event-job-logs-retrieve-2/flow.cylc
diff --git a/tests/functional/events/33-task-event-job-logs-retrieve-3/suite.rc b/tests/functional/events/33-task-event-job-logs-retrieve-3/flow.cylc
similarity index 100%
rename from tests/functional/events/33-task-event-job-logs-retrieve-3/suite.rc
rename to tests/functional/events/33-task-event-job-logs-retrieve-3/flow.cylc
diff --git a/tests/functional/events/34-task-abort/suite.rc b/tests/functional/events/34-task-abort/flow.cylc
similarity index 100%
rename from tests/functional/events/34-task-abort/suite.rc
rename to tests/functional/events/34-task-abort/flow.cylc
diff --git a/tests/functional/events/35-task-event-handler-importance/suite.rc b/tests/functional/events/35-task-event-handler-importance/flow.cylc
similarity index 100%
rename from tests/functional/events/35-task-event-handler-importance/suite.rc
rename to tests/functional/events/35-task-event-handler-importance/flow.cylc
diff --git a/tests/functional/events/36-task-event-bad-custom-template.t b/tests/functional/events/36-task-event-bad-custom-template.t
index 5825d0f2207..b07f9c7af47 100755
--- a/tests/functional/events/36-task-event-bad-custom-template.t
+++ b/tests/functional/events/36-task-event-bad-custom-template.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -20,7 +20,7 @@
 set_test_number 4
 
 if [[ "${TEST_NAME_BASE}" == *-globalcfg ]]; then
-    create_test_globalrc '' ''
+    create_test_global_config '' ''
 fi
 install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 run_fail "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
diff --git a/tests/functional/events/36-task-event-bad-custom-template/suite.rc b/tests/functional/events/36-task-event-bad-custom-template/flow.cylc
similarity index 100%
rename from tests/functional/events/36-task-event-bad-custom-template/suite.rc
rename to tests/functional/events/36-task-event-bad-custom-template/flow.cylc
diff --git a/tests/functional/events/37-suite-event-bad-custom-template/suite.rc b/tests/functional/events/37-suite-event-bad-custom-template/flow.cylc
similarity index 100%
rename from tests/functional/events/37-suite-event-bad-custom-template/suite.rc
rename to tests/functional/events/37-suite-event-bad-custom-template/flow.cylc
diff --git a/tests/functional/events/38-task-event-handler-custom/suite.rc b/tests/functional/events/38-task-event-handler-custom/flow.cylc
similarity index 100%
rename from tests/functional/events/38-task-event-handler-custom/suite.rc
rename to tests/functional/events/38-task-event-handler-custom/flow.cylc
diff --git a/tests/functional/events/41-late/suite.rc b/tests/functional/events/41-late/flow.cylc
similarity index 100%
rename from tests/functional/events/41-late/suite.rc
rename to tests/functional/events/41-late/flow.cylc
diff --git a/tests/functional/events/42-late-then-restart/suite.rc b/tests/functional/events/42-late-then-restart/flow.cylc
similarity index 100%
rename from tests/functional/events/42-late-then-restart/suite.rc
rename to tests/functional/events/42-late-then-restart/flow.cylc
diff --git a/tests/functional/events/43-late-spawn/suite.rc b/tests/functional/events/43-late-spawn/flow.cylc
similarity index 100%
rename from tests/functional/events/43-late-spawn/suite.rc
rename to tests/functional/events/43-late-spawn/flow.cylc
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 a712c38ed1a..be35fcc6534 100755
--- a/tests/functional/events/45-task-event-handler-multi-warning.t
+++ b/tests/functional/events/45-task-event-handler-multi-warning.t
@@ -23,7 +23,7 @@
 
 set_test_number 3
 
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [scheduling]
    [[graph]]
       R1 = foo
@@ -38,7 +38,7 @@ cylc message -s WARNING -- ${CYLC_SUITE_NAME} ${CYLC_TASK_JOB} "guinea pig"
       [[[events]]]
         handler events = warning
         handlers = echo "HANDLED %(message)s"
-__SUITERC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 
diff --git a/tests/functional/events/46-task-output-as-event.t b/tests/functional/events/46-task-output-as-event.t
index 4ab221d4675..67a15b894ae 100755
--- a/tests/functional/events/46-task-output-as-event.t
+++ b/tests/functional/events/46-task-output-as-event.t
@@ -21,7 +21,7 @@
 
 set_test_number 3
 
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [scheduling]
    [[graph]]
       R1 = t1
@@ -38,7 +38,7 @@ cylc message -- ${CYLC_SUITE_NAME} ${CYLC_TASK_JOB} \
         [[[events]]]
             handler events = rose, lily, iris, warning
             handlers = echo %(message)s
-__SUITERC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 
diff --git a/tests/functional/events/47-long-output.t b/tests/functional/events/47-long-output.t
index 1206b7625b4..d3cc14642e5 100755
--- a/tests/functional/events/47-long-output.t
+++ b/tests/functional/events/47-long-output.t
@@ -24,12 +24,12 @@ fi
 
 set_test_number 10
 
-create_test_globalrc "
+create_test_global_config "
 process pool timeout = PT10S" ""
 
 # Long STDOUT output
 
-init_suite "${TEST_NAME_BASE}" <<__SUITERC__
+init_suite "${TEST_NAME_BASE}" <<__FLOW_CONFIG__
 [scheduling]
     [[graph]]
         R1 = t1
@@ -38,7 +38,7 @@ init_suite "${TEST_NAME_BASE}" <<__SUITERC__
         script = true
         [[[events]]]
             succeeded handler = cat "${CYLC_REPO_DIR}/COPYING" "${CYLC_REPO_DIR}/COPYING" "${CYLC_REPO_DIR}/COPYING" && echo
-__SUITERC__
+__FLOW_CONFIG__
 cat >'reference.log' <<'__REFLOG__'
 Initial point: 1
 Final point: 1
@@ -66,7 +66,7 @@ purge_suite "${SUITE_NAME}"
 
 # REPEAT: Long STDERR output
 
-init_suite "${TEST_NAME_BASE}" <<__SUITERC__
+init_suite "${TEST_NAME_BASE}" <<__FLOW_CONFIG__
 [scheduling]
     [[graph]]
         R1 = t1
@@ -75,7 +75,7 @@ init_suite "${TEST_NAME_BASE}" <<__SUITERC__
         script = true
         [[[events]]]
             succeeded handler = cat "${CYLC_REPO_DIR}/COPYING" "${CYLC_REPO_DIR}/COPYING" "${CYLC_REPO_DIR}/COPYING" >&2 && echo
-__SUITERC__
+__FLOW_CONFIG__
 cat >'reference.log' <<'__REFLOG__'
 Initial point: 1
 Final point: 1
diff --git a/tests/functional/events/48-suite-aborted/suite.rc b/tests/functional/events/48-suite-aborted/flow.cylc
similarity index 100%
rename from tests/functional/events/48-suite-aborted/suite.rc
rename to tests/functional/events/48-suite-aborted/flow.cylc
diff --git a/tests/functional/events/50-ref-test-fail/suite.rc b/tests/functional/events/50-ref-test-fail/flow.cylc
similarity index 100%
rename from tests/functional/events/50-ref-test-fail/suite.rc
rename to tests/functional/events/50-ref-test-fail/flow.cylc
diff --git a/tests/functional/events/suite/suite.rc b/tests/functional/events/suite/flow.cylc
similarity index 100%
rename from tests/functional/events/suite/suite.rc
rename to tests/functional/events/suite/flow.cylc
diff --git a/tests/functional/events/suite/hidden/shutdown/suite.rc b/tests/functional/events/suite/hidden/shutdown/flow.cylc
similarity index 100%
rename from tests/functional/events/suite/hidden/shutdown/suite.rc
rename to tests/functional/events/suite/hidden/shutdown/flow.cylc
diff --git a/tests/functional/events/suite/hidden/startup/suite.rc b/tests/functional/events/suite/hidden/startup/flow.cylc
similarity index 100%
rename from tests/functional/events/suite/hidden/startup/suite.rc
rename to tests/functional/events/suite/hidden/startup/flow.cylc
diff --git a/tests/functional/events/suite/hidden/timeout/suite.rc b/tests/functional/events/suite/hidden/timeout/flow.cylc
similarity index 100%
rename from tests/functional/events/suite/hidden/timeout/suite.rc
rename to tests/functional/events/suite/hidden/timeout/flow.cylc
diff --git a/tests/functional/events/timeout-ref/suite.rc b/tests/functional/events/timeout-ref/flow.cylc
similarity index 100%
rename from tests/functional/events/timeout-ref/suite.rc
rename to tests/functional/events/timeout-ref/flow.cylc
diff --git a/tests/functional/events/timeout/suite.rc b/tests/functional/events/timeout/flow.cylc
similarity index 100%
rename from tests/functional/events/timeout/suite.rc
rename to tests/functional/events/timeout/flow.cylc
diff --git a/tests/functional/execution-time-limit/02-slurm.t b/tests/functional/execution-time-limit/02-slurm.t
index e640e5d8201..ab41d1264b0 100755
--- a/tests/functional/execution-time-limit/02-slurm.t
+++ b/tests/functional/execution-time-limit/02-slurm.t
@@ -33,7 +33,7 @@ fi
 export CYLC_TEST_BATCH_TASK_HOST CYLC_TEST_BATCH_SITE_DIRECTIVES
 set_test_number 3
 
-create_test_globalrc "" "
+create_test_global_config "" "
     [platforms]
         [[test-slurm]]
             batch system = $CYLC_TEST_BATCH_SYS
diff --git a/tests/functional/execution-time-limit/02-slurm/suite.rc b/tests/functional/execution-time-limit/02-slurm/flow.cylc
similarity index 100%
rename from tests/functional/execution-time-limit/02-slurm/suite.rc
rename to tests/functional/execution-time-limit/02-slurm/flow.cylc
diff --git a/tests/functional/ext-trigger/00-satellite/suite.rc b/tests/functional/ext-trigger/00-satellite/flow.cylc
similarity index 100%
rename from tests/functional/ext-trigger/00-satellite/suite.rc
rename to tests/functional/ext-trigger/00-satellite/flow.cylc
diff --git a/tests/functional/ext-trigger/01-no-nudge/suite.rc b/tests/functional/ext-trigger/01-no-nudge/flow.cylc
similarity index 100%
rename from tests/functional/ext-trigger/01-no-nudge/suite.rc
rename to tests/functional/ext-trigger/01-no-nudge/flow.cylc
diff --git a/tests/functional/ext-trigger/02-cycle-point/suite.rc b/tests/functional/ext-trigger/02-cycle-point/flow.cylc
similarity index 100%
rename from tests/functional/ext-trigger/02-cycle-point/suite.rc
rename to tests/functional/ext-trigger/02-cycle-point/flow.cylc
diff --git a/tests/functional/graph-equivalence/multiline_and1/suite.rc b/tests/functional/graph-equivalence/multiline_and1/flow.cylc
similarity index 100%
rename from tests/functional/graph-equivalence/multiline_and1/suite.rc
rename to tests/functional/graph-equivalence/multiline_and1/flow.cylc
diff --git a/tests/functional/graph-equivalence/multiline_and2/suite.rc b/tests/functional/graph-equivalence/multiline_and2/flow.cylc
similarity index 100%
rename from tests/functional/graph-equivalence/multiline_and2/suite.rc
rename to tests/functional/graph-equivalence/multiline_and2/flow.cylc
diff --git a/tests/functional/graph-equivalence/test1/suite.rc b/tests/functional/graph-equivalence/test1/flow.cylc
similarity index 100%
rename from tests/functional/graph-equivalence/test1/suite.rc
rename to tests/functional/graph-equivalence/test1/flow.cylc
diff --git a/tests/functional/graph-equivalence/test2/suite.rc b/tests/functional/graph-equivalence/test2/flow.cylc
similarity index 100%
rename from tests/functional/graph-equivalence/test2/suite.rc
rename to tests/functional/graph-equivalence/test2/flow.cylc
diff --git a/tests/functional/graph-equivalence/test3/suite.rc b/tests/functional/graph-equivalence/test3/flow.cylc
similarity index 100%
rename from tests/functional/graph-equivalence/test3/suite.rc
rename to tests/functional/graph-equivalence/test3/flow.cylc
diff --git a/tests/functional/graphing/00-boundaries/suite.rc b/tests/functional/graphing/00-boundaries/flow.cylc
similarity index 100%
rename from tests/functional/graphing/00-boundaries/suite.rc
rename to tests/functional/graphing/00-boundaries/flow.cylc
diff --git a/tests/functional/graphing/01-namespace/suite.rc b/tests/functional/graphing/01-namespace/flow.cylc
similarity index 100%
rename from tests/functional/graphing/01-namespace/suite.rc
rename to tests/functional/graphing/01-namespace/flow.cylc
diff --git a/tests/functional/graphing/02-icp-task-missing/suite.rc b/tests/functional/graphing/02-icp-task-missing/flow.cylc
similarity index 100%
rename from tests/functional/graphing/02-icp-task-missing/suite.rc
rename to tests/functional/graphing/02-icp-task-missing/flow.cylc
diff --git a/tests/functional/graphing/03-filter/suite.rc b/tests/functional/graphing/03-filter/flow.cylc
similarity index 100%
rename from tests/functional/graphing/03-filter/suite.rc
rename to tests/functional/graphing/03-filter/flow.cylc
diff --git a/tests/functional/graphing/04-filter-siblings/suite.rc b/tests/functional/graphing/04-filter-siblings/flow.cylc
similarity index 100%
rename from tests/functional/graphing/04-filter-siblings/suite.rc
rename to tests/functional/graphing/04-filter-siblings/flow.cylc
diff --git a/tests/functional/graphing/05-suicide-family/suite.rc b/tests/functional/graphing/05-suicide-family/flow.cylc
similarity index 100%
rename from tests/functional/graphing/05-suicide-family/suite.rc
rename to tests/functional/graphing/05-suicide-family/flow.cylc
diff --git a/tests/functional/graphing/06-family-or.t b/tests/functional/graphing/06-family-or.t
index 18fda183651..ce7bb8fdc97 100755
--- a/tests/functional/graphing/06-family-or.t
+++ b/tests/functional/graphing/06-family-or.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -19,7 +19,7 @@
 . "$(dirname "$0")/test_header"
 set_test_number 2
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [cylc]
     UTC mode = True
 [scheduling]
@@ -38,11 +38,11 @@ cat >'suite.rc' <<'__SUITE_RC__'
     [[b1a, b2a, b3a]]
         inherit = B
     [[c]]
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_ok "${TEST_NAME_BASE}-validate" cylc validate "${PWD}/suite.rc"
+run_ok "${TEST_NAME_BASE}-validate" cylc validate "${PWD}/flow.cylc"
 
-graph_suite "${PWD}/suite.rc" 'graph.plain'
+graph_suite "${PWD}/flow.cylc" 'graph.plain'
 cmp_ok 'graph.plain' - <<'__GRAPH__'
 edge "A.20000101T0000Z" "c.20000102T0000Z"
 edge "A.20000102T0000Z" "c.20000103T0000Z"
diff --git a/tests/functional/graphing/07-stop-at-final-point/suite.rc b/tests/functional/graphing/07-stop-at-final-point/flow.cylc
similarity index 100%
rename from tests/functional/graphing/07-stop-at-final-point/suite.rc
rename to tests/functional/graphing/07-stop-at-final-point/flow.cylc
diff --git a/tests/functional/graphing/08-ungrouped/suite.rc b/tests/functional/graphing/08-ungrouped/flow.cylc
similarity index 100%
rename from tests/functional/graphing/08-ungrouped/suite.rc
rename to tests/functional/graphing/08-ungrouped/flow.cylc
diff --git a/tests/functional/graphing/09-close-fam/suite.rc b/tests/functional/graphing/09-close-fam/flow.cylc
similarity index 100%
rename from tests/functional/graphing/09-close-fam/suite.rc
rename to tests/functional/graphing/09-close-fam/flow.cylc
diff --git a/tests/functional/graphing/09-ref-graph/suite.rc b/tests/functional/graphing/09-ref-graph/flow.cylc
similarity index 100%
rename from tests/functional/graphing/09-ref-graph/suite.rc
rename to tests/functional/graphing/09-ref-graph/flow.cylc
diff --git a/tests/functional/graphing/10-ghost-nodes/suite.rc b/tests/functional/graphing/10-ghost-nodes/flow.cylc
similarity index 100%
rename from tests/functional/graphing/10-ghost-nodes/suite.rc
rename to tests/functional/graphing/10-ghost-nodes/flow.cylc
diff --git a/tests/functional/graphing/11-nested-fam/suite.rc b/tests/functional/graphing/11-nested-fam/flow.cylc
similarity index 100%
rename from tests/functional/graphing/11-nested-fam/suite.rc
rename to tests/functional/graphing/11-nested-fam/flow.cylc
diff --git a/tests/functional/graphql/01-workflow/suite.rc b/tests/functional/graphql/01-workflow/flow.cylc
similarity index 100%
rename from tests/functional/graphql/01-workflow/suite.rc
rename to tests/functional/graphql/01-workflow/flow.cylc
diff --git a/tests/functional/graphql/02-root-queries/suite.rc b/tests/functional/graphql/02-root-queries/flow.cylc
similarity index 100%
rename from tests/functional/graphql/02-root-queries/suite.rc
rename to tests/functional/graphql/02-root-queries/flow.cylc
diff --git a/tests/functional/graphql/03-is-held-arg/suite.rc b/tests/functional/graphql/03-is-held-arg/flow.cylc
similarity index 100%
rename from tests/functional/graphql/03-is-held-arg/suite.rc
rename to tests/functional/graphql/03-is-held-arg/flow.cylc
diff --git a/tests/functional/hold-release/00-suite/suite.rc b/tests/functional/hold-release/00-suite/flow.cylc
similarity index 100%
rename from tests/functional/hold-release/00-suite/suite.rc
rename to tests/functional/hold-release/00-suite/flow.cylc
diff --git a/tests/functional/hold-release/01-beyond-stop/suite.rc b/tests/functional/hold-release/01-beyond-stop/flow.cylc
similarity index 100%
rename from tests/functional/hold-release/01-beyond-stop/suite.rc
rename to tests/functional/hold-release/01-beyond-stop/flow.cylc
diff --git a/tests/functional/hold-release/02-hold-on-spawn.t b/tests/functional/hold-release/02-hold-on-spawn.t
index bf1247bb684..76903ec8a65 100755
--- a/tests/functional/hold-release/02-hold-on-spawn.t
+++ b/tests/functional/hold-release/02-hold-on-spawn.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -18,14 +18,14 @@
 # Test that spawned children of tasks released in a held suite, are held.
 . "$(dirname "$0")/test_header"
 set_test_number 2
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [scheduling]
    [[dependencies]]
         R1 = "foo => bar"
 [runtime]
    [[foo, bar]]
         script = true
-__SUITERC__
+__FLOW_CONFIG__
 
 suite_run_ok "${TEST_NAME_BASE}-run" cylc run --hold "${SUITE_NAME}"
 
diff --git a/tests/functional/hold-release/05-release.t b/tests/functional/hold-release/05-release.t
index 84bd5b14154..f8eb7698032 100755
--- a/tests/functional/hold-release/05-release.t
+++ b/tests/functional/hold-release/05-release.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) 2008-2019 NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -19,8 +19,8 @@
 . "$(dirname "$0")/test_header"
 
 set_test_number 3
- 
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     [[events]]
         timeout = PT1M
@@ -66,7 +66,7 @@ cylc release ${CYLC_SUITE_NAME} 'holdrelease.1'
         cylc__job__poll_grep_suite_log '\[dog1\.1\] -task proxy removed (finished)'
         cylc stop "${CYLC_SUITE_NAME}"
         """
-__SUITERC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-val" cylc validate "${SUITE_NAME}"
 
diff --git a/tests/functional/hold-release/08-hold.t b/tests/functional/hold-release/08-hold.t
index edc51e7571a..081029d5ec9 100755
--- a/tests/functional/hold-release/08-hold.t
+++ b/tests/functional/hold-release/08-hold.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) 2008-2019 NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -19,8 +19,8 @@
 . "$(dirname "$0")/test_header"
 
 set_test_number 3
- 
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     [[events]]
         timeout = PT1M
@@ -66,7 +66,7 @@ cylc hold ${CYLC_SUITE_NAME} 'dog1.1'  # exact tasks
         sleep 5
         cylc stop "${CYLC_SUITE_NAME}"
         """
-__SUITERC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-val" cylc validate "${SUITE_NAME}"
 
diff --git a/tests/functional/hold-release/11-retrying/suite.rc b/tests/functional/hold-release/11-retrying/flow.cylc
similarity index 100%
rename from tests/functional/hold-release/11-retrying/suite.rc
rename to tests/functional/hold-release/11-retrying/flow.cylc
diff --git a/tests/functional/hold-release/12-hold-then-retry/suite.rc b/tests/functional/hold-release/12-hold-then-retry/flow.cylc
similarity index 100%
rename from tests/functional/hold-release/12-hold-then-retry/suite.rc
rename to tests/functional/hold-release/12-hold-then-retry/flow.cylc
diff --git a/tests/functional/hold-release/17-hold-after-point.t b/tests/functional/hold-release/17-hold-after-point.t
index f90149badde..5def3249f3c 100755
--- a/tests/functional/hold-release/17-hold-after-point.t
+++ b/tests/functional/hold-release/17-hold-after-point.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
-# Test defining a hold after point in a suite.rc file
+# Test defining a hold after point in a flow.cylc file
 . "$(dirname "$0")/test_header"
 set_test_number 2
 reftest
diff --git a/tests/functional/hold-release/17-hold-after-point/suite.rc b/tests/functional/hold-release/17-hold-after-point/flow.cylc
similarity index 78%
rename from tests/functional/hold-release/17-hold-after-point/suite.rc
rename to tests/functional/hold-release/17-hold-after-point/flow.cylc
index 183fbe8f169..98d49e8d1cc 100644
--- a/tests/functional/hold-release/17-hold-after-point/suite.rc
+++ b/tests/functional/hold-release/17-hold-after-point/flow.cylc
@@ -1,7 +1,7 @@
 [meta]
-    title = "cylc hold after point suite.rc test"
+    title = "cylc hold after point flow.cylc test"
 
-    description = """Define a hold after point in the suite.rc"""
+    description = """Define a hold after point in the flow.cylc"""
 
 [cylc]
     UTC mode = True
diff --git a/tests/functional/hold-release/18-hold-cycle-globs/suite.rc b/tests/functional/hold-release/18-hold-cycle-globs/flow.cylc
similarity index 100%
rename from tests/functional/hold-release/18-hold-cycle-globs/suite.rc
rename to tests/functional/hold-release/18-hold-cycle-globs/flow.cylc
diff --git a/tests/functional/hold-release/19-no-reset-prereq-on-waiting/suite.rc b/tests/functional/hold-release/19-no-reset-prereq-on-waiting/flow.cylc
similarity index 100%
rename from tests/functional/hold-release/19-no-reset-prereq-on-waiting/suite.rc
rename to tests/functional/hold-release/19-no-reset-prereq-on-waiting/flow.cylc
diff --git a/tests/functional/hold-release/21-client/suite.rc b/tests/functional/hold-release/21-client/flow.cylc
similarity index 100%
rename from tests/functional/hold-release/21-client/suite.rc
rename to tests/functional/hold-release/21-client/flow.cylc
diff --git a/tests/functional/host-select/test_header b/tests/functional/host-select/test_header
deleted file mode 120000
index 90bd5a36f92..00000000000
--- a/tests/functional/host-select/test_header
+++ /dev/null
@@ -1 +0,0 @@
-../lib/bash/test_header
\ No newline at end of file
diff --git a/tests/functional/include-files/00-basic.t b/tests/functional/include-files/00-basic.t
index 0ad9f85cd02..4460a674900 100644
--- a/tests/functional/include-files/00-basic.t
+++ b/tests/functional/include-files/00-basic.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -26,13 +26,13 @@ TEST_NAME="${TEST_NAME_BASE}-validate"
 # test raw suite validates
 run_ok "${TEST_NAME}.1" cylc val "${SUITE_NAME}"
 # test suite validates as inlined during editing
-cylc view --inline --mark-for-edit --stdout "${SUITE_NAME}" > inlined-for-edit.rc
-run_ok "${TEST_NAME}.2" cylc val inlined-for-edit.rc
+cylc view --inline --mark-for-edit --stdout "${SUITE_NAME}" > inlined-for-edit.cylc
+run_ok "${TEST_NAME}.2" cylc val inlined-for-edit.cylc
 #-------------------------------------------------------------------------------
 # compare inlined suite def with reference copy
 TEST_NAME=${TEST_NAME_BASE}-compare
-cylc view --inline --stdout "${SUITE_NAME}" > inlined.rc
-cmp_ok inlined.rc "${TEST_SOURCE_DIR}/suite/ref-inlined.rc"
+cylc view --inline --stdout "${SUITE_NAME}" > inlined.cylc
+cmp_ok inlined.cylc "${TEST_SOURCE_DIR}/suite/ref-inlined.cylc"
 #-------------------------------------------------------------------------------
 purge_suite "${SUITE_NAME}"
 #-------------------------------------------------------------------------------
diff --git a/tests/functional/include-files/suite/body.cylc b/tests/functional/include-files/suite/body.cylc
new file mode 100644
index 00000000000..8a04e89bcd3
--- /dev/null
+++ b/tests/functional/include-files/suite/body.cylc
@@ -0,0 +1,2 @@
+%include scheduling.cylc
+%include runtime.cylc
diff --git a/tests/functional/include-files/suite/body.rc b/tests/functional/include-files/suite/body.rc
deleted file mode 100644
index 32a733ddd00..00000000000
--- a/tests/functional/include-files/suite/body.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-%include scheduling.rc
-%include runtime.rc
diff --git a/tests/functional/include-files/suite/suite.rc b/tests/functional/include-files/suite/flow.cylc
similarity index 86%
rename from tests/functional/include-files/suite/suite.rc
rename to tests/functional/include-files/suite/flow.cylc
index 211a37a8ac0..1c3ba013823 100644
--- a/tests/functional/include-files/suite/suite.rc
+++ b/tests/functional/include-files/suite/flow.cylc
@@ -1,7 +1,7 @@
 [meta]
     title = "A test with nested include-files"
 
-%include body.rc
+%include body.cylc
 
 [visualization]
     default node attributes = "style=filled"
diff --git a/tests/functional/include-files/suite/ref-inlined.rc b/tests/functional/include-files/suite/ref-inlined.cylc
similarity index 100%
rename from tests/functional/include-files/suite/ref-inlined.rc
rename to tests/functional/include-files/suite/ref-inlined.cylc
diff --git a/tests/functional/include-files/suite/runtime.rc b/tests/functional/include-files/suite/runtime.cylc
similarity index 100%
rename from tests/functional/include-files/suite/runtime.rc
rename to tests/functional/include-files/suite/runtime.cylc
diff --git a/tests/functional/include-files/suite/scheduling.rc b/tests/functional/include-files/suite/scheduling.cylc
similarity index 100%
rename from tests/functional/include-files/suite/scheduling.rc
rename to tests/functional/include-files/suite/scheduling.cylc
diff --git a/tests/functional/inheritance/00-namespace-list/suite.rc b/tests/functional/inheritance/00-namespace-list/flow.cylc
similarity index 100%
rename from tests/functional/inheritance/00-namespace-list/suite.rc
rename to tests/functional/inheritance/00-namespace-list/flow.cylc
diff --git a/tests/functional/inheritance/01-circular/suite.rc b/tests/functional/inheritance/01-circular/flow.cylc
similarity index 100%
rename from tests/functional/inheritance/01-circular/suite.rc
rename to tests/functional/inheritance/01-circular/flow.cylc
diff --git a/tests/functional/inheritance/02-bad-reinherit/suite.rc b/tests/functional/inheritance/02-bad-reinherit/flow.cylc
similarity index 100%
rename from tests/functional/inheritance/02-bad-reinherit/suite.rc
rename to tests/functional/inheritance/02-bad-reinherit/flow.cylc
diff --git a/tests/functional/intercycle/00-past/suite.rc b/tests/functional/intercycle/00-past/flow.cylc
similarity index 100%
rename from tests/functional/intercycle/00-past/suite.rc
rename to tests/functional/intercycle/00-past/flow.cylc
diff --git a/tests/functional/intercycle/01-future/suite.rc b/tests/functional/intercycle/01-future/flow.cylc
similarity index 100%
rename from tests/functional/intercycle/01-future/suite.rc
rename to tests/functional/intercycle/01-future/flow.cylc
diff --git a/tests/functional/intercycle/02-integer-abs/suite.rc b/tests/functional/intercycle/02-integer-abs/flow.cylc
similarity index 100%
rename from tests/functional/intercycle/02-integer-abs/suite.rc
rename to tests/functional/intercycle/02-integer-abs/flow.cylc
diff --git a/tests/functional/intercycle/03-datetime-abs/suite.rc b/tests/functional/intercycle/03-datetime-abs/flow.cylc
similarity index 100%
rename from tests/functional/intercycle/03-datetime-abs/suite.rc
rename to tests/functional/intercycle/03-datetime-abs/flow.cylc
diff --git a/tests/functional/intercycle/04-datetime-abs-2/suite.rc b/tests/functional/intercycle/04-datetime-abs-2/flow.cylc
similarity index 100%
rename from tests/functional/intercycle/04-datetime-abs-2/suite.rc
rename to tests/functional/intercycle/04-datetime-abs-2/flow.cylc
diff --git a/tests/functional/intercycle/05-datetime-abs-3/suite.rc b/tests/functional/intercycle/05-datetime-abs-3/flow.cylc
similarity index 100%
rename from tests/functional/intercycle/05-datetime-abs-3/suite.rc
rename to tests/functional/intercycle/05-datetime-abs-3/flow.cylc
diff --git a/tests/functional/jinja2/00-simple.t b/tests/functional/jinja2/00-simple.t
index cc79e2497c8..fe16d2951f3 100644
--- a/tests/functional/jinja2/00-simple.t
+++ b/tests/functional/jinja2/00-simple.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -23,9 +23,9 @@ set_test_number 2
 install_suite "${TEST_NAME_BASE}" simple
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-validate"
-run_ok "${TEST_NAME}" cylc validate -o 'suite.rc.processed' "${SUITE_NAME}"
+run_ok "${TEST_NAME}" cylc validate -o 'flow.cylc.processed' "${SUITE_NAME}"
 #-------------------------------------------------------------------------------
 TEST_NAME=${TEST_NAME_BASE}-check-expansion
-cmp_ok 'suite.rc.processed' "${TEST_SOURCE_DIR}/simple/suite.rc-expanded"
+cmp_ok 'flow.cylc.processed' "${TEST_SOURCE_DIR}/simple/flow.cylc-expanded"
 #-------------------------------------------------------------------------------
 purge_suite "${SUITE_NAME}"
diff --git a/tests/functional/jinja2/01-include.t b/tests/functional/jinja2/01-include.t
index f2473227c62..13a830e9728 100644
--- a/tests/functional/jinja2/01-include.t
+++ b/tests/functional/jinja2/01-include.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -23,9 +23,9 @@ set_test_number 2
 install_suite "${TEST_NAME_BASE}" include
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-validate"
-run_ok "${TEST_NAME}" cylc validate -o 'suite.rc.processed' "${SUITE_NAME}"
+run_ok "${TEST_NAME}" cylc validate -o 'flow.cylc.processed' "${SUITE_NAME}"
 #-------------------------------------------------------------------------------
 TEST_NAME=${TEST_NAME_BASE}-check-expansion
-cmp_ok 'suite.rc.processed' "${TEST_SOURCE_DIR}/include/suite.rc-expanded"
+cmp_ok 'flow.cylc.processed' "${TEST_SOURCE_DIR}/include/flow.cylc-expanded"
 #-------------------------------------------------------------------------------
 purge_suite "${SUITE_NAME}"
diff --git a/tests/functional/jinja2/07-filters.t b/tests/functional/jinja2/07-filters.t
index fbc5e317224..356764d0592 100644
--- a/tests/functional/jinja2/07-filters.t
+++ b/tests/functional/jinja2/07-filters.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -23,9 +23,9 @@ set_test_number 2
 install_suite "${TEST_NAME_BASE}" filters
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-validate"
-run_ok "${TEST_NAME}" cylc validate -o 'suite.rc.processed' "${SUITE_NAME}"
+run_ok "${TEST_NAME}" cylc validate -o 'flow.cylc.processed' "${SUITE_NAME}"
 #-------------------------------------------------------------------------------
 TEST_NAME=${TEST_NAME_BASE}-check-expansion
-cmp_ok 'suite.rc.processed' "${TEST_DIR}/${SUITE_NAME}/suite.rc-expanded"
+cmp_ok 'flow.cylc.processed' "${TEST_DIR}/${SUITE_NAME}/flow.cylc-expanded"
 #-------------------------------------------------------------------------------
 purge_suite "${SUITE_NAME}"
diff --git a/tests/functional/jinja2/08-local-lib-python.t b/tests/functional/jinja2/08-local-lib-python.t
index 0c3c3809564..aa536f39dab 100644
--- a/tests/functional/jinja2/08-local-lib-python.t
+++ b/tests/functional/jinja2/08-local-lib-python.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -23,9 +23,9 @@ set_test_number 2
 install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-validate"
-run_ok "${TEST_NAME}" cylc validate -o 'suite.rc.processed' "${SUITE_NAME}"
+run_ok "${TEST_NAME}" cylc validate -o 'flow.cylc.processed' "${SUITE_NAME}"
 #-------------------------------------------------------------------------------
 TEST_NAME=${TEST_NAME_BASE}-check-expansion
-cmp_ok 'suite.rc.processed' "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/suite.rc.jproc"
+cmp_ok 'flow.cylc.processed' "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/flow.cylc.jproc"
 #-------------------------------------------------------------------------------
 purge_suite "${SUITE_NAME}"
diff --git a/tests/functional/jinja2/08-local-lib-python/suite.rc b/tests/functional/jinja2/08-local-lib-python/flow.cylc
similarity index 100%
rename from tests/functional/jinja2/08-local-lib-python/suite.rc
rename to tests/functional/jinja2/08-local-lib-python/flow.cylc
diff --git a/tests/functional/jinja2/08-local-lib-python/suite.rc.jproc b/tests/functional/jinja2/08-local-lib-python/flow.cylc.jproc
similarity index 100%
rename from tests/functional/jinja2/08-local-lib-python/suite.rc.jproc
rename to tests/functional/jinja2/08-local-lib-python/flow.cylc.jproc
diff --git a/tests/functional/jinja2/09-custom-jinja2-filters/suite.rc b/tests/functional/jinja2/09-custom-jinja2-filters/flow.cylc
similarity index 100%
rename from tests/functional/jinja2/09-custom-jinja2-filters/suite.rc
rename to tests/functional/jinja2/09-custom-jinja2-filters/flow.cylc
diff --git a/tests/functional/jinja2/10-builtin-functions/suite.rc b/tests/functional/jinja2/10-builtin-functions/flow.cylc
similarity index 100%
rename from tests/functional/jinja2/10-builtin-functions/suite.rc
rename to tests/functional/jinja2/10-builtin-functions/flow.cylc
diff --git a/tests/functional/jinja2/11-logging.t b/tests/functional/jinja2/11-logging.t
index 6fe96352997..a6341e46ccd 100644
--- a/tests/functional/jinja2/11-logging.t
+++ b/tests/functional/jinja2/11-logging.t
@@ -19,7 +19,7 @@
 
 . "$(dirname "$0")/test_header"
 set_test_number 2
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 #!Jinja2
 
 {% from "cylc.flow" import LOG %}
@@ -28,7 +28,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
 [scheduling]
     [[graph]]
         R1 = foo
-__SUITERC__
+__FLOW_CONFIG__
 
 TEST_NAME="${TEST_NAME_BASE}-validate"
 run_ok "${TEST_NAME}" cylc validate "${SUITE_NAME}" --debug
diff --git a/tests/functional/jinja2/commandline-set/suite.rc b/tests/functional/jinja2/commandline-set/flow.cylc
similarity index 100%
rename from tests/functional/jinja2/commandline-set/suite.rc
rename to tests/functional/jinja2/commandline-set/flow.cylc
diff --git a/tests/functional/jinja2/do-extension/suite.rc b/tests/functional/jinja2/do-extension/flow.cylc
similarity index 100%
rename from tests/functional/jinja2/do-extension/suite.rc
rename to tests/functional/jinja2/do-extension/flow.cylc
diff --git a/tests/functional/jinja2/filters/suite.rc b/tests/functional/jinja2/filters/flow.cylc
similarity index 100%
rename from tests/functional/jinja2/filters/suite.rc
rename to tests/functional/jinja2/filters/flow.cylc
diff --git a/tests/functional/jinja2/filters/suite.rc-expanded b/tests/functional/jinja2/filters/flow.cylc-expanded
similarity index 100%
rename from tests/functional/jinja2/filters/suite.rc-expanded
rename to tests/functional/jinja2/filters/flow.cylc-expanded
diff --git a/tests/functional/jinja2/include-badsyntax/suite.rc b/tests/functional/jinja2/include-badsyntax/flow.cylc
similarity index 77%
rename from tests/functional/jinja2/include-badsyntax/suite.rc
rename to tests/functional/jinja2/include-badsyntax/flow.cylc
index eb9c526740f..a7118df1294 100644
--- a/tests/functional/jinja2/include-badsyntax/suite.rc
+++ b/tests/functional/jinja2/include-badsyntax/flow.cylc
@@ -6,4 +6,4 @@
         R1 = "a => FAM"
 
 [runtime]
-{% include 'runtime-bad.rc' %}
+{% include 'runtime-bad.cylc' %}
diff --git a/tests/functional/jinja2/include-badsyntax/runtime-bad.rc b/tests/functional/jinja2/include-badsyntax/runtime-bad.cylc
similarity index 100%
rename from tests/functional/jinja2/include-badsyntax/runtime-bad.rc
rename to tests/functional/jinja2/include-badsyntax/runtime-bad.cylc
diff --git a/tests/functional/jinja2/include-incomplete/suite.rc b/tests/functional/jinja2/include-incomplete/flow.cylc
similarity index 74%
rename from tests/functional/jinja2/include-incomplete/suite.rc
rename to tests/functional/jinja2/include-incomplete/flow.cylc
index 21632fe2ca4..af7e1bad353 100644
--- a/tests/functional/jinja2/include-incomplete/suite.rc
+++ b/tests/functional/jinja2/include-incomplete/flow.cylc
@@ -6,4 +6,4 @@
         R1 = "a => FAM"
 
 [runtime]
-{% include 'runtime-incomplete.rc' %}
+{% include 'runtime-incomplete.cylc' %}
diff --git a/tests/functional/jinja2/include-incomplete/runtime-incomplete.rc b/tests/functional/jinja2/include-incomplete/runtime-incomplete.cylc
similarity index 100%
rename from tests/functional/jinja2/include-incomplete/runtime-incomplete.rc
rename to tests/functional/jinja2/include-incomplete/runtime-incomplete.cylc
diff --git a/tests/functional/jinja2/include-missing/suite.rc b/tests/functional/jinja2/include-missing/flow.cylc
similarity index 79%
rename from tests/functional/jinja2/include-missing/suite.rc
rename to tests/functional/jinja2/include-missing/flow.cylc
index cdf77d57a6e..e0fb36767bb 100644
--- a/tests/functional/jinja2/include-missing/suite.rc
+++ b/tests/functional/jinja2/include-missing/flow.cylc
@@ -6,4 +6,4 @@
         R1 = "a => FAM"
 
 [runtime]
-{% include 'runtime.rc' %}
+{% include 'runtime.cylc' %}
diff --git a/tests/functional/jinja2/include/suite.rc b/tests/functional/jinja2/include/flow.cylc
similarity index 79%
rename from tests/functional/jinja2/include/suite.rc
rename to tests/functional/jinja2/include/flow.cylc
index cdf77d57a6e..e0fb36767bb 100644
--- a/tests/functional/jinja2/include/suite.rc
+++ b/tests/functional/jinja2/include/flow.cylc
@@ -6,4 +6,4 @@
         R1 = "a => FAM"
 
 [runtime]
-{% include 'runtime.rc' %}
+{% include 'runtime.cylc' %}
diff --git a/tests/functional/jinja2/include/suite.rc-expanded b/tests/functional/jinja2/include/flow.cylc-expanded
similarity index 100%
rename from tests/functional/jinja2/include/suite.rc-expanded
rename to tests/functional/jinja2/include/flow.cylc-expanded
diff --git a/tests/functional/jinja2/include/runtime.rc b/tests/functional/jinja2/include/runtime.cylc
similarity index 100%
rename from tests/functional/jinja2/include/runtime.rc
rename to tests/functional/jinja2/include/runtime.cylc
diff --git a/tests/functional/jinja2/simple/suite.rc b/tests/functional/jinja2/simple/flow.cylc
similarity index 100%
rename from tests/functional/jinja2/simple/suite.rc
rename to tests/functional/jinja2/simple/flow.cylc
diff --git a/tests/functional/jinja2/simple/suite.rc-expanded b/tests/functional/jinja2/simple/flow.cylc-expanded
similarity index 100%
rename from tests/functional/jinja2/simple/suite.rc-expanded
rename to tests/functional/jinja2/simple/flow.cylc-expanded
diff --git a/tests/functional/job-file-trap/00-sigusr1/suite.rc b/tests/functional/job-file-trap/00-sigusr1/flow.cylc
similarity index 100%
rename from tests/functional/job-file-trap/00-sigusr1/suite.rc
rename to tests/functional/job-file-trap/00-sigusr1/flow.cylc
diff --git a/tests/functional/job-file-trap/01-loadleveler/suite.rc b/tests/functional/job-file-trap/01-loadleveler/flow.cylc
similarity index 100%
rename from tests/functional/job-file-trap/01-loadleveler/suite.rc
rename to tests/functional/job-file-trap/01-loadleveler/flow.cylc
diff --git a/tests/functional/job-file-trap/02-pipefail/suite.rc b/tests/functional/job-file-trap/02-pipefail/flow.cylc
similarity index 100%
rename from tests/functional/job-file-trap/02-pipefail/suite.rc
rename to tests/functional/job-file-trap/02-pipefail/flow.cylc
diff --git a/tests/functional/job-kill/00-local/suite.rc b/tests/functional/job-kill/00-local/flow.cylc
similarity index 100%
rename from tests/functional/job-kill/00-local/suite.rc
rename to tests/functional/job-kill/00-local/flow.cylc
diff --git a/tests/functional/job-kill/01-remote/suite.rc b/tests/functional/job-kill/01-remote/flow.cylc
similarity index 100%
rename from tests/functional/job-kill/01-remote/suite.rc
rename to tests/functional/job-kill/01-remote/flow.cylc
diff --git a/tests/functional/job-kill/02-loadleveler/suite.rc b/tests/functional/job-kill/02-loadleveler/flow.cylc
similarity index 100%
rename from tests/functional/job-kill/02-loadleveler/suite.rc
rename to tests/functional/job-kill/02-loadleveler/flow.cylc
diff --git a/tests/functional/job-kill/03-slurm/suite.rc b/tests/functional/job-kill/03-slurm/flow.cylc
similarity index 100%
rename from tests/functional/job-kill/03-slurm/suite.rc
rename to tests/functional/job-kill/03-slurm/flow.cylc
diff --git a/tests/functional/job-kill/04-pbs/suite.rc b/tests/functional/job-kill/04-pbs/flow.cylc
similarity index 100%
rename from tests/functional/job-kill/04-pbs/suite.rc
rename to tests/functional/job-kill/04-pbs/flow.cylc
diff --git a/tests/functional/job-submission/00-user/suite.rc b/tests/functional/job-submission/00-user/flow.cylc
similarity index 100%
rename from tests/functional/job-submission/00-user/suite.rc
rename to tests/functional/job-submission/00-user/flow.cylc
diff --git a/tests/functional/job-submission/01-job-nn-localhost/suite.rc b/tests/functional/job-submission/01-job-nn-localhost/flow.cylc
similarity index 100%
rename from tests/functional/job-submission/01-job-nn-localhost/suite.rc
rename to tests/functional/job-submission/01-job-nn-localhost/flow.cylc
diff --git a/tests/functional/job-submission/04-submit-num/suite.rc b/tests/functional/job-submission/04-submit-num/flow.cylc
similarity index 100%
rename from tests/functional/job-submission/04-submit-num/suite.rc
rename to tests/functional/job-submission/04-submit-num/flow.cylc
diff --git a/tests/functional/job-submission/06-garbage.t b/tests/functional/job-submission/06-garbage.t
index 27cdc7087e8..b107acf95e1 100755
--- a/tests/functional/job-submission/06-garbage.t
+++ b/tests/functional/job-submission/06-garbage.t
@@ -25,7 +25,7 @@ else
     export PYTHONPATH="${PWD}/lib"
 fi
 
-create_test_globalrc '
+create_test_global_config '
 [platforms]
     [[bad]]
 '
diff --git a/tests/functional/job-submission/06-garbage/suite.rc b/tests/functional/job-submission/06-garbage/flow.cylc
similarity index 100%
rename from tests/functional/job-submission/06-garbage/suite.rc
rename to tests/functional/job-submission/06-garbage/flow.cylc
diff --git a/tests/functional/job-submission/07-multi/suite.rc b/tests/functional/job-submission/07-multi/flow.cylc
similarity index 100%
rename from tests/functional/job-submission/07-multi/suite.rc
rename to tests/functional/job-submission/07-multi/flow.cylc
diff --git a/tests/functional/job-submission/08-activity-log-host/suite.rc b/tests/functional/job-submission/08-activity-log-host/flow.cylc
similarity index 100%
rename from tests/functional/job-submission/08-activity-log-host/suite.rc
rename to tests/functional/job-submission/08-activity-log-host/flow.cylc
diff --git a/tests/functional/job-submission/09-activity-log-host-bad-submit.t b/tests/functional/job-submission/09-activity-log-host-bad-submit.t
index 123a7b5fafb..9497ddea988 100755
--- a/tests/functional/job-submission/09-activity-log-host-bad-submit.t
+++ b/tests/functional/job-submission/09-activity-log-host-bad-submit.t
@@ -23,7 +23,7 @@ skip_darwin 'atrun hard to configure on Mac OS'
 require_remote_platform
 set_test_number 2
 
-create_test_globalrc '' "
+create_test_global_config '' "
 [platforms]
     [[${CYLC_TEST_PLATFORM}]]
         batch system = at
@@ -35,11 +35,11 @@ install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 run_ok "${TEST_NAME_BASE}-validate" \
     cylc validate "${SUITE_NAME}" \
        -s "CYLC_TEST_PLATFORM=${CYLC_TEST_PLATFORM}" \
-       -s "CYLC_TEST_HOST=${CYLC_TEST_HOST}" 
+       -s "CYLC_TEST_HOST=${CYLC_TEST_HOST}"
 suite_run_ok "${TEST_NAME_BASE}-run" \
     cylc run --debug --no-detach --reference-test \
     -s "CYLC_TEST_HOST=${CYLC_TEST_HOST}" \
-    -s "CYLC_TEST_PLATFORM=${CYLC_TEST_PLATFORM}" "${SUITE_NAME}" 
+    -s "CYLC_TEST_PLATFORM=${CYLC_TEST_PLATFORM}" "${SUITE_NAME}"
 
 purge_suite_platform "${CYLC_TEST_PLATFORM}" "${SUITE_NAME}"
 purge_suite "${SUITE_NAME}"
diff --git a/tests/functional/job-submission/09-activity-log-host-bad-submit/suite.rc b/tests/functional/job-submission/09-activity-log-host-bad-submit/flow.cylc
similarity index 100%
rename from tests/functional/job-submission/09-activity-log-host-bad-submit/suite.rc
rename to tests/functional/job-submission/09-activity-log-host-bad-submit/flow.cylc
diff --git a/tests/functional/job-submission/10-at-shell/suite.rc b/tests/functional/job-submission/10-at-shell/flow.cylc
similarity index 100%
rename from tests/functional/job-submission/10-at-shell/suite.rc
rename to tests/functional/job-submission/10-at-shell/flow.cylc
diff --git a/tests/functional/job-submission/11-garbage-host-command.t b/tests/functional/job-submission/11-garbage-host-command.t
index 690668a8c37..c634fb9ba57 100755
--- a/tests/functional/job-submission/11-garbage-host-command.t
+++ b/tests/functional/job-submission/11-garbage-host-command.t
@@ -20,7 +20,7 @@
 
 set_test_number 3
 
-create_test_globalrc '
+create_test_global_config '
 [platforms]
     [[badhost]]
 '
diff --git a/tests/functional/job-submission/11-garbage-host-command/suite.rc b/tests/functional/job-submission/11-garbage-host-command/flow.cylc
similarity index 100%
rename from tests/functional/job-submission/11-garbage-host-command/suite.rc
rename to tests/functional/job-submission/11-garbage-host-command/flow.cylc
diff --git a/tests/functional/job-submission/12-tidy-submits-of-prev-run.t b/tests/functional/job-submission/12-tidy-submits-of-prev-run.t
index 650194ae399..b094e30bfc5 100755
--- a/tests/functional/job-submission/12-tidy-submits-of-prev-run.t
+++ b/tests/functional/job-submission/12-tidy-submits-of-prev-run.t
@@ -28,7 +28,7 @@ LOGD1="$RUN_DIR/${SUITE_NAME}/log/job/1/t1/01"
 LOGD2="$RUN_DIR/${SUITE_NAME}/log/job/1/t1/02"
 exists_ok "${LOGD1}"
 exists_ok "${LOGD2}"
-sed -i 's/script =.*$/script = true/' "suite.rc"
+sed -i 's/script =.*$/script = true/' "flow.cylc"
 sed -i -n '1,/triggered off/p' "reference.log"
 suite_run_ok "${TEST_NAME_BASE}-run" \
     cylc run --debug --no-detach --reference-test "${SUITE_NAME}"
diff --git a/tests/functional/job-submission/12-tidy-submits-of-prev-run/suite.rc b/tests/functional/job-submission/12-tidy-submits-of-prev-run/flow.cylc
similarity index 100%
rename from tests/functional/job-submission/12-tidy-submits-of-prev-run/suite.rc
rename to tests/functional/job-submission/12-tidy-submits-of-prev-run/flow.cylc
diff --git a/tests/functional/job-submission/13-tidy-submits-of-prev-run-remote-host.t b/tests/functional/job-submission/13-tidy-submits-of-prev-run-remote-host.t
index 882bbed0585..93d848e91cf 100755
--- a/tests/functional/job-submission/13-tidy-submits-of-prev-run-remote-host.t
+++ b/tests/functional/job-submission/13-tidy-submits-of-prev-run-remote-host.t
@@ -38,7 +38,7 @@ run_ok "exists-rlogd1" ${SSH} "${CYLC_TEST_HOST}" test -e "${RLOGD1}"
 run_ok "exists-rlogd2" ${SSH} "${CYLC_TEST_HOST}" test -e "${RLOGD2}"
 exists_ok "${LOGD1}"
 exists_ok "${LOGD2}"
-sed -i 's/script =.*$/script = true/' "suite.rc"
+sed -i 's/script =.*$/script = true/' "flow.cylc"
 sed -i -n '1,/triggered off/p' "reference.log"
 suite_run_ok "${TEST_NAME_BASE}-run" \
     cylc run --debug --no-detach --reference-test "${SUITE_NAME}" \
diff --git a/tests/functional/job-submission/14-tidy-submits-of-prev-run-remote-host-with-shared-fs.t b/tests/functional/job-submission/14-tidy-submits-of-prev-run-remote-host-with-shared-fs.t
index dc325aecefb..6b37ff66a5e 100755
--- a/tests/functional/job-submission/14-tidy-submits-of-prev-run-remote-host-with-shared-fs.t
+++ b/tests/functional/job-submission/14-tidy-submits-of-prev-run-remote-host-with-shared-fs.t
@@ -31,7 +31,7 @@ LOGD1="$RUN_DIR/${SUITE_NAME}/log/job/1/t1/01"
 LOGD2="$RUN_DIR/${SUITE_NAME}/log/job/1/t1/02"
 exists_ok "${LOGD1}"
 exists_ok "${LOGD2}"
-sed -i 's/script =.*$/script = true/' "suite.rc"
+sed -i 's/script =.*$/script = true/' "flow.cylc"
 sed -i -n '1,/triggered off/p' "reference.log"
 suite_run_ok "${TEST_NAME_BASE}-run" \
     cylc run --debug --no-detach --reference-test "${SUITE_NAME}" \
diff --git a/tests/functional/job-submission/15-garbage-host-command-2.t b/tests/functional/job-submission/15-garbage-host-command-2.t
index 224854b7b0f..282f162ab3d 100755
--- a/tests/functional/job-submission/15-garbage-host-command-2.t
+++ b/tests/functional/job-submission/15-garbage-host-command-2.t
@@ -20,7 +20,7 @@
 skip_all "TODO replace this test with one checking that garbage-platform commands are handled ok"
 set_test_number 2
 
-create_test_globalrc "
+create_test_global_config "
 [platforms]
     [[test platform]]
         hosts = $(my-host-select)
diff --git a/tests/functional/job-submission/15-garbage-host-command-2/suite.rc b/tests/functional/job-submission/15-garbage-host-command-2/flow.cylc
similarity index 100%
rename from tests/functional/job-submission/15-garbage-host-command-2/suite.rc
rename to tests/functional/job-submission/15-garbage-host-command-2/flow.cylc
diff --git a/tests/functional/job-submission/16-timeout.t b/tests/functional/job-submission/16-timeout.t
index 8d8682bc74d..7881dcd2acb 100755
--- a/tests/functional/job-submission/16-timeout.t
+++ b/tests/functional/job-submission/16-timeout.t
@@ -24,7 +24,7 @@
 skip_darwin 'atrun hard to configure on Mac OS'
 set_test_number 4
 
-create_test_globalrc "
+create_test_global_config "
 process pool timeout = PT10S
 " "
 [platforms]
@@ -65,4 +65,3 @@ foo, 1, submit-failed
 __END__
 
 purge_suite "${SUITE_NAME}"
-
diff --git a/tests/functional/job-submission/16-timeout/suite.rc b/tests/functional/job-submission/16-timeout/flow.cylc
similarity index 100%
rename from tests/functional/job-submission/16-timeout/suite.rc
rename to tests/functional/job-submission/16-timeout/flow.cylc
diff --git a/tests/functional/job-submission/17-remote-localtime/suite.rc b/tests/functional/job-submission/17-remote-localtime/flow.cylc
similarity index 100%
rename from tests/functional/job-submission/17-remote-localtime/suite.rc
rename to tests/functional/job-submission/17-remote-localtime/flow.cylc
diff --git a/tests/functional/jobscript/00-torture.t b/tests/functional/jobscript/00-torture.t
index 7c1b7215572..f0a2400c1d7 100644
--- a/tests/functional/jobscript/00-torture.t
+++ b/tests/functional/jobscript/00-torture.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -25,7 +25,7 @@ install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 TEST_NAME="${TEST_NAME_BASE}-validate"
 run_ok "${TEST_NAME}" cylc validate "${SUITE_NAME}"
 export PATH_TO_CYLC_BIN="/path/to/cylc/bin"
-create_test_globalrc '' "
+create_test_global_config '' "
 [platforms]
     [[localhost]]
         cylc executable = $PATH_TO_CYLC_BIN/cylc"
diff --git a/tests/functional/jobscript/00-torture/suite.rc b/tests/functional/jobscript/00-torture/flow.cylc
similarity index 100%
rename from tests/functional/jobscript/00-torture/suite.rc
rename to tests/functional/jobscript/00-torture/flow.cylc
diff --git a/tests/functional/lib/bash/test_header b/tests/functional/lib/bash/test_header
index 321964f4172..f3f39e0dcf5 100644
--- a/tests/functional/lib/bash/test_header
+++ b/tests/functional/lib/bash/test_header
@@ -70,12 +70,12 @@
 #     exists_fail FILE
 #         Test that FILE does not exist
 #     init_suite TEST_NAME [SOURCE]
-#         Create a suite from SOURCE's "suite.rc" called:
+#         Create a suite from SOURCE's "flow.cylc" called:
 #         "cylctb-${CYLC_TEST_TIME_INIT}/${TEST_SOURCE_DIR##*tests/}/${TEST_NAME}"
 #         Provides SUITE_NAME and SUITE_RUN_DIR variables.
 #     install_suite TEST_NAME SOURCE
 #         Same as init_suite, but SOURCE must be a directory containing a
-#         "suite.rc" file.
+#         "flow.cylc" file.
 #     log_scan TEST_NAME FILE ATTEMPTS DELAY PATTERN...
 #         Monitor FILE polling every DELAY seconds for maximum of ATTEMPTS
 #         tries grepping for each PATTERN in turn. Tests will only pass if the
@@ -123,23 +123,23 @@
 #         Install a reference suite using `install_suite`, run a validation
 #         test on the suite and run the reference suite with `suite_run_ok`.
 #         Run `purge_suite` on success. Expect 2 OK tests.
-#     create_test_globalrc [PRE [POST]]
-#         Create a new global config file $PWD/etc from site flow-tests.rc
+#     create_test_global_config [PRE [POST]]
+#         Create a new global config file $PWD/etc from site global-tests.cylc
 #         with PRE and POST pre- and ap-pended (PRE for top level items with no
 #         section heading). PRE and POST are strings.
 #     require_remote_platform
 #         Set CYLC_TEST_PLATFORM for remote job tests or skip all tests.
 #         Provides:
 #             CYLC_TEST_PLATFORM: Remote platform name
-#             CYLC_TEST_HOST:       Hostname of a remote host picked
-#                                   from the platform.
+#             CYLC_TEST_HOST:     Hostname of a remote host picked
+#                                 from the platform.
 #     require_remote_platform_wsfs
 #         (wsfs = with shared file system)
 #         Set CYLC_TEST_PLATFORM_WSFS for remote job tests or skip all tests.
 #         Provides:
 #             CYLC_TEST_PLATFORM_WSFS: Remote platform name
-#             CYLC_TEST_HOST_WSFS:       Hostname of a remote host picked
-#                                       from the platform.
+#             CYLC_TEST_HOST_WSFS:     Hostname of a remote host picked
+#                                      from the platform.
 #     get_fqdn_by_host [TARGET]
 #         Get a host FQDN using the same mechanism Cylc uses.
 #-------------------------------------------------------------------------------
@@ -423,11 +423,11 @@ graph_suite() {
 
 init_suite() {
     local TEST_NAME="$1"
-    local SUITE_RC="${2:--}"
+    local FLOW_CONFIG="${2:--}"
     SUITE_NAME="cylctb-${CYLC_TEST_TIME_INIT}/${TEST_SOURCE_DIR_BASE}/${TEST_NAME}"
     SUITE_RUN_DIR="${RUN_DIR}/${SUITE_NAME}"
     mkdir -p "${TEST_DIR}/${SUITE_NAME}/"
-    cat "${SUITE_RC}" >"${TEST_DIR}/${SUITE_NAME}/suite.rc"
+    cat "${FLOW_CONFIG}" >"${TEST_DIR}/${SUITE_NAME}/flow.cylc"
     cylc register "${SUITE_NAME}" "${TEST_DIR}/${SUITE_NAME}" 2>'/dev/null'
     cd "${TEST_DIR}/${SUITE_NAME}"
 }
@@ -704,7 +704,7 @@ reftest() {
     purge_suite "${SUITE_NAME}"
 }
 
-create_test_globalrc() {
+create_test_global_config() {
     # (Documented in file header).
     local PRE=
     local POST=
@@ -714,24 +714,23 @@ create_test_globalrc() {
         PRE=$1
         POST=$2
     elif (( $# > 2 )); then
-        echo 'ERROR, create_test_globalrc: too many args' >&2
+        echo 'ERROR, create_test_global_config: too many args' >&2
         exit 1
     fi
     # Tidy in case of previous use of this function.
     rm -fr 'etc'
     mkdir 'etc'
     # Suite host self-identification method.
-    echo "$PRE" >'etc/flow.rc'
-    SITE_TESTS_CONF_FILE="$(cylc get-global --print-site-dir)/flow-tests.rc"
-    USER_TESTS_CONF_FILE="$(cylc get-global --print-user-dir)/flow-tests.rc"
+    echo "$PRE" >'etc/global.cylc'
+    SITE_TESTS_CONF_FILE="$(cylc get-global --print-site-dir)/global-tests.cylc"
+    USER_TESTS_CONF_FILE="$(cylc get-global --print-user-dir)/global-tests.cylc"
     if [[ -f "${SITE_TESTS_CONF_FILE}" ]]; then
-        cat "${SITE_TESTS_CONF_FILE}" >>'etc/flow.rc'
+        cat "${SITE_TESTS_CONF_FILE}" >>'etc/global.cylc'
     fi
     if [[ -f "${USER_TESTS_CONF_FILE}" ]]; then
-        cat "${USER_TESTS_CONF_FILE}" >>'etc/flow.rc'
+        cat "${USER_TESTS_CONF_FILE}" >>'etc/global.cylc'
     fi
-    echo "$POST" >>'etc/flow.rc'
-
+    echo "$POST" >>'etc/global.cylc'
     export CYLC_CONF_PATH="${PWD}/etc"
 }
 
@@ -831,7 +830,7 @@ if ! "${CYLC_TEST_RUN_GENERIC}" && "${CYLC_TEST_IS_GENERIC}"; then
 elif ! "${CYLC_TEST_RUN_PLATFORM}" && ! "${CYLC_TEST_IS_GENERIC}"; then
     skip_all 'not running platform-specific tests'
 fi
-# Ignore the normal site/user global config, use flow-tests.rc.
-create_test_globalrc "$@"
+# Ignore the normal site/user global config, use global-tests.cylc.
+create_test_global_config "$@"
 set +x
 set +e
diff --git a/tests/functional/logging/02-duplicates/suite.rc b/tests/functional/logging/02-duplicates/flow.cylc
similarity index 100%
rename from tests/functional/logging/02-duplicates/suite.rc
rename to tests/functional/logging/02-duplicates/flow.cylc
diff --git a/tests/functional/logging/03-roll.t b/tests/functional/logging/03-roll.t
index 295529d41e7..884e2f02c26 100755
--- a/tests/functional/logging/03-roll.t
+++ b/tests/functional/logging/03-roll.t
@@ -19,7 +19,7 @@
 
 . "$(dirname "$0")/test_header"
 set_test_number 11
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     [[events]]
         abort on stalled = True
@@ -32,9 +32,9 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
 [runtime]
     [[t1, t2, t3]]
         script = true
-__SUITERC__
+__FLOW_CONFIG__
 
-create_test_globalrc '' '
+create_test_global_config '' '
 [suite logging]
     rolling archive length = 8
     maximum size in bytes = 2048'
diff --git a/tests/functional/message-triggers/00-basic/suite.rc b/tests/functional/message-triggers/00-basic/flow.cylc
similarity index 100%
rename from tests/functional/message-triggers/00-basic/suite.rc
rename to tests/functional/message-triggers/00-basic/flow.cylc
diff --git a/tests/functional/message-triggers/02-action/suite.rc b/tests/functional/message-triggers/02-action/flow.cylc
similarity index 100%
rename from tests/functional/message-triggers/02-action/suite.rc
rename to tests/functional/message-triggers/02-action/flow.cylc
diff --git a/tests/functional/modes/00-simulation/suite.rc b/tests/functional/modes/00-simulation/flow.cylc
similarity index 100%
rename from tests/functional/modes/00-simulation/suite.rc
rename to tests/functional/modes/00-simulation/flow.cylc
diff --git a/tests/functional/modes/01-dummy/suite.rc b/tests/functional/modes/01-dummy/flow.cylc
similarity index 100%
rename from tests/functional/modes/01-dummy/suite.rc
rename to tests/functional/modes/01-dummy/flow.cylc
diff --git a/tests/functional/modes/02-dummy-message-outputs/suite.rc b/tests/functional/modes/02-dummy-message-outputs/flow.cylc
similarity index 100%
rename from tests/functional/modes/02-dummy-message-outputs/suite.rc
rename to tests/functional/modes/02-dummy-message-outputs/flow.cylc
diff --git a/tests/functional/offset/00-final-simple/suite.rc b/tests/functional/offset/00-final-simple/flow.cylc
similarity index 100%
rename from tests/functional/offset/00-final-simple/suite.rc
rename to tests/functional/offset/00-final-simple/flow.cylc
diff --git a/tests/functional/offset/01-final-next/suite.rc b/tests/functional/offset/01-final-next/flow.cylc
similarity index 100%
rename from tests/functional/offset/01-final-next/suite.rc
rename to tests/functional/offset/01-final-next/flow.cylc
diff --git a/tests/functional/offset/02-final-chain/suite.rc b/tests/functional/offset/02-final-chain/flow.cylc
similarity index 100%
rename from tests/functional/offset/02-final-chain/suite.rc
rename to tests/functional/offset/02-final-chain/flow.cylc
diff --git a/tests/functional/offset/03-final-next-chain/suite.rc b/tests/functional/offset/03-final-next-chain/flow.cylc
similarity index 100%
rename from tests/functional/offset/03-final-next-chain/suite.rc
rename to tests/functional/offset/03-final-next-chain/flow.cylc
diff --git a/tests/functional/offset/04-cycle-offset-chain/suite.rc b/tests/functional/offset/04-cycle-offset-chain/flow.cylc
similarity index 100%
rename from tests/functional/offset/04-cycle-offset-chain/suite.rc
rename to tests/functional/offset/04-cycle-offset-chain/flow.cylc
diff --git a/tests/functional/offset/05-long-final-chain/suite.rc b/tests/functional/offset/05-long-final-chain/flow.cylc
similarity index 100%
rename from tests/functional/offset/05-long-final-chain/suite.rc
rename to tests/functional/offset/05-long-final-chain/flow.cylc
diff --git a/tests/functional/param_expand/01-basic.t b/tests/functional/param_expand/01-basic.t
index aeba7e3ed86..4d3cdf7e8cf 100644
--- a/tests/functional/param_expand/01-basic.t
+++ b/tests/functional/param_expand/01-basic.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -19,7 +19,7 @@
 . "$(dirname "$0")/test_header"
 set_test_number 39
 
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         i = cat, dog, fish
@@ -39,11 +39,11 @@ qux<j> => waz<k>
     [[qux<j>]]
     [[waz<k>]]
 __SUITE__
-run_ok "${TEST_NAME_BASE}-01" cylc validate "suite.rc"
-cylc graph --reference 'suite.rc' >'01.graph'
+run_ok "${TEST_NAME_BASE}-01" cylc validate "flow.cylc"
+cylc graph --reference 'flow.cylc' >'01.graph'
 cmp_ok "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/01.graph.ref" '01.graph'
 
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         i = 25, 30..35, 1..5, 110
@@ -58,11 +58,11 @@ foo<i> => bar<i>
     [[foo<i>]]
     [[bar<i>]]
 __SUITE__
-run_ok "${TEST_NAME_BASE}-02" cylc validate "suite.rc"
-cylc graph --reference 'suite.rc' >'02.graph'
+run_ok "${TEST_NAME_BASE}-02" cylc validate "flow.cylc"
+cylc graph --reference 'flow.cylc' >'02.graph'
 cmp_ok "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/02.graph.ref" '02.graph'
 
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         i = a-t, c-g
@@ -77,11 +77,11 @@ foo<i> => bar<i>
     [[foo<i>]]
     [[bar<i>]]
 __SUITE__
-run_ok "${TEST_NAME_BASE}-03" cylc validate "suite.rc"
-cylc graph --reference 'suite.rc' >'03.graph'
+run_ok "${TEST_NAME_BASE}-03" cylc validate "flow.cylc"
+cylc graph --reference 'flow.cylc' >'03.graph'
 cmp_ok "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/03.graph.ref" '03.graph'
 
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         i = 100, hundred, one-hundred, 99+1
@@ -96,11 +96,11 @@ foo<i> => bar<i>
     [[foo<i>]]
     [[bar<i>]]
 __SUITE__
-run_ok "${TEST_NAME_BASE}-04" cylc validate "suite.rc"
-cylc graph --reference 'suite.rc' >'04.graph'
+run_ok "${TEST_NAME_BASE}-04" cylc validate "flow.cylc"
+cylc graph --reference 'flow.cylc' >'04.graph'
 cmp_ok "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/04.graph.ref" '04.graph'
 
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         i = space is dangerous
@@ -115,12 +115,12 @@ foo<i> => bar<i>
     [[foo<i>]]
     [[bar<i>]]
 __SUITE__
-run_fail "${TEST_NAME_BASE}-05" cylc validate "suite.rc"
+run_fail "${TEST_NAME_BASE}-05" cylc validate "flow.cylc"
 cmp_ok "${TEST_NAME_BASE}-05.stderr" <<'__ERR__'
 IllegalValueError: (type=parameter) [cylc][parameters]i = space is dangerous - (space is dangerous: bad value)
 __ERR__
 
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         i = mix, 1..10
@@ -135,12 +135,12 @@ foo<i> => bar<i>
     [[foo<i>]]
     [[bar<i>]]
 __SUITE__
-run_fail "${TEST_NAME_BASE}-06" cylc validate "suite.rc"
+run_fail "${TEST_NAME_BASE}-06" cylc validate "flow.cylc"
 cmp_ok "${TEST_NAME_BASE}-06.stderr" <<'__ERR__'
 IllegalValueError: (type=parameter) [cylc][parameters]i = mix, 1..10 - (mixing int range and str)
 __ERR__
 
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         i = a, b #, c, d, e  # comment
@@ -155,11 +155,11 @@ foo<i> => bar<i>
     [[foo<i>]]
     [[bar<i>]]
 __SUITE__
-run_ok "${TEST_NAME_BASE}-07" cylc validate "suite.rc"
-cylc graph --reference 'suite.rc' >'07.graph'
+run_ok "${TEST_NAME_BASE}-07" cylc validate "flow.cylc"
+cylc graph --reference 'flow.cylc' >'07.graph'
 cmp_ok "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/07.graph.ref" '07.graph'
 
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         i = 1..2 3..4
@@ -174,12 +174,12 @@ foo<i> => bar<i>
     [[foo<i>]]
     [[bar<i>]]
 __SUITE__
-run_fail "${TEST_NAME_BASE}-08" cylc validate "suite.rc"
+run_fail "${TEST_NAME_BASE}-08" cylc validate "flow.cylc"
 cmp_ok "${TEST_NAME_BASE}-08.stderr" <<'__ERR__'
 IllegalValueError: (type=parameter) [cylc][parameters]i = 1..2 3..4 - (1..2 3..4: bad value)
 __ERR__
 
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         i =
@@ -194,12 +194,12 @@ foo<i> => bar<i>
     [[foo<i>]]
     [[bar<i>]]
 __SUITE__
-run_fail "${TEST_NAME_BASE}-09" cylc validate "suite.rc"
+run_fail "${TEST_NAME_BASE}-09" cylc validate "flow.cylc"
 cmp_ok "${TEST_NAME_BASE}-09.stderr" <<'__ERR__'
 ParamExpandError: parameter i is not defined in foo<i>
 __ERR__
 
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [scheduling]
     [[graph]]
         R1 = """
@@ -211,12 +211,12 @@ foo<i> => bar<i>
     [[foo<i>]]
     [[bar<i>]]
 __SUITE__
-run_fail "${TEST_NAME_BASE}-10" cylc validate "suite.rc"
+run_fail "${TEST_NAME_BASE}-10" cylc validate "flow.cylc"
 cmp_ok "${TEST_NAME_BASE}-10.stderr" <<'__ERR__'
 ParamExpandError: parameter i is not defined in <i>: foo<i>=>bar<i>
 __ERR__
 
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         j = +1..+5
@@ -231,11 +231,11 @@ cat >'suite.rc' <<'__SUITE__'
     [[foo<j>]]
     [[bar<j>]]
 __SUITE__
-run_ok "${TEST_NAME_BASE}-11" cylc validate "suite.rc"
-cylc graph --reference 'suite.rc' >'11.graph'
+run_ok "${TEST_NAME_BASE}-11" cylc validate "flow.cylc"
+cylc graph --reference 'flow.cylc' >'11.graph'
 cmp_ok "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/11.graph.ref" '11.graph'
 
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         j = 1..5
@@ -250,12 +250,12 @@ cat >'suite.rc' <<'__SUITE__'
     [[foo<j>]]
     [[bar<j>]]
 __SUITE__
-run_ok "${TEST_NAME_BASE}-12" cylc validate "suite.rc"
-cylc graph --reference 'suite.rc' >'12.graph'
+run_ok "${TEST_NAME_BASE}-12" cylc validate "flow.cylc"
+cylc graph --reference 'flow.cylc' >'12.graph'
 cmp_ok "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/12.graph.ref" '12.graph'
 
 # Parameter with various meta characters
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         p = -minus, +plus, @at, %percent
@@ -270,12 +270,12 @@ cat >'suite.rc' <<'__SUITE__'
     [[foo<p>]]
     [[bar<p>]]
 __SUITE__
-run_ok "${TEST_NAME_BASE}-13" cylc validate "suite.rc"
-cylc graph --reference 'suite.rc' >'13.graph'
+run_ok "${TEST_NAME_BASE}-13" cylc validate "flow.cylc"
+cylc graph --reference 'flow.cylc' >'13.graph'
 cmp_ok "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/13.graph.ref" '13.graph'
 
 # Parameter as task name
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         i = 0..2
@@ -293,12 +293,12 @@ foo => <s> => bar
     [[foo, bar, <i>, <s>]]
         script = true
 __SUITE__
-run_ok "${TEST_NAME_BASE}-14" cylc validate "suite.rc"
-cylc graph --reference 'suite.rc' >'14.graph'
+run_ok "${TEST_NAME_BASE}-14" cylc validate "flow.cylc"
+cylc graph --reference 'flow.cylc' >'14.graph'
 cmp_ok "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/14.graph.ref" '14.graph'
 
 # Parameter in middle of family name
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         s = mercury, venus, earth, mars
@@ -311,12 +311,12 @@ cat >'suite.rc' <<'__SUITE__'
     [[x<s>y]]
         inherit = X<s>Y
 __SUITE__
-run_ok "${TEST_NAME_BASE}-15" cylc validate "suite.rc"
-cylc graph --reference 'suite.rc' >'15.graph'
+run_ok "${TEST_NAME_BASE}-15" cylc validate "flow.cylc"
+cylc graph --reference 'flow.cylc' >'15.graph'
 cmp_ok "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/15.graph.ref" '15.graph'
 
 # -ve offset on RHS
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         m = cat, dog
@@ -328,12 +328,12 @@ cat >'suite.rc' <<'__SUITE__'
         script = true
     [[foo<m>]]
 __SUITE__
-run_ok "${TEST_NAME_BASE}-16" cylc validate "suite.rc"
-cylc graph --reference 'suite.rc' >'16.graph'
+run_ok "${TEST_NAME_BASE}-16" cylc validate "flow.cylc"
+cylc graph --reference 'flow.cylc' >'16.graph'
 cmp_ok "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/16.graph.ref" '16.graph'
 
 # +ve offset
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         m = cat, dog
@@ -345,12 +345,12 @@ cat >'suite.rc' <<'__SUITE__'
         script = true
     [[foo<m>]]
 __SUITE__
-run_ok "${TEST_NAME_BASE}-17" cylc validate "suite.rc"
-cylc graph --reference 'suite.rc' >'17.graph'
+run_ok "${TEST_NAME_BASE}-17" cylc validate "flow.cylc"
+cylc graph --reference 'flow.cylc' >'17.graph'
 cmp_ok "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/17.graph.ref" '17.graph'
 
 # Negative integers
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         m = -12..12..6
@@ -362,12 +362,12 @@ cat >'suite.rc' <<'__SUITE__'
         script = true
     [[foo<m>]]
 __SUITE__
-run_ok "${TEST_NAME_BASE}-18" cylc validate "suite.rc"
-cylc graph --reference 'suite.rc' >'18.graph'
+run_ok "${TEST_NAME_BASE}-18" cylc validate "flow.cylc"
+cylc graph --reference 'flow.cylc' >'18.graph'
 cmp_ok "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/18.graph.ref" '18.graph'
 
 # Reference by value, with -+ meta characters
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         lang = c++, fortran-2008
@@ -386,14 +386,14 @@ cat >'suite.rc' <<'__SUITE__'
         [[[environment]]]
             FC = gfortran
 __SUITE__
-run_ok "${TEST_NAME_BASE}-19" cylc validate --debug "suite.rc"
-cylc graph --reference 'suite.rc' >'19.graph'
+run_ok "${TEST_NAME_BASE}-19" cylc validate --debug "flow.cylc"
+cylc graph --reference 'flow.cylc' >'19.graph'
 cmp_ok "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/19.graph.ref" '19.graph'
 # Note: This also demonstrates current badness of "cylc get-config"...
 #       Inconsistence between graph/runtime whitespace handling.
 #       Inconsistence between graph/runtime parameter expansion.
-cylc get-config --sparse 'suite.rc' >'19.rc'
-cmp_ok '19.rc' <<'__SUITERC__'
+cylc get-config --sparse 'flow.cylc' >'19.cylc'
+cmp_ok '19.cylc' <<'__FLOW_CONFIG__'
 [cylc]
     [[parameters]]
         lang = c++, fortran-2008
@@ -417,6 +417,6 @@ cmp_ok '19.rc' <<'__SUITERC__'
             FC = gfortran
 [visualization]
     [[node attributes]]
-__SUITERC__
+__FLOW_CONFIG__
 
 exit
diff --git a/tests/functional/param_expand/02-param_val.t b/tests/functional/param_expand/02-param_val.t
index 4d8f61a1e8e..c58074863b1 100644
--- a/tests/functional/param_expand/02-param_val.t
+++ b/tests/functional/param_expand/02-param_val.t
@@ -21,7 +21,7 @@
 set_test_number 23
 
 #------------------------------------------------------------------------------
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         i = cat, dog, fish
@@ -42,19 +42,19 @@ __SUITE__
 
 TNAME=${TEST_NAME_BASE}-1
 # validate
-run_ok "${TNAME}" cylc validate "suite.rc"
+run_ok "${TNAME}" cylc validate "flow.cylc"
 # family graph
-graph_suite "suite.rc" "${TNAME}-graph-fam"
+graph_suite "flow.cylc" "${TNAME}-graph-fam"
 cmp_ok "${TNAME}-graph-fam" "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/graph-fam-1.ref"
 # task graph
-graph_suite "suite.rc" "${TNAME}-graph-exp" -u
+graph_suite "flow.cylc" "${TNAME}-graph-exp" -u
 cmp_ok "${TNAME}-graph-exp" "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/graph-exp-1.ref"
 # inheritance graph
-graph_suite "suite.rc" "${TNAME}-graph-nam" -n
+graph_suite "flow.cylc" "${TNAME}-graph-nam" -n
 cmp_ok "${TNAME}-graph-nam" "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/graph-nam-1.ref"
 
 #------------------------------------------------------------------------------
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         i = cat, dog, fish
@@ -75,20 +75,20 @@ __SUITE__
 
 TNAME=${TEST_NAME_BASE}-2
 # validate
-run_ok "${TNAME}" cylc validate "suite.rc"
+run_ok "${TNAME}" cylc validate "flow.cylc"
 # family graph
-graph_suite "suite.rc" "${TNAME}-graph-fam"
+graph_suite "flow.cylc" "${TNAME}-graph-fam"
 cmp_ok "${TNAME}-graph-fam" "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/graph-fam-1.ref"
 # task graph
-graph_suite "suite.rc" "${TNAME}-graph-exp" -u
+graph_suite "flow.cylc" "${TNAME}-graph-exp" -u
 cmp_ok "${TNAME}-graph-exp" "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/graph-exp-1.ref"
 # inheritance graph
-graph_suite "suite.rc" "${TNAME}-graph-nam" -n
+graph_suite "flow.cylc" "${TNAME}-graph-nam" -n
 cmp_ok "${TNAME}-graph-nam" "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/graph-nam-1.ref"
 
 #------------------------------------------------------------------------------
 # Same, with white space in the parameter syntax.
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         i = cat, dog, fish
@@ -109,19 +109,19 @@ __SUITE__
 
 TNAME=${TEST_NAME_BASE}-3
 # validate
-run_ok "${TNAME}" cylc validate "suite.rc"
+run_ok "${TNAME}" cylc validate "flow.cylc"
 # family graph
-graph_suite "suite.rc" "${TNAME}-graph-fam"
+graph_suite "flow.cylc" "${TNAME}-graph-fam"
 cmp_ok "${TNAME}-graph-fam" "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/graph-fam-1.ref"
 # task graph
-graph_suite "suite.rc" "${TNAME}-graph-exp" -u
+graph_suite "flow.cylc" "${TNAME}-graph-exp" -u
 cmp_ok "${TNAME}-graph-exp" "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/graph-exp-1.ref"
 # inheritance graph
-graph_suite "suite.rc" "${TNAME}-graph-nam" -n
+graph_suite "flow.cylc" "${TNAME}-graph-nam" -n
 cmp_ok "${TNAME}-graph-nam" "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/graph-nam-1.ref"
 
 #------------------------------------------------------------------------------
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         i = cat, dog, fish
@@ -142,19 +142,19 @@ __SUITE__
 
 TNAME=${TEST_NAME_BASE}-4
 # validate
-run_ok "${TNAME}" cylc validate "suite.rc"
+run_ok "${TNAME}" cylc validate "flow.cylc"
 # family graph
-graph_suite "suite.rc" "${TNAME}-graph-fam"
+graph_suite "flow.cylc" "${TNAME}-graph-fam"
 cmp_ok "${TNAME}-graph-fam" "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/graph-fam-b.ref"
 # task graph
-graph_suite "suite.rc" "${TNAME}-graph-exp" -u
+graph_suite "flow.cylc" "${TNAME}-graph-exp" -u
 cmp_ok "${TNAME}-graph-exp" "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/graph-exp-b.ref"
 # inheritance graph
-graph_suite "suite.rc" "${TNAME}-graph-nam" -n
+graph_suite "flow.cylc" "${TNAME}-graph-nam" -n
 cmp_ok "${TNAME}-graph-nam" "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/graph-nam-b.ref"
 
 #------------------------------------------------------------------------------
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         i = cat, dog, fish
@@ -175,10 +175,10 @@ cat >'suite.rc' <<'__SUITE__'
         inherit = "FAM<i=dog,j=1>"  # OK (plain task can inherit from specific params)
 __SUITE__
 
-run_ok "${TEST_NAME_BASE}-5" cylc validate "suite.rc"
+run_ok "${TEST_NAME_BASE}-5" cylc validate "flow.cylc"
 
 #------------------------------------------------------------------------------
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         i = cat, dog, fish
@@ -195,12 +195,12 @@ cat >'suite.rc' <<'__SUITE__'
         inherit = BAR<i>, BAZ<j>
 __SUITE__
 
-run_ok "${TEST_NAME_BASE}-6" cylc validate 'suite.rc'
-cylc graph --reference -u 'suite.rc' 1>'06.graph'
+run_ok "${TEST_NAME_BASE}-6" cylc validate 'flow.cylc'
+cylc graph --reference -u 'flow.cylc' 1>'06.graph'
 cmp_ok '06.graph' "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/06.graph.ref"
 
 #------------------------------------------------------------------------------
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         i = cat, dog, fish
@@ -220,13 +220,13 @@ cat >'suite.rc' <<'__SUITE__'
 __SUITE__
 
 TNAME=${TEST_NAME_BASE}-err-1
-run_fail "${TNAME}" cylc validate "suite.rc"
+run_fail "${TNAME}" cylc validate "flow.cylc"
 cmp_ok "${TNAME}.stderr" - << __ERR__
 ParamExpandError: illegal value 'i=frog' in 'inherit = FAM<i=frog,j>'
 __ERR__
 
 #------------------------------------------------------------------------------
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     [[parameters]]
         i = cat, dog, fish
@@ -248,7 +248,7 @@ cat >'suite.rc' <<'__SUITE__'
 __SUITE__
 
 TNAME="${TEST_NAME_BASE}-err-2"
-run_fail "${TNAME}" cylc validate "suite.rc"
+run_fail "${TNAME}" cylc validate "flow.cylc"
 cmp_ok "${TNAME}.stderr" - << __ERR__
 ParamExpandError: parameter 'i' undefined in 'inherit = FAM<i,j=1>'
 __ERR__
diff --git a/tests/functional/param_expand/03-env-tmpl/suite.rc b/tests/functional/param_expand/03-env-tmpl/flow.cylc
similarity index 100%
rename from tests/functional/param_expand/03-env-tmpl/suite.rc
rename to tests/functional/param_expand/03-env-tmpl/flow.cylc
diff --git a/tests/functional/periodicals/09-monthly-reorder.t b/tests/functional/periodicals/09-monthly-reorder.t
index 573217d0ebe..3a66c3d9f22 100644
--- a/tests/functional/periodicals/09-monthly-reorder.t
+++ b/tests/functional/periodicals/09-monthly-reorder.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -31,7 +31,7 @@ suite_run_ok "${TEST_NAME}" cylc run --reference-test --debug --no-detach "${SUI
 TEST_NAME="${TEST_NAME_BASE}-run"
 # Swapping the Monthly and Hours-of-the-day cycling sections
 # should make no difference.
-perl -pi -e 'undef $/; s/( *\[\[\[00.*marker1)\n( *\[\[\[Monthly.*marker2)/${2}\n${1}/smg' "${TEST_DIR}/${SUITE_NAME}/suite.rc"
+perl -pi -e 'undef $/; s/( *\[\[\[00.*marker1)\n( *\[\[\[Monthly.*marker2)/${2}\n${1}/smg' "${TEST_DIR}/${SUITE_NAME}/flow.cylc"
 suite_run_ok "${TEST_NAME}" cylc run --reference-test --debug --no-detach "${SUITE_NAME}"
 #-------------------------------------------------------------------------------
 purge_suite "${SUITE_NAME}"
diff --git a/tests/functional/periodicals/Daily/suite.rc b/tests/functional/periodicals/Daily/flow.cylc
similarity index 100%
rename from tests/functional/periodicals/Daily/suite.rc
rename to tests/functional/periodicals/Daily/flow.cylc
diff --git a/tests/functional/periodicals/Monthly-reorder/suite.rc b/tests/functional/periodicals/Monthly-reorder/flow.cylc
similarity index 100%
rename from tests/functional/periodicals/Monthly-reorder/suite.rc
rename to tests/functional/periodicals/Monthly-reorder/flow.cylc
diff --git a/tests/functional/periodicals/Monthly/suite.rc b/tests/functional/periodicals/Monthly/flow.cylc
similarity index 100%
rename from tests/functional/periodicals/Monthly/suite.rc
rename to tests/functional/periodicals/Monthly/flow.cylc
diff --git a/tests/functional/periodicals/Yearly/suite.rc b/tests/functional/periodicals/Yearly/flow.cylc
similarity index 100%
rename from tests/functional/periodicals/Yearly/suite.rc
rename to tests/functional/periodicals/Yearly/flow.cylc
diff --git a/tests/functional/pre-initial/00-simple/suite.rc b/tests/functional/pre-initial/00-simple/flow.cylc
similarity index 100%
rename from tests/functional/pre-initial/00-simple/suite.rc
rename to tests/functional/pre-initial/00-simple/flow.cylc
diff --git a/tests/functional/pre-initial/01-basic/suite.rc b/tests/functional/pre-initial/01-basic/flow.cylc
similarity index 100%
rename from tests/functional/pre-initial/01-basic/suite.rc
rename to tests/functional/pre-initial/01-basic/flow.cylc
diff --git a/tests/functional/pre-initial/02-advanced/suite.rc b/tests/functional/pre-initial/02-advanced/flow.cylc
similarity index 100%
rename from tests/functional/pre-initial/02-advanced/suite.rc
rename to tests/functional/pre-initial/02-advanced/flow.cylc
diff --git a/tests/functional/pre-initial/03-drop/suite.rc b/tests/functional/pre-initial/03-drop/flow.cylc
similarity index 100%
rename from tests/functional/pre-initial/03-drop/suite.rc
rename to tests/functional/pre-initial/03-drop/flow.cylc
diff --git a/tests/functional/pre-initial/05-warm-new-ict.t b/tests/functional/pre-initial/05-warm-new-ict.t
index 91dcaa7ba85..018881e1a47 100644
--- a/tests/functional/pre-initial/05-warm-new-ict.t
+++ b/tests/functional/pre-initial/05-warm-new-ict.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -15,8 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
-# Test pre-initial cycling works under warm starts with a new initial cycle 
-# time that is later than the suite.rc initial cycle point.
+# Test pre-initial cycling works under warm starts with a new initial cycle
+# time that is later than the flow.cylc initial cycle point.
 . "$(dirname "$0")/test_header"
 #-------------------------------------------------------------------------------
 set_test_number 2
diff --git a/tests/functional/pre-initial/06-over-bracketed/suite.rc b/tests/functional/pre-initial/06-over-bracketed/flow.cylc
similarity index 100%
rename from tests/functional/pre-initial/06-over-bracketed/suite.rc
rename to tests/functional/pre-initial/06-over-bracketed/flow.cylc
diff --git a/tests/functional/pre-initial/07-simple-messaging/suite.rc b/tests/functional/pre-initial/07-simple-messaging/flow.cylc
similarity index 100%
rename from tests/functional/pre-initial/07-simple-messaging/suite.rc
rename to tests/functional/pre-initial/07-simple-messaging/flow.cylc
diff --git a/tests/functional/pre-initial/08-conditional-messaging/suite.rc b/tests/functional/pre-initial/08-conditional-messaging/flow.cylc
similarity index 100%
rename from tests/functional/pre-initial/08-conditional-messaging/suite.rc
rename to tests/functional/pre-initial/08-conditional-messaging/flow.cylc
diff --git a/tests/functional/pre-initial/warm-insert/suite.rc b/tests/functional/pre-initial/warm-insert/flow.cylc
similarity index 100%
rename from tests/functional/pre-initial/warm-insert/suite.rc
rename to tests/functional/pre-initial/warm-insert/flow.cylc
diff --git a/tests/functional/pre-initial/warm-offset/suite.rc b/tests/functional/pre-initial/warm-offset/flow.cylc
similarity index 100%
rename from tests/functional/pre-initial/warm-offset/suite.rc
rename to tests/functional/pre-initial/warm-offset/flow.cylc
diff --git a/tests/functional/pre-initial/warm-start-iso/suite.rc b/tests/functional/pre-initial/warm-start-iso/flow.cylc
similarity index 100%
rename from tests/functional/pre-initial/warm-start-iso/suite.rc
rename to tests/functional/pre-initial/warm-start-iso/flow.cylc
diff --git a/tests/functional/pre-initial/warm-start/suite.rc b/tests/functional/pre-initial/warm-start/flow.cylc
similarity index 100%
rename from tests/functional/pre-initial/warm-start/suite.rc
rename to tests/functional/pre-initial/warm-start/flow.cylc
diff --git a/tests/functional/queues/02-queueorder/suite.rc b/tests/functional/queues/02-queueorder/flow.cylc
similarity index 100%
rename from tests/functional/queues/02-queueorder/suite.rc
rename to tests/functional/queues/02-queueorder/flow.cylc
diff --git a/tests/functional/queues/qsize/suite.rc b/tests/functional/queues/qsize/flow.cylc
similarity index 100%
rename from tests/functional/queues/qsize/suite.rc
rename to tests/functional/queues/qsize/flow.cylc
diff --git a/tests/functional/recurrence-min/00-basic/suite.rc b/tests/functional/recurrence-min/00-basic/flow.cylc
similarity index 100%
rename from tests/functional/recurrence-min/00-basic/suite.rc
rename to tests/functional/recurrence-min/00-basic/flow.cylc
diff --git a/tests/functional/recurrence-min/01-offset-initial/suite.rc b/tests/functional/recurrence-min/01-offset-initial/flow.cylc
similarity index 100%
rename from tests/functional/recurrence-min/01-offset-initial/suite.rc
rename to tests/functional/recurrence-min/01-offset-initial/flow.cylc
diff --git a/tests/functional/recurrence-min/02-offset-truncated/suite.rc b/tests/functional/recurrence-min/02-offset-truncated/flow.cylc
similarity index 100%
rename from tests/functional/recurrence-min/02-offset-truncated/suite.rc
rename to tests/functional/recurrence-min/02-offset-truncated/flow.cylc
diff --git a/tests/functional/recurrence-min/03-neg-offset-truncated/suite.rc b/tests/functional/recurrence-min/03-neg-offset-truncated/flow.cylc
similarity index 100%
rename from tests/functional/recurrence-min/03-neg-offset-truncated/suite.rc
rename to tests/functional/recurrence-min/03-neg-offset-truncated/flow.cylc
diff --git a/tests/functional/registration/00-simple.t b/tests/functional/registration/00-simple.t
index 858a22d224d..19aed5121b7 100755
--- a/tests/functional/registration/00-simple.t
+++ b/tests/functional/registration/00-simple.t
@@ -28,7 +28,7 @@ function make_rnd_suite() {
     RND_SUITE_NAME=x$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c6)
     RND_SUITE_SOURCE="$PWD/${RND_SUITE_NAME}"
     mkdir -p "${RND_SUITE_SOURCE}"
-    touch "${RND_SUITE_SOURCE}/suite.rc"
+    touch "${RND_SUITE_SOURCE}/flow.cylc"
     RND_SUITE_RUNDIR="${RUN_DIR}/${RND_SUITE_NAME}"
 }
 
@@ -53,18 +53,18 @@ make_rnd_suite
 rm -rf "${RND_SUITE_SOURCE}"
 run_fail "${TEST_NAME}" cylc register "${RND_SUITE_NAME}" "${RND_SUITE_SOURCE}"
 contains_ok "${TEST_NAME}.stderr" <<__ERR__
-SuiteServiceFileError: no suite.rc in ${RND_SUITE_SOURCE}
+SuiteServiceFileError: no flow.cylc or suite.rc in ${RND_SUITE_SOURCE}
 __ERR__
 purge_rnd_suite
 
 #---------------------------
-# Test fail no suite.rc file
+# Test fail no flow.cylc file
 TEST_NAME="${TEST_NAME_BASE}-nodir"
 make_rnd_suite
-rm -f "${RND_SUITE_SOURCE}/suite.rc"
+rm -f "${RND_SUITE_SOURCE}/flow.cylc"
 run_fail "${TEST_NAME}" cylc register "${RND_SUITE_NAME}" "${RND_SUITE_SOURCE}"
 contains_ok "${TEST_NAME}.stderr" <<__ERR__
-SuiteServiceFileError: no suite.rc in ${RND_SUITE_SOURCE}
+SuiteServiceFileError: no flow.cylc or suite.rc in ${RND_SUITE_SOURCE}
 __ERR__
 purge_rnd_suite
 
@@ -107,7 +107,7 @@ purge_rnd_suite
 TEST_NAME="${TEST_NAME_BASE}-reg-run-dir"
 make_rnd_suite
 mkdir -p "${RND_SUITE_RUNDIR}"
-cp "${RND_SUITE_SOURCE}/suite.rc" "${RND_SUITE_RUNDIR}"
+cp "${RND_SUITE_SOURCE}/flow.cylc" "${RND_SUITE_RUNDIR}"
 run_ok "${TEST_NAME}" cylc register "${RND_SUITE_NAME}" "${RND_SUITE_RUNDIR}"
 contains_ok "${TEST_NAME}.stdout" <<__OUT__
 REGISTERED ${RND_SUITE_NAME} -> ${RND_SUITE_RUNDIR}
@@ -206,7 +206,7 @@ rm -rf "${TDIR}"
 #-----------------------------------------------------------------------------
 # Now use a real suite
 
-init_suite "${TEST_NAME_BASE}" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [meta]
     title = the quick brown fox
 [scheduling]
@@ -215,7 +215,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITE_RC__'
 [runtime]
     [[a,b,c]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-val" cylc validate "${SUITE_NAME}"
 
@@ -226,7 +226,7 @@ __OUT__
 
 # Filter out errors from 'bad' suites in the 'cylc-run' directory
 NONSPECIFIC_ERR2='\[Errno 2\] No such file or directory:'
-SPECIFIC_ERR2="$NONSPECIFIC_ERR2 '$HOME/cylc-run/${SUITE_NAME}/suite.rc'"
+SPECIFIC_ERR2="$NONSPECIFIC_ERR2 '$HOME/cylc-run/${SUITE_NAME}/flow.cylc'"
 ERR2_COUNT="$(grep -c "$SPECIFIC_ERR2" "${TEST_NAME_BASE}-print.stderr")"
 if ((ERR2_COUNT == 0)); then
     grep -v -s "$NONSPECIFIC_ERR2" "${TEST_NAME_BASE}-print.stderr" > "${TEST_NAME_BASE}-print-filtered.stderr"
diff --git a/tests/functional/registration/01-no-skip1.t b/tests/functional/registration/01-no-skip1.t
index a7fff07d06b..868effa4b89 100755
--- a/tests/functional/registration/01-no-skip1.t
+++ b/tests/functional/registration/01-no-skip1.t
@@ -21,7 +21,7 @@
 . "$(dirname "$0")/test_header"
 set_test_number 3
 
-init_suite "${TEST_NAME_BASE}" <<'__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [meta]
     title = the quick brown fox
 [scheduling]
@@ -30,7 +30,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITE_RC__'
 [runtime]
     [[a,b,c]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 RUND="$RUN_DIR"
 ln -sf "${SUITE_NAME}" "${RUND}/work"
 
@@ -41,7 +41,7 @@ __OUT__
 
 # Filter out errors from 'bad' suites in the 'cylc-run' directory
 NONSPECIFIC_ERR2='\[Errno 2\] No such file or directory:'
-SPECIFIC_ERR2="$NONSPECIFIC_ERR2 '$HOME/cylc-run/${SUITE_NAME}/suite.rc'"
+SPECIFIC_ERR2="$NONSPECIFIC_ERR2 '$HOME/cylc-run/${SUITE_NAME}/flow.cylc'"
 ERR2_COUNT=$(grep -c "$SPECIFIC_ERR2" "${TEST_NAME_BASE}-print.stderr")
 if [ "$ERR2_COUNT" -eq "0" ]; then
     grep -v -s "$NONSPECIFIC_ERR2" "${TEST_NAME_BASE}-print.stderr" > "${TEST_NAME_BASE}-print-filtered.stderr"
diff --git a/tests/functional/reload/00-simple/suite.rc b/tests/functional/reload/00-simple/flow.cylc
similarity index 100%
rename from tests/functional/reload/00-simple/suite.rc
rename to tests/functional/reload/00-simple/flow.cylc
diff --git a/tests/functional/reload/01-startup/suite.rc b/tests/functional/reload/01-startup/flow.cylc
similarity index 100%
rename from tests/functional/reload/01-startup/suite.rc
rename to tests/functional/reload/01-startup/flow.cylc
diff --git a/tests/functional/reload/02-content/suite.rc b/tests/functional/reload/02-content/flow.cylc
similarity index 96%
rename from tests/functional/reload/02-content/suite.rc
rename to tests/functional/reload/02-content/flow.cylc
index 9a2ce5455f0..7edf4ac08fc 100644
--- a/tests/functional/reload/02-content/suite.rc
+++ b/tests/functional/reload/02-content/flow.cylc
@@ -11,7 +11,7 @@ fail, unless the first reloads the suite definition after modifying it."""
     [[reloader]]
         script = """
 # change the value of $FALSE to "true" in foo's environment:
-perl -pi -e 's/(FALSE = )false( # marker)/\1true\2/' $CYLC_SUITE_DEF_PATH/suite.rc
+perl -pi -e 's/(FALSE = )false( # marker)/\1true\2/' $CYLC_SUITE_DEF_PATH/flow.cylc
 # reload
 cylc reload $CYLC_SUITE_NAME
 """
diff --git a/tests/functional/reload/03-queues/suite.rc b/tests/functional/reload/03-queues/flow.cylc
similarity index 98%
rename from tests/functional/reload/03-queues/suite.rc
rename to tests/functional/reload/03-queues/flow.cylc
index 8e6c05e55b6..58cbe1b07c5 100644
--- a/tests/functional/reload/03-queues/suite.rc
+++ b/tests/functional/reload/03-queues/flow.cylc
@@ -18,7 +18,7 @@
     [[reloader]]
         script = """
 # change the limit on number of members of q_fam:
-perl -pi -e 's/(limit = )5( # marker)/\1 3 \2/' $CYLC_SUITE_DEF_PATH/suite.rc
+perl -pi -e 's/(limit = )5( # marker)/\1 3 \2/' $CYLC_SUITE_DEF_PATH/flow.cylc
 # reload
 cylc reload "${CYLC_SUITE_NAME}"
 cylc__job__poll_grep_suite_log 'Reload completed'
diff --git a/tests/functional/reload/04-inheritance/suite.rc b/tests/functional/reload/04-inheritance/flow.cylc
similarity index 95%
rename from tests/functional/reload/04-inheritance/suite.rc
rename to tests/functional/reload/04-inheritance/flow.cylc
index 72642f6e51f..92935ec6cc2 100644
--- a/tests/functional/reload/04-inheritance/suite.rc
+++ b/tests/functional/reload/04-inheritance/flow.cylc
@@ -13,7 +13,7 @@
     [[reloader]]
         script = """
 # change the inheritance of inheritor:
-perl -pi -e 's/(inherit = )FAM1( # marker)/\1FAM2\2/' $CYLC_SUITE_DEF_PATH/suite.rc
+perl -pi -e 's/(inherit = )FAM1( # marker)/\1FAM2\2/' $CYLC_SUITE_DEF_PATH/flow.cylc
 # reload
 cylc reload $CYLC_SUITE_NAME
 sleep 5
diff --git a/tests/functional/reload/05-graphing-simple/suite.rc b/tests/functional/reload/05-graphing-simple/flow.cylc
similarity index 90%
rename from tests/functional/reload/05-graphing-simple/suite.rc
rename to tests/functional/reload/05-graphing-simple/flow.cylc
index f475cc1528c..dd05877cd3e 100644
--- a/tests/functional/reload/05-graphing-simple/suite.rc
+++ b/tests/functional/reload/05-graphing-simple/flow.cylc
@@ -9,7 +9,7 @@
     [[reloader]]
         script = """
 # 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_SUITE_DEF_PATH/suite.rc
+perl -pi -e 's/(R1 = reloader => inter => )bar => foo( # marker)/\1foo => bar\2/' $CYLC_SUITE_DEF_PATH/flow.cylc
 # reload
 cylc reload "${CYLC_SUITE_NAME}"
 cylc__job__poll_grep_suite_log -F 'Reload completed'
diff --git a/tests/functional/reload/06-graphing-fam/suite.rc b/tests/functional/reload/06-graphing-fam/flow.cylc
similarity index 90%
rename from tests/functional/reload/06-graphing-fam/suite.rc
rename to tests/functional/reload/06-graphing-fam/flow.cylc
index 0124357bb1e..b0be154a9e9 100644
--- a/tests/functional/reload/06-graphing-fam/suite.rc
+++ b/tests/functional/reload/06-graphing-fam/flow.cylc
@@ -13,8 +13,8 @@
     [[reloader]]
         script = """
 # change the order of FOO and BAR in the graphing section:
-perl -pi -e 's/(reloader => inter => )BAR( # marker1)/\1FOO\2/' $CYLC_SUITE_DEF_PATH/suite.rc
-perl -pi -e 's/( )BAR:finish-all => FOO( # marker2)/\1FOO:finish-all => BAR\2/' $CYLC_SUITE_DEF_PATH/suite.rc
+perl -pi -e 's/(reloader => inter => )BAR( # marker1)/\1FOO\2/' $CYLC_SUITE_DEF_PATH/flow.cylc
+perl -pi -e 's/( )BAR:finish-all => FOO( # marker2)/\1FOO:finish-all => BAR\2/' $CYLC_SUITE_DEF_PATH/flow.cylc
 # reload
 cylc reload "${CYLC_SUITE_NAME}"
 cylc__job__poll_grep_suite_log -F 'Reload completed'
diff --git a/tests/functional/reload/07-final-cycle/suite.rc b/tests/functional/reload/07-final-cycle/flow.cylc
similarity index 92%
rename from tests/functional/reload/07-final-cycle/suite.rc
rename to tests/functional/reload/07-final-cycle/flow.cylc
index 638ea69b0b1..aa327ddc8a1 100644
--- a/tests/functional/reload/07-final-cycle/suite.rc
+++ b/tests/functional/reload/07-final-cycle/flow.cylc
@@ -15,7 +15,7 @@
     [[reloader]]
         script = """
 # change the final cycle:
-perl -pi -e 's/(final cycle point = )20100102T00( # marker)/\1 20100101T12\2/' $CYLC_SUITE_DEF_PATH/suite.rc
+perl -pi -e 's/(final cycle point = )20100102T00( # marker)/\1 20100101T12\2/' $CYLC_SUITE_DEF_PATH/flow.cylc
 # reload
 cylc reload $CYLC_SUITE_NAME
 cylc__job__poll_grep_suite_log -F 'Reload completed'
diff --git a/tests/functional/reload/08-cycle/suite.rc b/tests/functional/reload/08-cycle/flow.cylc
similarity index 94%
rename from tests/functional/reload/08-cycle/suite.rc
rename to tests/functional/reload/08-cycle/flow.cylc
index 4b6477745ce..789a690ddf1 100644
--- a/tests/functional/reload/08-cycle/suite.rc
+++ b/tests/functional/reload/08-cycle/flow.cylc
@@ -15,7 +15,7 @@
     [[reloader]]
         script = """
 # 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_SUITE_DEF_PATH}/suite.rc"
+sed -i 's/T00,T12 = a\[-PT12H\]/T00,T06,T12,T18 = a[-PT6H]/' "${CYLC_SUITE_DEF_PATH}/flow.cylc"
 # reload
 cylc reload "${CYLC_SUITE_NAME}"
 cylc__job__poll_grep_suite_log -F 'Reload completed'
diff --git a/tests/functional/reload/11-retrying/suite.rc b/tests/functional/reload/11-retrying/flow.cylc
similarity index 100%
rename from tests/functional/reload/11-retrying/suite.rc
rename to tests/functional/reload/11-retrying/flow.cylc
diff --git a/tests/functional/reload/12-remove-task/suite.rc b/tests/functional/reload/12-remove-task/flow.cylc
similarity index 85%
rename from tests/functional/reload/12-remove-task/suite.rc
rename to tests/functional/reload/12-remove-task/flow.cylc
index 821ab8c4fe9..59e2ed27613 100644
--- a/tests/functional/reload/12-remove-task/suite.rc
+++ b/tests/functional/reload/12-remove-task/flow.cylc
@@ -8,7 +8,7 @@
 [runtime]
     [[reloader]]
         script = """
-            sed -i "s/remove_me =>//g" $CYLC_SUITE_DEF_PATH/suite.rc
+            sed -i "s/remove_me =>//g" $CYLC_SUITE_DEF_PATH/flow.cylc
             cylc reload $CYLC_SUITE_NAME
             cylc__job__poll_grep_suite_log -F 'Reload completed'
         """
diff --git a/tests/functional/reload/13-add-task/suite.rc b/tests/functional/reload/13-add-task/flow.cylc
similarity index 94%
rename from tests/functional/reload/13-add-task/suite.rc
rename to tests/functional/reload/13-add-task/flow.cylc
index 16447fd7838..b784450c988 100644
--- a/tests/functional/reload/13-add-task/suite.rc
+++ b/tests/functional/reload/13-add-task/flow.cylc
@@ -11,7 +11,7 @@
       script = true
    [[reloader]]
       script = """
-sed -i "s/\(R1 = reloader => foo\)\s*$/\1 => add_me/" $CYLC_SUITE_DEF_PATH/suite.rc
+sed -i "s/\(R1 = reloader => foo\)\s*$/\1 => add_me/" $CYLC_SUITE_DEF_PATH/flow.cylc
 cylc reload $CYLC_SUITE_NAME
 sleep 10
         """
diff --git a/tests/functional/reload/14-waiting/suite.rc b/tests/functional/reload/14-waiting/flow.cylc
similarity index 100%
rename from tests/functional/reload/14-waiting/suite.rc
rename to tests/functional/reload/14-waiting/flow.cylc
diff --git a/tests/functional/reload/15-state-summary.t b/tests/functional/reload/15-state-summary.t
index f7bd4fba3a4..50746a9fd8b 100644
--- a/tests/functional/reload/15-state-summary.t
+++ b/tests/functional/reload/15-state-summary.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -19,20 +19,20 @@
 # (SoD: the original test contrived to get a succeeded and a failed task in the
 # pool, and no active tasks. That's not possible under SoD, and it seems to me
 # a trivial held suite should do to test that the state summary updates after a
-# reload when nothing else is happening).  
+# reload when nothing else is happening).
 # See https://github.com/cylc/cylc-flow/pull/1756
 . "$(dirname "$0")/test_header"
 #-------------------------------------------------------------------------------
 set_test_number 2
 #-------------------------------------------------------------------------------
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [scheduling]
    [[graph]]
       R1 = foo
 [runtime]
    [[foo]]
       script = true
-__SUITERC__
+__FLOW_CONFIG__
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-validate"
 run_ok "${TEST_NAME}" cylc validate "${SUITE_NAME}"
diff --git a/tests/functional/reload/16-remove-add-alter-task/suite.rc b/tests/functional/reload/16-remove-add-alter-task/flow.cylc
similarity index 86%
rename from tests/functional/reload/16-remove-add-alter-task/suite.rc
rename to tests/functional/reload/16-remove-add-alter-task/flow.cylc
index 5753e35adfa..4f7388f5c27 100644
--- a/tests/functional/reload/16-remove-add-alter-task/suite.rc
+++ b/tests/functional/reload/16-remove-add-alter-task/flow.cylc
@@ -21,12 +21,12 @@ do_reload() {
         sleep 1
     done
 }
-sed -i "s/\(R1 = reloader => inter\).*/\1/" "${CYLC_SUITE_DEF_PATH}/suite.rc"
+sed -i "s/\(R1 = reloader => inter\).*/\1/" "${CYLC_SUITE_DEF_PATH}/flow.cylc"
 do_reload 1
 sed -i "s/\(R1 = reloader => inter\)/\1 => remove_add_alter_me/" \
-    "${CYLC_SUITE_DEF_PATH}/suite.rc"
+    "${CYLC_SUITE_DEF_PATH}/flow.cylc"
 do_reload 2
-cat >>"${CYLC_SUITE_DEF_PATH}/suite.rc" <<'__RUNTIME__'
+cat >>"${CYLC_SUITE_DEF_PATH}/flow.cylc" <<'__RUNTIME__'
 [[remove_add_alter_me]]
     script = true
 __RUNTIME__
diff --git a/tests/functional/reload/17-graphing-change.t b/tests/functional/reload/17-graphing-change.t
index 90b6ee8f49a..eaa75a1e25e 100755
--- a/tests/functional/reload/17-graphing-change.t
+++ b/tests/functional/reload/17-graphing-change.t
@@ -29,9 +29,9 @@ LOG_FILE="${SUITE_RUN_DIR}/log/suite/log"
 # start suite in held mode
 run_ok "${TEST_NAME_BASE}-add-run" cylc run --debug --hold "${SUITE_NAME}"
 
-# change the suite.rc file
-cp "${TEST_SOURCE_DIR}/graphing-change/suite-1.rc" \
-    "${TEST_DIR}/${SUITE_NAME}/suite.rc"
+# change the flow.cylc file
+cp "${TEST_SOURCE_DIR}/graphing-change/flow-1.cylc" \
+    "${TEST_DIR}/${SUITE_NAME}/flow.cylc"
 
 # reload suite
 run_ok "${TEST_NAME_BASE}-add-reload" cylc reload "${SUITE_NAME}"
@@ -44,9 +44,9 @@ grep_ok "Added task: 'one'" "${LOG_FILE}"
 #-------------------------------------------------------------------------------
 # test reporting or removed tasks
 
-# change the suite.rc file
-cp "${TEST_SOURCE_DIR}/graphing-change/suite.rc" \
-    "${TEST_DIR}/${SUITE_NAME}/suite.rc"
+# change the flow.cylc file
+cp "${TEST_SOURCE_DIR}/graphing-change/flow.cylc" \
+    "${TEST_DIR}/${SUITE_NAME}/flow.cylc"
 
 # reload suite
 run_ok "${TEST_NAME_BASE}-remove-reload" cylc reload "${SUITE_NAME}"
@@ -59,9 +59,9 @@ grep_ok "Removed task: 'one'" "${LOG_FILE}"
 #-------------------------------------------------------------------------------
 # test reporting of adding / removing / swapping tasks
 
-# change the suite.rc file
-cp "${TEST_SOURCE_DIR}/graphing-change/suite-2.rc" \
-    "${TEST_DIR}/${SUITE_NAME}/suite.rc"
+# change the flow.cylc file
+cp "${TEST_SOURCE_DIR}/graphing-change/flow-2.cylc" \
+    "${TEST_DIR}/${SUITE_NAME}/flow.cylc"
 
 cylc spawn "${SUITE_NAME}"  foo.1
 cylc spawn "${SUITE_NAME}"  baz.1
diff --git a/tests/functional/reload/18-broadcast-insert/suite-2.rc b/tests/functional/reload/18-broadcast-insert/flow-2.cylc
similarity index 100%
rename from tests/functional/reload/18-broadcast-insert/suite-2.rc
rename to tests/functional/reload/18-broadcast-insert/flow-2.cylc
diff --git a/tests/functional/reload/18-broadcast-insert/suite.rc b/tests/functional/reload/18-broadcast-insert/flow.cylc
similarity index 75%
rename from tests/functional/reload/18-broadcast-insert/suite.rc
rename to tests/functional/reload/18-broadcast-insert/flow.cylc
index 34e5b79fdf4..b80a6322c9e 100644
--- a/tests/functional/reload/18-broadcast-insert/suite.rc
+++ b/tests/functional/reload/18-broadcast-insert/flow.cylc
@@ -6,7 +6,7 @@
     [[foo]]
         script="""
 cylc broadcast "${CYLC_SUITE_NAME}" -s '[environment]CYLC_TEST_VAR=1'
-cp -p "${CYLC_SUITE_DEF_PATH}/suite-2.rc" "${CYLC_SUITE_DEF_PATH}/suite.rc"
+cp -p "${CYLC_SUITE_DEF_PATH}/flow-2.cylc" "${CYLC_SUITE_DEF_PATH}/flow.cylc"
 cylc reload "${CYLC_SUITE_NAME}"
 sleep 5
 cylc trigger "${CYLC_SUITE_NAME}" 'bar.1'
diff --git a/tests/functional/reload/19-remote-kill/suite.rc b/tests/functional/reload/19-remote-kill/flow.cylc
similarity index 100%
rename from tests/functional/reload/19-remote-kill/suite.rc
rename to tests/functional/reload/19-remote-kill/flow.cylc
diff --git a/tests/functional/reload/20-stop-point/suite.rc b/tests/functional/reload/20-stop-point/flow.cylc
similarity index 100%
rename from tests/functional/reload/20-stop-point/suite.rc
rename to tests/functional/reload/20-stop-point/flow.cylc
diff --git a/tests/functional/reload/21-submit-fail.t b/tests/functional/reload/21-submit-fail.t
index 6c8057548ce..908dd8ef96f 100755
--- a/tests/functional/reload/21-submit-fail.t
+++ b/tests/functional/reload/21-submit-fail.t
@@ -23,7 +23,7 @@ skip_darwin 'atrun hard to configure on Mac OS'
 
 set_test_number 4
 
-create_test_globalrc '
+create_test_global_config '
 [platforms]
     [[platypus]]
         hosts = localhost
diff --git a/tests/functional/reload/21-submit-fail/bin/mycylcrun b/tests/functional/reload/21-submit-fail/bin/mycylcrun
index 39c7235fc41..cc744616a5e 100755
--- a/tests/functional/reload/21-submit-fail/bin/mycylcrun
+++ b/tests/functional/reload/21-submit-fail/bin/mycylcrun
@@ -25,7 +25,7 @@ from cylc.flow.scheduler import Scheduler
 from cylc.flow.scheduler_cli import main
 
 
-def patch_load_suiterc(method):
+def patch_load_flow_file(method):
     def new_method(self, is_reload=False):
         if is_reload:
             LOG.debug('Sleep on reload')
@@ -33,7 +33,7 @@ def patch_load_suiterc(method):
         return method(self, is_reload)
     return new_method
 
-Scheduler.load_suiterc = patch_load_suiterc(Scheduler.load_suiterc)
+Scheduler.load_flow_file = patch_load_flow_file(Scheduler.load_flow_file)
 
 
 if __name__ == '__main__':
diff --git a/tests/functional/reload/21-submit-fail/suite.rc b/tests/functional/reload/21-submit-fail/flow.cylc
similarity index 100%
rename from tests/functional/reload/21-submit-fail/suite.rc
rename to tests/functional/reload/21-submit-fail/flow.cylc
diff --git a/tests/functional/reload/22-remove-task-cycling.t b/tests/functional/reload/22-remove-task-cycling.t
index d7383a23503..ac12e333ea4 100644
--- a/tests/functional/reload/22-remove-task-cycling.t
+++ b/tests/functional/reload/22-remove-task-cycling.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -25,7 +25,7 @@ set_test_number 3
 # A suite designed to orphan a single copy of a task 'bar' on self-reload,
 # or stall and abort if the orphaned task triggers the #3306 bug.
 
-init_suite "${TEST_NAME_BASE}" <<__SUITE_RC__
+init_suite "${TEST_NAME_BASE}" <<__FLOW_CONFIG__
 [cylc]
    [[events]]
       inactivity = PT25S
@@ -50,7 +50,7 @@ $(declare -f poll_grep)
 
 # Remove bar and tell the server to reload.
 if (( CYLC_TASK_CYCLE_POINT == CYLC_SUITE_INITIAL_CYCLE_POINT )); then
-   sed -i 's/^.*remove*$//g' "\${CYLC_SUITE_DEF_PATH}/suite.rc"
+   sed -i 's/^.*remove*$//g' "\${CYLC_SUITE_DEF_PATH}/flow.cylc"
    cylc reload "\${CYLC_SUITE_NAME}"
    poll_grep -F 'Reload complete' "\${CYLC_SUITE_RUN_DIR}/log/suite/log"
    # kill the long-running orphaned bar task.
@@ -64,7 +64,7 @@ fi
 sleep 1000 &
 echo \$! > pid
 wait"""
-__SUITE_RC__
+__FLOW_CONFIG__
 
 TEST_NAME="${TEST_NAME_BASE}-validate"
 run_ok "${TEST_NAME}" cylc validate "${SUITE_NAME}"
diff --git a/tests/functional/reload/garbage/suite.rc b/tests/functional/reload/garbage/flow.cylc
similarity index 93%
rename from tests/functional/reload/garbage/suite.rc
rename to tests/functional/reload/garbage/flow.cylc
index de54ca343ba..a9f71201c56 100644
--- a/tests/functional/reload/garbage/suite.rc
+++ b/tests/functional/reload/garbage/flow.cylc
@@ -6,7 +6,7 @@
         script = """
 sleep 5
 # change the dependencies section name to garbage:
-perl -pi -e 's/(\[\[)graph(\]\] # marker)/\1garbage\2/' $CYLC_SUITE_DEF_PATH/suite.rc
+perl -pi -e 's/(\[\[)graph(\]\] # marker)/\1garbage\2/' $CYLC_SUITE_DEF_PATH/flow.cylc
 # reload
 cylc reload $CYLC_SUITE_NAME
 """
diff --git a/tests/functional/reload/graphing-change/suite-1.rc b/tests/functional/reload/graphing-change/flow-1.cylc
similarity index 100%
rename from tests/functional/reload/graphing-change/suite-1.rc
rename to tests/functional/reload/graphing-change/flow-1.cylc
diff --git a/tests/functional/reload/graphing-change/suite-2.rc b/tests/functional/reload/graphing-change/flow-2.cylc
similarity index 100%
rename from tests/functional/reload/graphing-change/suite-2.rc
rename to tests/functional/reload/graphing-change/flow-2.cylc
diff --git a/tests/functional/reload/graphing-change/suite.rc b/tests/functional/reload/graphing-change/flow.cylc
similarity index 100%
rename from tests/functional/reload/graphing-change/suite.rc
rename to tests/functional/reload/graphing-change/flow.cylc
diff --git a/tests/functional/reload/runahead/suite.rc b/tests/functional/reload/runahead/flow.cylc
similarity index 95%
rename from tests/functional/reload/runahead/suite.rc
rename to tests/functional/reload/runahead/flow.cylc
index 4a1bef1a849..44625eff9f7 100644
--- a/tests/functional/reload/runahead/suite.rc
+++ b/tests/functional/reload/runahead/flow.cylc
@@ -19,6 +19,6 @@
     [[reloader]]
         script = """
 cylc__job__poll_grep_suite_log '\[foo.* (received)failed'
-perl -pi -e 's/(max active cycle points = )2( # marker)/\1 4\2/' $CYLC_SUITE_DEF_PATH/suite.rc
+perl -pi -e 's/(max active cycle points = )2( # marker)/\1 4\2/' $CYLC_SUITE_DEF_PATH/flow.cylc
 cylc reload $CYLC_SUITE_NAME
 """
diff --git a/tests/functional/remote/00-basic.t b/tests/functional/remote/00-basic.t
index ed68198a0be..930c0423376 100644
--- a/tests/functional/remote/00-basic.t
+++ b/tests/functional/remote/00-basic.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -20,7 +20,7 @@
 #-------------------------------------------------------------------------------
 require_remote_platform
 set_test_number 4
-create_test_globalrc "" "
+create_test_global_config "" "
 [platforms]
 [[$CYLC_TEST_PLATFORM]]
 hosts = $CYLC_TEST_HOST
diff --git a/tests/functional/remote/basic/suite.rc b/tests/functional/remote/basic/flow.cylc
similarity index 100%
rename from tests/functional/remote/basic/suite.rc
rename to tests/functional/remote/basic/flow.cylc
diff --git a/tests/functional/repeated-items/one/suite.rc b/tests/functional/repeated-items/one/flow.cylc
similarity index 100%
rename from tests/functional/repeated-items/one/suite.rc
rename to tests/functional/repeated-items/one/flow.cylc
diff --git a/tests/functional/restart/00-pre-initial/suite.rc b/tests/functional/restart/00-pre-initial/flow.cylc
similarity index 100%
rename from tests/functional/restart/00-pre-initial/suite.rc
rename to tests/functional/restart/00-pre-initial/flow.cylc
diff --git a/tests/functional/restart/01-broadcast.t b/tests/functional/restart/01-broadcast.t
index 4b3add56266..a5a809b1e4e 100755
--- a/tests/functional/restart/01-broadcast.t
+++ b/tests/functional/restart/01-broadcast.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -23,7 +23,7 @@ fi
 set_test_number 8
 #-------------------------------------------------------------------------------
 install_suite "${TEST_NAME_BASE}" broadcast
-cp "$TEST_SOURCE_DIR/lib/suite-runtime-restart.rc" "$TEST_DIR/${SUITE_NAME}/"
+cp "$TEST_SOURCE_DIR/lib/flow-runtime-restart.cylc" "$TEST_DIR/${SUITE_NAME}/"
 export TEST_DIR
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-validate"
diff --git a/tests/functional/restart/02-failed.t b/tests/functional/restart/02-failed.t
index 9fe69257ba0..8c1706e2ee3 100755
--- a/tests/functional/restart/02-failed.t
+++ b/tests/functional/restart/02-failed.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -23,7 +23,7 @@ fi
 set_test_number 7
 #-------------------------------------------------------------------------------
 install_suite "${TEST_NAME_BASE}" 'failed'
-cp "$TEST_SOURCE_DIR/lib/suite-runtime-restart.rc" "$TEST_DIR/${SUITE_NAME}/"
+cp "$TEST_SOURCE_DIR/lib/flow-runtime-restart.cylc" "$TEST_DIR/${SUITE_NAME}/"
 export TEST_DIR
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-validate"
diff --git a/tests/functional/restart/03-retrying.t b/tests/functional/restart/03-retrying.t
index fafe20052e8..e7c58bdd985 100755
--- a/tests/functional/restart/03-retrying.t
+++ b/tests/functional/restart/03-retrying.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -18,7 +18,7 @@
 # Test restarting a simple suite with a task in a retrying state.
 . "$(dirname "$0")/test_header"
 set_test_number 5
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     [[events]]
         abort on stalled = True
@@ -38,7 +38,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
         """
         [[[job]]]
             execution retry delays = PT0S
-__SUITERC__
+__FLOW_CONFIG__
 #-------------------------------------------------------------------------------
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 suite_run_ok "${TEST_NAME_BASE}-run" \
diff --git a/tests/functional/restart/04-running.t b/tests/functional/restart/04-running.t
index 2cdd72156a3..59e4278fcba 100755
--- a/tests/functional/restart/04-running.t
+++ b/tests/functional/restart/04-running.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -18,7 +18,7 @@
 # Test restarting a simple suite with a task still running (orphaned)
 . "$(dirname "$0")/test_header"
 set_test_number 5
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     [[events]]
         abort on stalled = True
@@ -35,7 +35,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
             cylc__job__poll_grep_suite_log -F 'Run: (re)start=1'
             # Should be good to send succeeded message at this point
         """
-__SUITERC__
+__FLOW_CONFIG__
 #-------------------------------------------------------------------------------
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 suite_run_ok "${TEST_NAME_BASE}-run" \
diff --git a/tests/functional/restart/05-submit-failed.t b/tests/functional/restart/05-submit-failed.t
index 06d4240bab8..ee421858de4 100755
--- a/tests/functional/restart/05-submit-failed.t
+++ b/tests/functional/restart/05-submit-failed.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -23,7 +23,7 @@ skip_darwin 'atrun hard to configure on Mac OS'
 #-------------------------------------------------------------------------------
 set_test_number 7
 #-------------------------------------------------------------------------------
-create_test_globalrc '
+create_test_global_config '
 [platforms]
 [[test platform]]
 hosts = localhost
@@ -32,7 +32,7 @@ batch submit command template = at oh-no
 '
 #-------------------------------------------------------------------------------
 install_suite "${TEST_NAME_BASE}" 'submit-failed'
-cp "$TEST_SOURCE_DIR/lib/suite-runtime-restart.rc" "$TEST_DIR/${SUITE_NAME}/"
+cp "$TEST_SOURCE_DIR/lib/flow-runtime-restart.cylc" "$TEST_DIR/${SUITE_NAME}/"
 export TEST_DIR
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-validate"
diff --git a/tests/functional/restart/06-succeeded.t b/tests/functional/restart/06-succeeded.t
index c7d955c2813..c65bf08edd7 100755
--- a/tests/functional/restart/06-succeeded.t
+++ b/tests/functional/restart/06-succeeded.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -23,7 +23,7 @@ fi
 set_test_number 7
 #-------------------------------------------------------------------------------
 install_suite "${TEST_NAME_BASE}" 'succeeded'
-cp "$TEST_SOURCE_DIR/lib/suite-runtime-restart.rc" "$TEST_DIR/${SUITE_NAME}/"
+cp "$TEST_SOURCE_DIR/lib/flow-runtime-restart.cylc" "$TEST_DIR/${SUITE_NAME}/"
 export TEST_DIR
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-validate"
diff --git a/tests/functional/restart/07-waiting.t b/tests/functional/restart/07-waiting.t
index 4d9bd1c23b8..1a95fff60a9 100755
--- a/tests/functional/restart/07-waiting.t
+++ b/tests/functional/restart/07-waiting.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -26,7 +26,7 @@ fi
 set_test_number 6
 #-------------------------------------------------------------------------------
 install_suite "${TEST_NAME_BASE}" 'waiting'
-cp "$TEST_SOURCE_DIR/lib/suite-runtime-restart.rc" "$TEST_DIR/${SUITE_NAME}/"
+cp "$TEST_SOURCE_DIR/lib/flow-runtime-restart.cylc" "$TEST_DIR/${SUITE_NAME}/"
 export TEST_DIR
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-validate"
diff --git a/tests/functional/restart/16-template-vars/suite.rc b/tests/functional/restart/16-template-vars/flow.cylc
similarity index 100%
rename from tests/functional/restart/16-template-vars/suite.rc
rename to tests/functional/restart/16-template-vars/flow.cylc
diff --git a/tests/functional/restart/18-template-vars-override/suite.rc b/tests/functional/restart/18-template-vars-override/flow.cylc
similarity index 100%
rename from tests/functional/restart/18-template-vars-override/suite.rc
rename to tests/functional/restart/18-template-vars-override/flow.cylc
diff --git a/tests/functional/restart/20-event-retry/suite.rc b/tests/functional/restart/20-event-retry/flow.cylc
similarity index 100%
rename from tests/functional/restart/20-event-retry/suite.rc
rename to tests/functional/restart/20-event-retry/flow.cylc
diff --git a/tests/functional/restart/22-hold/suite.rc b/tests/functional/restart/22-hold/flow.cylc
similarity index 100%
rename from tests/functional/restart/22-hold/suite.rc
rename to tests/functional/restart/22-hold/flow.cylc
diff --git a/tests/functional/restart/23-hold-retry/suite.rc b/tests/functional/restart/23-hold-retry/flow.cylc
similarity index 100%
rename from tests/functional/restart/23-hold-retry/suite.rc
rename to tests/functional/restart/23-hold-retry/flow.cylc
diff --git a/tests/functional/restart/25-hold-suite/suite.rc b/tests/functional/restart/25-hold-suite/flow.cylc
similarity index 100%
rename from tests/functional/restart/25-hold-suite/suite.rc
rename to tests/functional/restart/25-hold-suite/flow.cylc
diff --git a/tests/functional/restart/26-remote-kill/suite.rc b/tests/functional/restart/26-remote-kill/flow.cylc
similarity index 100%
rename from tests/functional/restart/26-remote-kill/suite.rc
rename to tests/functional/restart/26-remote-kill/flow.cylc
diff --git a/tests/functional/restart/27-broadcast-timeout/suite.rc b/tests/functional/restart/27-broadcast-timeout/flow.cylc
similarity index 100%
rename from tests/functional/restart/27-broadcast-timeout/suite.rc
rename to tests/functional/restart/27-broadcast-timeout/flow.cylc
diff --git a/tests/functional/restart/28-execution-timeout/suite.rc b/tests/functional/restart/28-execution-timeout/flow.cylc
similarity index 100%
rename from tests/functional/restart/28-execution-timeout/suite.rc
rename to tests/functional/restart/28-execution-timeout/flow.cylc
diff --git a/tests/functional/restart/30-outputs/suite.rc b/tests/functional/restart/30-outputs/flow.cylc
similarity index 100%
rename from tests/functional/restart/30-outputs/suite.rc
rename to tests/functional/restart/30-outputs/flow.cylc
diff --git a/tests/functional/restart/32-reload-runahead-no-stop-point/suite.rc b/tests/functional/restart/32-reload-runahead-no-stop-point/flow.cylc
similarity index 100%
rename from tests/functional/restart/32-reload-runahead-no-stop-point/suite.rc
rename to tests/functional/restart/32-reload-runahead-no-stop-point/flow.cylc
diff --git a/tests/functional/restart/33-simulation.t b/tests/functional/restart/33-simulation.t
index 37754f7d0e3..f93a6cc53ba 100644
--- a/tests/functional/restart/33-simulation.t
+++ b/tests/functional/restart/33-simulation.t
@@ -19,7 +19,7 @@
 . "$(dirname "$0")/test_header"
 
 set_test_number 3
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     cycle point format = %Y
     [[events]]
@@ -32,7 +32,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
 [runtime]
     [[t1]]
         script = true
-__SUITERC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 suite_run_ok "${TEST_NAME_BASE}-run" \
diff --git a/tests/functional/restart/34-auto-restart-basic.t b/tests/functional/restart/34-auto-restart-basic.t
index e4dfb7664e7..fefca9c9839 100644
--- a/tests/functional/restart/34-auto-restart-basic.t
+++ b/tests/functional/restart/34-auto-restart-basic.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -22,7 +22,7 @@ set_test_number 9
 if ${CYLC_TEST_DEBUG:-false}; then ERR=2; else ERR=1; fi
 #-------------------------------------------------------------------------------
 # run through the shutdown - restart procedure
-BASE_GLOBALRC="
+BASE_GLOBAL_CONFIG="
 [cylc]
     [[main loop]]
         plugins = health check, auto restart
@@ -37,24 +37,24 @@ BASE_GLOBALRC="
     run hosts = localhost, ${CYLC_TEST_HOST_WSFS}"
 
 TEST_NAME="${TEST_NAME_BASE}"
-TEST_DIR="$HOME/cylc-run/" init_suite "${TEST_NAME}" - <<'__SUITERC__'
+TEST_DIR="$HOME/cylc-run/" init_suite "${TEST_NAME}" - <<'__FLOW_CONFIG__'
 [cylc]
     [[parameters]]
         foo = 1..25
 [scheduling]
     [[graph]]
         R1 = "task<foo> => task<foo+1>"
-__SUITERC__
+__FLOW_CONFIG__
 # run suite on localhost normally
-create_test_globalrc '' "${BASE_GLOBALRC}"
+create_test_global_config '' "${BASE_GLOBAL_CONFIG}"
 run_ok "${TEST_NAME}-suite-start" \
     cylc run "${SUITE_NAME}" --host=localhost -s 'FOO=foo' -v
 cylc suite-state "${SUITE_NAME}" --task='task_foo01' \
     --status='succeeded' --point=1 --interval=1 --max-polls=20 >& $ERR
 
 # condemn localhost
-create_test_globalrc '' "
-${BASE_GLOBALRC}
+create_test_global_config '' "
+${BASE_GLOBAL_CONFIG}
 [suite servers]
     condemned hosts = $(hostname)
 "
diff --git a/tests/functional/restart/35-auto-restart-recovery.t b/tests/functional/restart/35-auto-restart-recovery.t
index ed4014dee22..11865b3d1a4 100644
--- a/tests/functional/restart/35-auto-restart-recovery.t
+++ b/tests/functional/restart/35-auto-restart-recovery.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -21,7 +21,7 @@ require_remote_platform_wsfs
 set_test_number 10
 #-------------------------------------------------------------------------------
 # test the failure recovery mechanism
-BASE_GLOBALRC="
+BASE_GLOBAL_CONFIG="
 [cylc]
     [[main loop]]
         plugins = health check, auto restart
@@ -41,17 +41,17 @@ TEST_DIR="$HOME/cylc-run/" init_suite "${TEST_NAME}" <<< '
     [[graph]]
         R1 = foo
 '
-create_test_globalrc '' "${BASE_GLOBALRC}"
+create_test_global_config '' "${BASE_GLOBAL_CONFIG}"
 run_ok "${TEST_NAME}-suite-start" \
     cylc run "${SUITE_NAME}" --host=localhost --hold
 poll_suite_running
 
 # corrupt suite
-rm "${SUITE_RUN_DIR}/suite.rc"
+rm "${SUITE_RUN_DIR}/flow.cylc"
 
 # condemn localhost
-create_test_globalrc '' "
-${BASE_GLOBALRC}
+create_test_global_config '' "
+${BASE_GLOBAL_CONFIG}
 [suite servers]
     condemned hosts = $(hostname)
 "
diff --git a/tests/functional/restart/37-auto-restart-delay.t b/tests/functional/restart/37-auto-restart-delay.t
index a2e1e3e5a25..d155dc2ebbe 100644
--- a/tests/functional/restart/37-auto-restart-delay.t
+++ b/tests/functional/restart/37-auto-restart-delay.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -27,7 +27,7 @@ parser = TimePointParser()
 sys.exit(not parser.parse('$1') > parser.parse('$2'))
 "
 }
-BASE_GLOBALRC="
+BASE_GLOBAL_CONFIG="
 [cylc]
     [[main loop]]
         plugins = health check, auto restart
@@ -51,8 +51,8 @@ TEST_DIR="$HOME/cylc-run/" init_suite "${TEST_NAME_BASE}" <<< '
 '
 
 MAX_RESTART_DELAY=30
-create_test_globalrc '' "
-${BASE_GLOBALRC}
+create_test_global_config '' "
+${BASE_GLOBAL_CONFIG}
 [suite servers]
     run hosts = localhost
     auto restart delay = PT${MAX_RESTART_DELAY}S
@@ -63,8 +63,8 @@ cylc run "${SUITE_NAME}" --hold
 poll_suite_running
 
 # Condemn host - trigger stop-restart.
-create_test_globalrc '' "
-${BASE_GLOBALRC}
+create_test_global_config '' "
+${BASE_GLOBAL_CONFIG}
 [suite servers]
     run hosts = ${CYLC_TEST_HOST_WSFS}
     condemned hosts = $(hostname)
diff --git a/tests/functional/restart/38-auto-restart-stopping.t b/tests/functional/restart/38-auto-restart-stopping.t
index be480a1d32c..a5ee9879cc5 100644
--- a/tests/functional/restart/38-auto-restart-stopping.t
+++ b/tests/functional/restart/38-auto-restart-stopping.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -22,7 +22,7 @@ set_test_number 2
 if ${CYLC_TEST_DEBUG:-false}; then ERR=2; else ERR=1; fi
 #-------------------------------------------------------------------------------
 # ensure that suites don't get auto stop-restarted if they are already stopping
-BASE_GLOBALRC="
+BASE_GLOBAL_CONFIG="
 [cylc]
     [[main loop]]
         plugins = health check, auto restart
@@ -38,17 +38,17 @@ BASE_GLOBALRC="
 
 TEST_NAME="${TEST_NAME_BASE}"
 
-init_suite "${TEST_NAME}" - <<'__SUITERC__'
+init_suite "${TEST_NAME}" - <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = foo => bar
 [runtime]
     [[foo]]
         script = cylc stop "${CYLC_SUITE_NAME}"; sleep 15
-__SUITERC__
+__FLOW_CONFIG__
 
-create_test_globalrc '' "
-${BASE_GLOBALRC}
+create_test_global_config '' "
+${BASE_GLOBAL_CONFIG}
 "
 
 run_ok "${TEST_NAME}-suite-start" cylc run "${SUITE_NAME}" --host=localhost
@@ -56,8 +56,8 @@ cylc suite-state "${SUITE_NAME}" --task='foo' --status='running' --point=1 \
     --interval=1 --max-polls=20 >& $ERR
 
 # condemn localhost
-create_test_globalrc '' "
-${BASE_GLOBALRC}
+create_test_global_config '' "
+${BASE_GLOBAL_CONFIG}
 [suite servers]
     condemned hosts = $(hostname)
 "
diff --git a/tests/functional/restart/41-auto-restart-local-jobs.t b/tests/functional/restart/41-auto-restart-local-jobs.t
index a7986a34c8d..7723be3021c 100644
--- a/tests/functional/restart/41-auto-restart-local-jobs.t
+++ b/tests/functional/restart/41-auto-restart-local-jobs.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -22,7 +22,7 @@ export CYLC_TEST_HOST1="${HOSTNAME}"
 if ${CYLC_TEST_DEBUG:-false}; then ERR=2; else ERR=1; fi
 set_test_number 11
 
-BASE_GLOBALRC="
+BASE_GLOBAL_CONFIG="
 [cylc]
     [[main loop]]
         plugins = health check, auto restart
@@ -46,8 +46,8 @@ TEST_DIR="$HOME/cylc-run/" init_suite "${TEST_NAME_BASE}" <<< '
         script = sleep 60
 '
 
-create_test_globalrc '' "
-${BASE_GLOBALRC}
+create_test_global_config '' "
+${BASE_GLOBAL_CONFIG}
 [suite servers]
     run hosts = ${CYLC_TEST_HOST1}
 "
@@ -61,8 +61,8 @@ TEST_NAME="${TEST_NAME_BASE}-normal-mode"
 cylc suite-state "${SUITE_NAME}" --task='foo' --status='running' --point=1 \
     --interval=1 --max-polls=20 >& $ERR
 
-create_test_globalrc '' "
-${BASE_GLOBALRC}
+create_test_global_config '' "
+${BASE_GLOBAL_CONFIG}
 [suite servers]
     run hosts = ${CYLC_TEST_HOST1}, ${CYLC_TEST_HOST2}
     condemned hosts = ${CYLC_TEST_HOST1}
@@ -91,8 +91,8 @@ cylc trigger "${SUITE_NAME}" bar.1
 cylc suite-state "${SUITE_NAME}" --task='bar' --status='running' --point=1 \
     --interval=1 --max-polls=20 >& $ERR
 
-create_test_globalrc '' "
-${BASE_GLOBALRC}
+create_test_global_config '' "
+${BASE_GLOBAL_CONFIG}
 [suite servers]
     run hosts = ${CYLC_TEST_HOST1}, ${CYLC_TEST_HOST2}
     condemned hosts = ${CYLC_TEST_HOST2}!
diff --git a/tests/functional/restart/42-auto-restart-ping-pong.t b/tests/functional/restart/42-auto-restart-ping-pong.t
index 1da710aa44c..1433eda4e72 100644
--- a/tests/functional/restart/42-auto-restart-ping-pong.t
+++ b/tests/functional/restart/42-auto-restart-ping-pong.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -22,7 +22,7 @@ require_remote_platform_wsfs
 export CLOWNS="${CYLC_TEST_HOST_WSFS}"
 export JOKERS="${HOSTNAME}"
 
-BASE_GLOBALRC='
+BASE_GLOBAL_CONFIG='
 [cylc]
     [[main loop]]
         plugins = health check, auto restart
@@ -53,8 +53,8 @@ stuck_in_the_middle() {
     # swap the condemned host forcing the suite to jump ship
     local temp="${JOKERS}"
     JOKERS="${CLOWNS}"; CLOWNS="${temp}"
-    create_test_globalrc '' "
-    ${BASE_GLOBALRC}
+    create_test_global_config '' "
+    ${BASE_GLOBAL_CONFIG}
     [suite servers]
         run hosts = ${JOKERS}, ${CLOWNS}
         condemned hosts = ${CLOWNS}
diff --git a/tests/functional/restart/43-auto-restart-force-override-normal.t b/tests/functional/restart/43-auto-restart-force-override-normal.t
index 2c2b5599797..b7b90da1108 100644
--- a/tests/functional/restart/43-auto-restart-force-override-normal.t
+++ b/tests/functional/restart/43-auto-restart-force-override-normal.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -21,7 +21,7 @@ require_remote_platform_wsfs
 export CYLC_TEST_HOST_2="${CYLC_TEST_HOST_WSFS}"
 export CYLC_TEST_HOST_1="${HOSTNAME}"
 
-BASE_GLOBALRC='
+BASE_GLOBAL_CONFIG='
 [cylc]
     [[main loop]]
         plugins = health check, auto restart
@@ -44,8 +44,8 @@ TEST_DIR="$HOME/cylc-run/" init_suite "${TEST_NAME_BASE}" <<< '
         P1Y = foo[-P1Y] => foo
 '
 
-create_test_globalrc '' "
-${BASE_GLOBALRC}
+create_test_global_config '' "
+${BASE_GLOBAL_CONFIG}
 [suite servers]
     run hosts = ${CYLC_TEST_HOST_1}
 "
@@ -59,8 +59,8 @@ sleep 1
 FILE=$(cylc cat-log "${SUITE_NAME}" -m p |xargs readlink -f)
 
 # condemn the host, the suite will schedule restart in PT60S
-create_test_globalrc '' "
-${BASE_GLOBALRC}
+create_test_global_config '' "
+${BASE_GLOBAL_CONFIG}
 [suite servers]
     run hosts = ${CYLC_TEST_HOST_1}, ${CYLC_TEST_HOST_2}
     condemned hosts = ${CYLC_TEST_HOST_1}
@@ -71,8 +71,8 @@ log_scan "${TEST_NAME_BASE}-stop" "${FILE}" 40 1 \
     'Suite will restart in 60s'
 
 # condemn the host in "Force Mode", this should cancel the scheduled restart
-create_test_globalrc '' "
-${BASE_GLOBALRC}
+create_test_global_config '' "
+${BASE_GLOBAL_CONFIG}
 [suite servers]
     condemned hosts = ${CYLC_TEST_HOST_1}!
 "
diff --git a/tests/functional/restart/44-stop-point.t b/tests/functional/restart/44-stop-point.t
index 4c71362b86a..ae5f13b643e 100644
--- a/tests/functional/restart/44-stop-point.t
+++ b/tests/functional/restart/44-stop-point.t
@@ -39,7 +39,7 @@ set_test_number 16
 # Request suite stop right after, should retain stop point == 2021
 # Restart, should run to 2021, reset stop point before stop
 # Restart, should run to final cycle point == 2025
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     UTC mode=True
     cycle point format = %Y
@@ -60,7 +60,7 @@ case "${CYLC_TASK_CYCLE_POINT}" in
     cylc stop "${CYLC_SUITE_NAME}"
     :;;
 2016)
-    sed -i 's/\(final cycle point =\) 2024/\1 2025/' "${CYLC_SUITE_DEF_PATH}/suite.rc"
+    sed -i 's/\(final cycle point =\) 2024/\1 2025/' "${CYLC_SUITE_DEF_PATH}/flow.cylc"
     cylc reload "${CYLC_SUITE_NAME}"
     cylc__job__poll_grep_suite_log "Reload completed"
     :;;
@@ -70,7 +70,7 @@ case "${CYLC_TASK_CYCLE_POINT}" in
     :;;
 esac
 """
-__SUITERC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 
diff --git a/tests/functional/restart/45-stop-task.t b/tests/functional/restart/45-stop-task.t
index c5047656fae..a8b83c02ec7 100644
--- a/tests/functional/restart/45-stop-task.t
+++ b/tests/functional/restart/45-stop-task.t
@@ -36,7 +36,7 @@ set_test_number 10
 # Suite runs to stop task t5.1, reset stop task.
 # Restart
 # Suite stops normally at t8.1
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     [[parameters]]
         i = 1..8
@@ -54,7 +54,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
         script = cylc stop "${CYLC_SUITE_NAME}" 't_i5.1'
     [[t<i=2>]]
         script = cylc stop "${CYLC_SUITE_NAME}"
-__SUITERC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 
diff --git a/tests/functional/restart/48-enable-auto-stop.t b/tests/functional/restart/48-enable-auto-stop.t
index 55d2895a3e4..9f214dfc6c2 100644
--- a/tests/functional/restart/48-enable-auto-stop.t
+++ b/tests/functional/restart/48-enable-auto-stop.t
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
-# Test restart with override to reverse no auto shutdown setting in suite.rc
+# Test restart with override to reverse no auto shutdown setting in flow.cylc
 
 . "$(dirname "$0")/test_header"
 
@@ -35,7 +35,7 @@ set_test_number 8
 # At t2.1, stop suite
 # Restart, should retain auto shutdown enabled option
 # Suite runs to final task and shuts down normally
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     disable automatic shutdown = True
     [[parameters]]
@@ -52,7 +52,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
         script = true
     [[t<i=2>]]
         script = cylc stop "${CYLC_SUITE_NAME}"
-__SUITERC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 
diff --git a/tests/functional/restart/49-enable-auto-stop-2.t b/tests/functional/restart/49-enable-auto-stop-2.t
index a71f52961c3..55879569d6e 100644
--- a/tests/functional/restart/49-enable-auto-stop-2.t
+++ b/tests/functional/restart/49-enable-auto-stop-2.t
@@ -34,7 +34,7 @@ set_test_number 8
 # At t2.1, stop suite
 # Restart with auto shutdown enabled, should override original
 # Suite runs to final task and shuts down normally
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     [[parameters]]
         i = 1..5
@@ -50,7 +50,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
         script = true
     [[t<i=2>]]
         script = cylc stop "${CYLC_SUITE_NAME}"
-__SUITERC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 
diff --git a/tests/functional/restart/50-ignore-stop-point.t b/tests/functional/restart/50-ignore-stop-point.t
index ccd4b779c41..bdfc0b6104a 100644
--- a/tests/functional/restart/50-ignore-stop-point.t
+++ b/tests/functional/restart/50-ignore-stop-point.t
@@ -33,7 +33,7 @@ set_test_number 7
 # Request suite stop while at 2015
 # Restart, ignoring stop point
 # Suite runs to final cycle point == 2020
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     UTC mode=True
     cycle point format = %Y
@@ -55,7 +55,7 @@ case "${CYLC_TASK_CYCLE_POINT}" in
     :;;
 esac
 """
-__SUITERC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 
diff --git a/tests/functional/restart/51-ignore-final-point.t b/tests/functional/restart/51-ignore-final-point.t
index d4ec6137940..2cbb48ba1d5 100644
--- a/tests/functional/restart/51-ignore-final-point.t
+++ b/tests/functional/restart/51-ignore-final-point.t
@@ -37,7 +37,7 @@ set_test_number 13
 # Suite stop immediately
 # Restart, ignore final cycle point
 # Suite runs to final cycle point == 2020
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     UTC mode=True
     cycle point format = %Y
@@ -59,7 +59,7 @@ case "${CYLC_TASK_CYCLE_POINT}" in
     :;;
 esac
 """
-__SUITERC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 
diff --git a/tests/functional/restart/bad-job-host/suite.rc b/tests/functional/restart/bad-job-host/flow.cylc
similarity index 100%
rename from tests/functional/restart/bad-job-host/suite.rc
rename to tests/functional/restart/bad-job-host/flow.cylc
diff --git a/tests/functional/restart/bad-state/suite.rc b/tests/functional/restart/bad-state/flow.cylc
similarity index 100%
rename from tests/functional/restart/bad-state/suite.rc
rename to tests/functional/restart/bad-state/flow.cylc
diff --git a/tests/functional/restart/broadcast/suite.rc b/tests/functional/restart/broadcast/flow.cylc
similarity index 96%
rename from tests/functional/restart/broadcast/suite.rc
rename to tests/functional/restart/broadcast/flow.cylc
index 4125967644d..89cf23ad8bc 100644
--- a/tests/functional/restart/broadcast/suite.rc
+++ b/tests/functional/restart/broadcast/flow.cylc
@@ -36,4 +36,4 @@
             description = "Broadcast-recipient task (runs after restart)"
         [[[environment]]]
             MY_VALUE=nothing
-{% include 'suite-runtime-restart.rc' %}
+{% include 'flow-runtime-restart.cylc' %}
diff --git a/tests/functional/restart/deleted-logs/suite.rc b/tests/functional/restart/deleted-logs/flow.cylc
similarity index 100%
rename from tests/functional/restart/deleted-logs/suite.rc
rename to tests/functional/restart/deleted-logs/flow.cylc
diff --git a/tests/functional/restart/failed/suite.rc b/tests/functional/restart/failed/flow.cylc
similarity index 93%
rename from tests/functional/restart/failed/suite.rc
rename to tests/functional/restart/failed/flow.cylc
index aa1916e2025..c2c3bcd249e 100644
--- a/tests/functional/restart/failed/suite.rc
+++ b/tests/functional/restart/failed/flow.cylc
@@ -22,4 +22,4 @@
         """
         [[[meta]]]
             description = "Failed task (runs before restart)"
-{% include 'suite-runtime-restart.rc' %}
+{% include 'flow-runtime-restart.cylc' %}
diff --git a/tests/functional/restart/lib/suite-runtime-restart.rc b/tests/functional/restart/lib/flow-runtime-restart.cylc
similarity index 100%
rename from tests/functional/restart/lib/suite-runtime-restart.rc
rename to tests/functional/restart/lib/flow-runtime-restart.cylc
diff --git a/tests/functional/restart/pre-init-2/suite.rc b/tests/functional/restart/pre-init-2/flow.cylc
similarity index 100%
rename from tests/functional/restart/pre-init-2/suite.rc
rename to tests/functional/restart/pre-init-2/flow.cylc
diff --git a/tests/functional/restart/reload/suite.rc b/tests/functional/restart/reload/flow.cylc
similarity index 100%
rename from tests/functional/restart/reload/suite.rc
rename to tests/functional/restart/reload/flow.cylc
diff --git a/tests/functional/restart/submit-failed/suite.rc b/tests/functional/restart/submit-failed/flow.cylc
similarity index 95%
rename from tests/functional/restart/submit-failed/suite.rc
rename to tests/functional/restart/submit-failed/flow.cylc
index 43343ac5106..e90e903b9db 100644
--- a/tests/functional/restart/submit-failed/suite.rc
+++ b/tests/functional/restart/submit-failed/flow.cylc
@@ -28,4 +28,4 @@
           script = """
  cylc remove ${CYLC_SUITE_NAME} submit_failed_task.${CYLC_TASK_CYCLE_POINT}
                    """
-{% include 'suite-runtime-restart.rc' %}
+{% include 'flow-runtime-restart.cylc' %}
diff --git a/tests/functional/restart/succeeded/suite.rc b/tests/functional/restart/succeeded/flow.cylc
similarity index 92%
rename from tests/functional/restart/succeeded/suite.rc
rename to tests/functional/restart/succeeded/flow.cylc
index e443dff503c..0b520f56b16 100644
--- a/tests/functional/restart/succeeded/suite.rc
+++ b/tests/functional/restart/succeeded/flow.cylc
@@ -19,4 +19,4 @@
         script = true
         [[[meta]]]
             description = "Succeeded task (runs before restart)"
-{% include 'suite-runtime-restart.rc' %}
+{% include 'flow-runtime-restart.cylc' %}
diff --git a/tests/functional/restart/waiting/suite.rc b/tests/functional/restart/waiting/flow.cylc
similarity index 92%
rename from tests/functional/restart/waiting/suite.rc
rename to tests/functional/restart/waiting/flow.cylc
index aed2f99f836..df692657f2d 100644
--- a/tests/functional/restart/waiting/suite.rc
+++ b/tests/functional/restart/waiting/flow.cylc
@@ -18,4 +18,4 @@
         script = true
         [[[meta]]]
             description = "Waiting task (runs after restart)"
-{% include 'suite-runtime-restart.rc' %}
+{% include 'flow-runtime-restart.cylc' %}
diff --git a/tests/functional/retries/01-submission-retry.t b/tests/functional/retries/01-submission-retry.t
index 88a789b1b70..030dcbd8788 100644
--- a/tests/functional/retries/01-submission-retry.t
+++ b/tests/functional/retries/01-submission-retry.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -19,7 +19,7 @@
 . "$(dirname "$0")/test_header"
 set_test_number 3
 install_suite "${TEST_NAME_BASE}" 'submission'
-create_test_globalrc "" "
+create_test_global_config "" "
 [platforms]
 [[nonsense-platform]]
 hosts = notahost
diff --git a/tests/functional/retries/execution/suite.rc b/tests/functional/retries/execution/flow.cylc
similarity index 100%
rename from tests/functional/retries/execution/suite.rc
rename to tests/functional/retries/execution/flow.cylc
diff --git a/tests/functional/retries/submission/suite.rc b/tests/functional/retries/submission/flow.cylc
similarity index 100%
rename from tests/functional/retries/submission/suite.rc
rename to tests/functional/retries/submission/flow.cylc
diff --git a/tests/functional/rnd/01-editors.t b/tests/functional/rnd/01-editors.t
index d9dd2e59eb9..2b9a4c5ab86 100644
--- a/tests/functional/rnd/01-editors.t
+++ b/tests/functional/rnd/01-editors.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -44,7 +44,7 @@ __HERE__
 TEST_NAME="$TEST_NAME_BASE-config-override"
 export EDITOR=editor
 export GEDITOR=geditor
-create_test_globalrc '' '
+create_test_global_config '' '
 [editors]
     terminal = myeditor
     gui = mygeditor
diff --git a/tests/functional/rnd/02-lib-python-in-job/suite.rc b/tests/functional/rnd/02-lib-python-in-job/flow.cylc
similarity index 100%
rename from tests/functional/rnd/02-lib-python-in-job/suite.rc
rename to tests/functional/rnd/02-lib-python-in-job/flow.cylc
diff --git a/tests/functional/runahead/default-complex/suite.rc b/tests/functional/runahead/default-complex/flow.cylc
similarity index 100%
rename from tests/functional/runahead/default-complex/suite.rc
rename to tests/functional/runahead/default-complex/flow.cylc
diff --git a/tests/functional/runahead/default-future/suite.rc b/tests/functional/runahead/default-future/flow.cylc
similarity index 100%
rename from tests/functional/runahead/default-future/suite.rc
rename to tests/functional/runahead/default-future/flow.cylc
diff --git a/tests/functional/runahead/default-simple/suite.rc b/tests/functional/runahead/default-simple/flow.cylc
similarity index 100%
rename from tests/functional/runahead/default-simple/suite.rc
rename to tests/functional/runahead/default-simple/flow.cylc
diff --git a/tests/functional/runahead/no_final/suite.rc b/tests/functional/runahead/no_final/flow.cylc
similarity index 100%
rename from tests/functional/runahead/no_final/suite.rc
rename to tests/functional/runahead/no_final/flow.cylc
diff --git a/tests/functional/runahead/release-update/suite.rc b/tests/functional/runahead/release-update/flow.cylc
similarity index 100%
rename from tests/functional/runahead/release-update/suite.rc
rename to tests/functional/runahead/release-update/flow.cylc
diff --git a/tests/functional/runahead/runahead/suite.rc b/tests/functional/runahead/runahead/flow.cylc
similarity index 100%
rename from tests/functional/runahead/runahead/suite.rc
rename to tests/functional/runahead/runahead/flow.cylc
diff --git a/tests/functional/shutdown/00-cycle/suite.rc b/tests/functional/shutdown/00-cycle/flow.cylc
similarity index 100%
rename from tests/functional/shutdown/00-cycle/suite.rc
rename to tests/functional/shutdown/00-cycle/flow.cylc
diff --git a/tests/functional/shutdown/01-task/suite.rc b/tests/functional/shutdown/01-task/flow.cylc
similarity index 100%
rename from tests/functional/shutdown/01-task/suite.rc
rename to tests/functional/shutdown/01-task/flow.cylc
diff --git a/tests/functional/shutdown/03-bad-cycle/suite.rc b/tests/functional/shutdown/03-bad-cycle/flow.cylc
similarity index 100%
rename from tests/functional/shutdown/03-bad-cycle/suite.rc
rename to tests/functional/shutdown/03-bad-cycle/flow.cylc
diff --git a/tests/functional/shutdown/04-kill/suite.rc b/tests/functional/shutdown/04-kill/flow.cylc
similarity index 100%
rename from tests/functional/shutdown/04-kill/suite.rc
rename to tests/functional/shutdown/04-kill/flow.cylc
diff --git a/tests/functional/shutdown/05-auto.t b/tests/functional/shutdown/05-auto.t
index 6d7def003b7..d26b8e32ed4 100755
--- a/tests/functional/shutdown/05-auto.t
+++ b/tests/functional/shutdown/05-auto.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -38,7 +38,7 @@ run_ok "${TEST_NAME}" cylc ping "${SUITE_NAME}"
 TEST_NAME=${TEST_NAME_BASE}-stop
 run_ok "${TEST_NAME}" cylc stop --max-polls=10 --interval=2 "${SUITE_NAME}"
 #-------------------------------------------------------------------------------
-# Test that auto-shutdown can be disabled (suite.rc)
+# Test that auto-shutdown can be disabled (flow.cylc)
 export SUITE_DISABLE_AUTO_SHUTDOWN=true
 TEST_NAME=${TEST_NAME_BASE}-no-autostop-ping-2
 cylc run "${SUITE_NAME}"
diff --git a/tests/functional/shutdown/05-auto/suite.rc b/tests/functional/shutdown/05-auto/flow.cylc
similarity index 100%
rename from tests/functional/shutdown/05-auto/suite.rc
rename to tests/functional/shutdown/05-auto/flow.cylc
diff --git a/tests/functional/shutdown/06-kill-fail/suite.rc b/tests/functional/shutdown/06-kill-fail/flow.cylc
similarity index 100%
rename from tests/functional/shutdown/06-kill-fail/suite.rc
rename to tests/functional/shutdown/06-kill-fail/flow.cylc
diff --git a/tests/functional/shutdown/07-task-fail/suite.rc b/tests/functional/shutdown/07-task-fail/flow.cylc
similarity index 100%
rename from tests/functional/shutdown/07-task-fail/suite.rc
rename to tests/functional/shutdown/07-task-fail/flow.cylc
diff --git a/tests/functional/shutdown/08-now1/suite.rc b/tests/functional/shutdown/08-now1/flow.cylc
similarity index 100%
rename from tests/functional/shutdown/08-now1/suite.rc
rename to tests/functional/shutdown/08-now1/flow.cylc
diff --git a/tests/functional/shutdown/09-now2/suite.rc b/tests/functional/shutdown/09-now2/flow.cylc
similarity index 100%
rename from tests/functional/shutdown/09-now2/suite.rc
rename to tests/functional/shutdown/09-now2/flow.cylc
diff --git a/tests/functional/shutdown/12-bad-port-file-check.t b/tests/functional/shutdown/12-bad-port-file-check.t
index edbdb4cec74..f0690a00a82 100755
--- a/tests/functional/shutdown/12-bad-port-file-check.t
+++ b/tests/functional/shutdown/12-bad-port-file-check.t
@@ -22,7 +22,7 @@ set_test_number 3
 
 OPT_SET=
 if [[ "${TEST_NAME_BASE}" == *-globalcfg ]]; then
-    create_test_globalrc "" "
+    create_test_global_config "" "
 [cylc]
     [[main loop]]
         [[[health check]]]
diff --git a/tests/functional/shutdown/12-bad-port-file-check/suite.rc b/tests/functional/shutdown/12-bad-port-file-check/flow.cylc
similarity index 100%
rename from tests/functional/shutdown/12-bad-port-file-check/suite.rc
rename to tests/functional/shutdown/12-bad-port-file-check/flow.cylc
diff --git a/tests/functional/shutdown/13-no-port-file-check.t b/tests/functional/shutdown/13-no-port-file-check.t
index 4e4084918ad..b1e83ce4a93 100755
--- a/tests/functional/shutdown/13-no-port-file-check.t
+++ b/tests/functional/shutdown/13-no-port-file-check.t
@@ -21,7 +21,7 @@
 set_test_number 3
 
 OPT_SET=
-create_test_globalrc "" "
+create_test_global_config "" "
 [cylc]
     [[main loop]]
         # plugins = health check
diff --git a/tests/functional/shutdown/13-no-port-file-check/suite.rc b/tests/functional/shutdown/13-no-port-file-check/flow.cylc
similarity index 100%
rename from tests/functional/shutdown/13-no-port-file-check/suite.rc
rename to tests/functional/shutdown/13-no-port-file-check/flow.cylc
diff --git a/tests/functional/shutdown/14-no-dir-check.t b/tests/functional/shutdown/14-no-dir-check.t
index 925db57c54a..922aa897fb7 100755
--- a/tests/functional/shutdown/14-no-dir-check.t
+++ b/tests/functional/shutdown/14-no-dir-check.t
@@ -20,7 +20,7 @@
 set_test_number 3
 install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 
-create_test_globalrc "" "
+create_test_global_config "" "
 [cylc]
     [[main loop]]
         [[[health check]]]
diff --git a/tests/functional/shutdown/14-no-dir-check/suite.rc b/tests/functional/shutdown/14-no-dir-check/flow.cylc
similarity index 100%
rename from tests/functional/shutdown/14-no-dir-check/suite.rc
rename to tests/functional/shutdown/14-no-dir-check/flow.cylc
diff --git a/tests/functional/shutdown/18-client-on-dead-suite.t b/tests/functional/shutdown/18-client-on-dead-suite.t
index 0410cf7a2d9..42f23fc7fbd 100755
--- a/tests/functional/shutdown/18-client-on-dead-suite.t
+++ b/tests/functional/shutdown/18-client-on-dead-suite.t
@@ -19,7 +19,7 @@
 # And correct behaviour with client on the next 2 connection attempts.
 . "$(dirname "$0")/test_header"
 set_test_number 3
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     [[events]]
         abort on stalled = True
@@ -31,7 +31,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
 [runtime]
     [[t1]]
         script = true
-__SUITERC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
 cylc run --hold --no-detach "${SUITE_NAME}" 1>'cylc-run.out' 2>&1 &
diff --git a/tests/functional/shutdown/19-log-reference.t b/tests/functional/shutdown/19-log-reference.t
index 9c3f8aba0ed..db5bdec393e 100755
--- a/tests/functional/shutdown/19-log-reference.t
+++ b/tests/functional/shutdown/19-log-reference.t
@@ -21,7 +21,7 @@
 #-------------------------------------------------------------------------------
 set_test_number 3
 #-------------------------------------------------------------------------------
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     [[events]]
         abort on inactivity = True
@@ -32,7 +32,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
 [runtime]
     [[t1]]
         script = true
-__SUITERC__
+__FLOW_CONFIG__
 #-------------------------------------------------------------------------------
 suite_run_ok "${TEST_NAME_BASE}-run-reflog" \
     cylc run --debug --no-detach --reference-log "${SUITE_NAME}"
diff --git a/tests/functional/spawn-on-demand/00-no-reflow/suite.rc b/tests/functional/spawn-on-demand/00-no-reflow/flow.cylc
similarity index 100%
rename from tests/functional/spawn-on-demand/00-no-reflow/suite.rc
rename to tests/functional/spawn-on-demand/00-no-reflow/flow.cylc
diff --git a/tests/functional/spawn-on-demand/01-reflow/suite.rc b/tests/functional/spawn-on-demand/01-reflow/flow.cylc
similarity index 100%
rename from tests/functional/spawn-on-demand/01-reflow/suite.rc
rename to tests/functional/spawn-on-demand/01-reflow/flow.cylc
diff --git a/tests/functional/spawn-on-demand/02-merge.t b/tests/functional/spawn-on-demand/02-merge.t
index 51d2c66e6b1..4cdcabcadf6 100644
--- a/tests/functional/spawn-on-demand/02-merge.t
+++ b/tests/functional/spawn-on-demand/02-merge.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -29,7 +29,7 @@ TEST_NAME="${TEST_NAME_BASE}"-validate
 run_ok "${TEST_NAME}" cylc validate "${SUITE_NAME}"
 
 # Set frequent pruning of merged flow labels.
-create_test_globalrc "" "
+create_test_global_config "" "
 [cylc]
    [[main loop]]
        [[[prune flow labels]]]
diff --git a/tests/functional/spawn-on-demand/02-merge/suite.rc b/tests/functional/spawn-on-demand/02-merge/flow.cylc
similarity index 100%
rename from tests/functional/spawn-on-demand/02-merge/suite.rc
rename to tests/functional/spawn-on-demand/02-merge/flow.cylc
diff --git a/tests/functional/spawn-on-demand/03-conditional/suite.rc b/tests/functional/spawn-on-demand/03-conditional/flow.cylc
similarity index 100%
rename from tests/functional/spawn-on-demand/03-conditional/suite.rc
rename to tests/functional/spawn-on-demand/03-conditional/flow.cylc
diff --git a/tests/functional/spawn-on-demand/04-branch/suite.rc b/tests/functional/spawn-on-demand/04-branch/flow.cylc
similarity index 100%
rename from tests/functional/spawn-on-demand/04-branch/suite.rc
rename to tests/functional/spawn-on-demand/04-branch/flow.cylc
diff --git a/tests/functional/spawn-on-demand/05-stop-flow/suite.rc b/tests/functional/spawn-on-demand/05-stop-flow/flow.cylc
similarity index 100%
rename from tests/functional/spawn-on-demand/05-stop-flow/suite.rc
rename to tests/functional/spawn-on-demand/05-stop-flow/flow.cylc
diff --git a/tests/functional/spawn-on-demand/06-stop-flow-2/suite.rc b/tests/functional/spawn-on-demand/06-stop-flow-2/flow.cylc
similarity index 100%
rename from tests/functional/spawn-on-demand/06-stop-flow-2/suite.rc
rename to tests/functional/spawn-on-demand/06-stop-flow-2/flow.cylc
diff --git a/tests/functional/spawn-on-demand/07-abs-triggers/suite.rc b/tests/functional/spawn-on-demand/07-abs-triggers/flow.cylc
similarity index 100%
rename from tests/functional/spawn-on-demand/07-abs-triggers/suite.rc
rename to tests/functional/spawn-on-demand/07-abs-triggers/flow.cylc
diff --git a/tests/functional/special/00-sequential/suite.rc b/tests/functional/special/00-sequential/flow.cylc
similarity index 100%
rename from tests/functional/special/00-sequential/suite.rc
rename to tests/functional/special/00-sequential/flow.cylc
diff --git a/tests/functional/special/02-exclude/suite.rc b/tests/functional/special/02-exclude/flow.cylc
similarity index 100%
rename from tests/functional/special/02-exclude/suite.rc
rename to tests/functional/special/02-exclude/flow.cylc
diff --git a/tests/functional/special/03-include/suite.rc b/tests/functional/special/03-include/flow.cylc
similarity index 100%
rename from tests/functional/special/03-include/suite.rc
rename to tests/functional/special/03-include/flow.cylc
diff --git a/tests/functional/special/clock-360/suite.rc b/tests/functional/special/clock-360/flow.cylc
similarity index 100%
rename from tests/functional/special/clock-360/suite.rc
rename to tests/functional/special/clock-360/flow.cylc
diff --git a/tests/functional/startup/00-state-summary/suite.rc b/tests/functional/startup/00-state-summary/flow.cylc
similarity index 100%
rename from tests/functional/startup/00-state-summary/suite.rc
rename to tests/functional/startup/00-state-summary/flow.cylc
diff --git a/tests/functional/startup/01-log-suiterc.t b/tests/functional/startup/01-log-flow-config.t
similarity index 79%
rename from tests/functional/startup/01-log-suiterc.t
rename to tests/functional/startup/01-log-flow-config.t
index 9e5a8d748ac..0b556aebaed 100644
--- a/tests/functional/startup/01-log-suiterc.t
+++ b/tests/functional/startup/01-log-flow-config.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -15,11 +15,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
-# Test "log/suiterc/*-<mode>.rc" files that are generated on suite start up.
+# Test "log/flow-config/*-<mode>.cylc" files that are generated on suite start up.
 . "$(dirname "$0")/test_header"
 set_test_number 9
 
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 #!Jinja2
 [meta]
     title = a suite that logs run, reload, and restart configs
@@ -35,7 +35,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
         script = cylc reload "${CYLC_SUITE_NAME}"
     [[whatever]]
         script = true
-__SUITERC__
+__FLOW_CONFIG__
 
 run_ok "${TEST_NAME_BASE}-val-1" cylc validate "${SUITE_NAME}"
 run_ok "${TEST_NAME_BASE}-val-2" \
@@ -45,22 +45,22 @@ suite_run_ok "${TEST_NAME_BASE}-run" cylc run --no-detach "${SUITE_NAME}"
 suite_run_ok "${TEST_NAME_BASE}-restart" \
     cylc restart --set 'WEATHER=good' --no-detach "${SUITE_NAME}"
 
-# Check for 3 generated *.rc files
-LOGD="$RUN_DIR/${SUITE_NAME}/log/suiterc"
+# Check for 3 generated *.cylc files
+LOGD="${RUN_DIR}/${SUITE_NAME}/log/flow-config"
 # shellcheck disable=SC2012
 ls "${LOGD}" | sed -e 's/.*-//g' | sort >'ls.out'
 cmp_ok 'ls.out' <<'__OUT__'
-reload.rc
-restart.rc
-run.rc
+reload.cylc
+restart.cylc
+run.cylc
 __OUT__
 
-LOGD="$RUN_DIR/${SUITE_NAME}/log/suiterc"
-RUN_RC="$(ls "${LOGD}/"*-run.rc)"
-REL_RC="$(ls "${LOGD}/"*-reload.rc)"
-RES_RC="$(ls "${LOGD}/"*-restart.rc)"
-# The generated *-run.rc and *-reload.rc should be identical
-# The generated *.rc files should validate
+LOGD="${RUN_DIR}/${SUITE_NAME}/log/flow-config"
+RUN_RC="$(ls "${LOGD}/"*-run.cylc)"
+REL_RC="$(ls "${LOGD}/"*-reload.cylc)"
+RES_RC="$(ls "${LOGD}/"*-restart.cylc)"
+# The generated *-run.cylc and *-reload.cylc should be identical
+# The generated *.cylc files should validate
 cmp_ok "${RUN_RC}" "${REL_RC}"
 run_ok "${TEST_NAME_BASE}-validate-run-rc" cylc validate "${RUN_RC}"
 run_ok "${TEST_NAME_BASE}-validate-restart-rc" cylc validate "${RES_RC}"
diff --git a/tests/functional/suite-host-self-id/00-address.t b/tests/functional/suite-host-self-id/00-address.t
index 5ccf51bfc07..e877090fde5 100644
--- a/tests/functional/suite-host-self-id/00-address.t
+++ b/tests/functional/suite-host-self-id/00-address.t
@@ -37,7 +37,7 @@ MY_HOST_IP="$(get_local_ip_address "${MY_INET_TARGET}")"
 run_ok "${TEST_NAME_BASE}-validate" \
     cylc validate "${SUITE_NAME}" "--set=MY_HOST_IP=${MY_HOST_IP}"
 
-create_test_globalrc '' '
+create_test_global_config '' '
 [suite host self-identification]
     method = address'
 suite_run_ok "${TEST_NAME_BASE}-run" \
diff --git a/tests/functional/suite-host-self-id/00-address/suite.rc b/tests/functional/suite-host-self-id/00-address/flow.cylc
similarity index 100%
rename from tests/functional/suite-host-self-id/00-address/suite.rc
rename to tests/functional/suite-host-self-id/00-address/flow.cylc
diff --git a/tests/functional/suite-state/02-validate-blank-command-scripting/suite.rc b/tests/functional/suite-state/02-validate-blank-command-scripting/flow.cylc
similarity index 100%
rename from tests/functional/suite-state/02-validate-blank-command-scripting/suite.rc
rename to tests/functional/suite-state/02-validate-blank-command-scripting/flow.cylc
diff --git a/tests/functional/suite-state/06-format.t b/tests/functional/suite-state/06-format.t
index bf69f5e1def..c6e4bae91e5 100755
--- a/tests/functional/suite-state/06-format.t
+++ b/tests/functional/suite-state/06-format.t
@@ -21,7 +21,7 @@
 #-------------------------------------------------------------------------------
 set_test_number 5
 #-------------------------------------------------------------------------------
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     UTC mode = True
     cycle point format = CCYY-MM-DD
@@ -32,7 +32,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
 [runtime]
     [[foo]]
         script = true
-__SUITERC__
+__FLOW_CONFIG__
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-run"
 suite_run_ok "${TEST_NAME}" cylc run --debug --no-detach "${SUITE_NAME}"
diff --git a/tests/functional/suite-state/06a-noformat.t b/tests/functional/suite-state/06a-noformat.t
index de6f6f97bc2..91647c68dda 100755
--- a/tests/functional/suite-state/06a-noformat.t
+++ b/tests/functional/suite-state/06a-noformat.t
@@ -22,7 +22,7 @@
 #-------------------------------------------------------------------------------
 set_test_number 5
 #-------------------------------------------------------------------------------
-init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
+init_suite "${TEST_NAME_BASE}" <<'__FLOW_CONFIG__'
 [cylc]
     UTC mode = True
     # (Use default cycle point format)
@@ -33,7 +33,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITERC__'
 [runtime]
     [[foo]]
         script = true
-__SUITERC__
+__FLOW_CONFIG__
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-run"
 suite_run_ok "${TEST_NAME}" cylc run --debug --no-detach "${SUITE_NAME}"
diff --git a/tests/functional/suite-state/07-message2/suite.rc b/tests/functional/suite-state/07-message2/flow.cylc
similarity index 100%
rename from tests/functional/suite-state/07-message2/suite.rc
rename to tests/functional/suite-state/07-message2/flow.cylc
diff --git a/tests/functional/suite-state/message/suite.rc b/tests/functional/suite-state/message/flow.cylc
similarity index 100%
rename from tests/functional/suite-state/message/suite.rc
rename to tests/functional/suite-state/message/flow.cylc
diff --git a/tests/functional/suite-state/options/suite.rc b/tests/functional/suite-state/options/flow.cylc
similarity index 100%
rename from tests/functional/suite-state/options/suite.rc
rename to tests/functional/suite-state/options/flow.cylc
diff --git a/tests/functional/suite-state/polling/suite.rc b/tests/functional/suite-state/polling/flow.cylc
similarity index 100%
rename from tests/functional/suite-state/polling/suite.rc
rename to tests/functional/suite-state/polling/flow.cylc
diff --git a/tests/functional/suite-state/template/suite.rc b/tests/functional/suite-state/template/flow.cylc
similarity index 100%
rename from tests/functional/suite-state/template/suite.rc
rename to tests/functional/suite-state/template/flow.cylc
diff --git a/tests/functional/suite-state/template_ref/suite.rc b/tests/functional/suite-state/template_ref/flow.cylc
similarity index 100%
rename from tests/functional/suite-state/template_ref/suite.rc
rename to tests/functional/suite-state/template_ref/flow.cylc
diff --git a/tests/functional/suite-state/upstream/suite.rc b/tests/functional/suite-state/upstream/flow.cylc
similarity index 100%
rename from tests/functional/suite-state/upstream/suite.rc
rename to tests/functional/suite-state/upstream/flow.cylc
diff --git a/tests/functional/task-name/00-basic/suite.rc b/tests/functional/task-name/00-basic/flow.cylc
similarity index 100%
rename from tests/functional/task-name/00-basic/suite.rc
rename to tests/functional/task-name/00-basic/flow.cylc
diff --git a/tests/functional/triggering/00-recovery/suite.rc b/tests/functional/triggering/00-recovery/flow.cylc
similarity index 100%
rename from tests/functional/triggering/00-recovery/suite.rc
rename to tests/functional/triggering/00-recovery/flow.cylc
diff --git a/tests/functional/triggering/01-or-conditional/suite.rc b/tests/functional/triggering/01-or-conditional/flow.cylc
similarity index 100%
rename from tests/functional/triggering/01-or-conditional/suite.rc
rename to tests/functional/triggering/01-or-conditional/flow.cylc
diff --git a/tests/functional/triggering/02-fam-start-all/suite.rc b/tests/functional/triggering/02-fam-start-all/flow.cylc
similarity index 100%
rename from tests/functional/triggering/02-fam-start-all/suite.rc
rename to tests/functional/triggering/02-fam-start-all/flow.cylc
diff --git a/tests/functional/triggering/03-fam-succeed-all/suite.rc b/tests/functional/triggering/03-fam-succeed-all/flow.cylc
similarity index 100%
rename from tests/functional/triggering/03-fam-succeed-all/suite.rc
rename to tests/functional/triggering/03-fam-succeed-all/flow.cylc
diff --git a/tests/functional/triggering/04-fam-fail-all/suite.rc b/tests/functional/triggering/04-fam-fail-all/flow.cylc
similarity index 100%
rename from tests/functional/triggering/04-fam-fail-all/suite.rc
rename to tests/functional/triggering/04-fam-fail-all/flow.cylc
diff --git a/tests/functional/triggering/05-fam-finish-all/suite.rc b/tests/functional/triggering/05-fam-finish-all/flow.cylc
similarity index 100%
rename from tests/functional/triggering/05-fam-finish-all/suite.rc
rename to tests/functional/triggering/05-fam-finish-all/flow.cylc
diff --git a/tests/functional/triggering/06-fam-succeed-any/suite.rc b/tests/functional/triggering/06-fam-succeed-any/flow.cylc
similarity index 100%
rename from tests/functional/triggering/06-fam-succeed-any/suite.rc
rename to tests/functional/triggering/06-fam-succeed-any/flow.cylc
diff --git a/tests/functional/triggering/07-fam-fail-any/suite.rc b/tests/functional/triggering/07-fam-fail-any/flow.cylc
similarity index 100%
rename from tests/functional/triggering/07-fam-fail-any/suite.rc
rename to tests/functional/triggering/07-fam-fail-any/flow.cylc
diff --git a/tests/functional/triggering/08-fam-finish-any/suite.rc b/tests/functional/triggering/08-fam-finish-any/flow.cylc
similarity index 100%
rename from tests/functional/triggering/08-fam-finish-any/suite.rc
rename to tests/functional/triggering/08-fam-finish-any/flow.cylc
diff --git a/tests/functional/triggering/09-fail/suite.rc b/tests/functional/triggering/09-fail/flow.cylc
similarity index 100%
rename from tests/functional/triggering/09-fail/suite.rc
rename to tests/functional/triggering/09-fail/flow.cylc
diff --git a/tests/functional/triggering/10-finish/suite.rc b/tests/functional/triggering/10-finish/flow.cylc
similarity index 100%
rename from tests/functional/triggering/10-finish/suite.rc
rename to tests/functional/triggering/10-finish/flow.cylc
diff --git a/tests/functional/triggering/11-start/suite.rc b/tests/functional/triggering/11-start/flow.cylc
similarity index 100%
rename from tests/functional/triggering/11-start/suite.rc
rename to tests/functional/triggering/11-start/flow.cylc
diff --git a/tests/functional/triggering/12-succeed/suite.rc b/tests/functional/triggering/12-succeed/flow.cylc
similarity index 100%
rename from tests/functional/triggering/12-succeed/suite.rc
rename to tests/functional/triggering/12-succeed/flow.cylc
diff --git a/tests/functional/triggering/13-submit/suite.rc b/tests/functional/triggering/13-submit/flow.cylc
similarity index 100%
rename from tests/functional/triggering/13-submit/suite.rc
rename to tests/functional/triggering/13-submit/flow.cylc
diff --git a/tests/functional/triggering/14-submit-fail.t b/tests/functional/triggering/14-submit-fail.t
index 042523e0ae8..bed5b07c165 100644
--- a/tests/functional/triggering/14-submit-fail.t
+++ b/tests/functional/triggering/14-submit-fail.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -18,7 +18,7 @@
 # Test submit-fail triggering
 . "$(dirname "$0")/test_header"
 set_test_number 2
-create_test_globalrc '' '
+create_test_global_config '' '
 [platforms]
     [[idontexist]]
 '
diff --git a/tests/functional/triggering/14-submit-fail/suite.rc b/tests/functional/triggering/14-submit-fail/flow.cylc
similarity index 100%
rename from tests/functional/triggering/14-submit-fail/suite.rc
rename to tests/functional/triggering/14-submit-fail/flow.cylc
diff --git a/tests/functional/triggering/15-suicide/suite.rc b/tests/functional/triggering/15-suicide/flow.cylc
similarity index 100%
rename from tests/functional/triggering/15-suicide/suite.rc
rename to tests/functional/triggering/15-suicide/flow.cylc
diff --git a/tests/functional/triggering/17-suicide-multi/suite.rc b/tests/functional/triggering/17-suicide-multi/flow.cylc
similarity index 100%
rename from tests/functional/triggering/17-suicide-multi/suite.rc
rename to tests/functional/triggering/17-suicide-multi/flow.cylc
diff --git a/tests/functional/triggering/19-and-suicide/suite.rc b/tests/functional/triggering/19-and-suicide/flow.cylc
similarity index 100%
rename from tests/functional/triggering/19-and-suicide/suite.rc
rename to tests/functional/triggering/19-and-suicide/flow.cylc
diff --git a/tests/functional/triggering/20-and-outputs-suicide/suite.rc b/tests/functional/triggering/20-and-outputs-suicide/flow.cylc
similarity index 100%
rename from tests/functional/triggering/20-and-outputs-suicide/suite.rc
rename to tests/functional/triggering/20-and-outputs-suicide/flow.cylc
diff --git a/tests/functional/triggering/fam-expansion/suite.rc b/tests/functional/triggering/fam-expansion/flow.cylc
similarity index 100%
rename from tests/functional/triggering/fam-expansion/suite.rc
rename to tests/functional/triggering/fam-expansion/flow.cylc
diff --git a/tests/functional/validate/00-multi/suite.rc b/tests/functional/validate/00-multi/flow.cylc
similarity index 100%
rename from tests/functional/validate/00-multi/suite.rc
rename to tests/functional/validate/00-multi/flow.cylc
diff --git a/tests/functional/validate/01-periodical/suite.rc b/tests/functional/validate/01-periodical/flow.cylc
similarity index 100%
rename from tests/functional/validate/01-periodical/suite.rc
rename to tests/functional/validate/01-periodical/flow.cylc
diff --git a/tests/functional/validate/02-scripting-quotes/suite.rc b/tests/functional/validate/02-scripting-quotes/flow.cylc
similarity index 100%
rename from tests/functional/validate/02-scripting-quotes/suite.rc
rename to tests/functional/validate/02-scripting-quotes/flow.cylc
diff --git a/tests/functional/validate/03-incomplete-quotes/suite.rc b/tests/functional/validate/03-incomplete-quotes/flow.cylc
similarity index 100%
rename from tests/functional/validate/03-incomplete-quotes/suite.rc
rename to tests/functional/validate/03-incomplete-quotes/flow.cylc
diff --git a/tests/functional/validate/05-strict-case/suite.rc b/tests/functional/validate/05-strict-case/flow.cylc
similarity index 100%
rename from tests/functional/validate/05-strict-case/suite.rc
rename to tests/functional/validate/05-strict-case/flow.cylc
diff --git a/tests/functional/validate/06-strict-missing/suite.rc b/tests/functional/validate/06-strict-missing/flow.cylc
similarity index 100%
rename from tests/functional/validate/06-strict-missing/suite.rc
rename to tests/functional/validate/06-strict-missing/flow.cylc
diff --git a/tests/functional/validate/07-null-parentage/suite.rc b/tests/functional/validate/07-null-parentage/flow.cylc
similarity index 100%
rename from tests/functional/validate/07-null-parentage/suite.rc
rename to tests/functional/validate/07-null-parentage/flow.cylc
diff --git a/tests/functional/validate/08-whitespace/suite.rc b/tests/functional/validate/08-whitespace/flow.cylc
similarity index 95%
rename from tests/functional/validate/08-whitespace/suite.rc
rename to tests/functional/validate/08-whitespace/flow.cylc
index 4030d0664ba..84c4c9b90f7 100644
--- a/tests/functional/validate/08-whitespace/suite.rc
+++ b/tests/functional/validate/08-whitespace/flow.cylc
@@ -16,4 +16,4 @@
         
    [  runtime   ]    
     [[  foo,bar   ,  a,  b  ]]   
-%include "inc.rc"   
+%include "inc.cylc"   
diff --git a/tests/functional/validate/08-whitespace/inc.rc b/tests/functional/validate/08-whitespace/inc.cylc
similarity index 100%
rename from tests/functional/validate/08-whitespace/inc.rc
rename to tests/functional/validate/08-whitespace/inc.cylc
diff --git a/tests/functional/validate/09-include-missing.t b/tests/functional/validate/09-include-missing.t
index f0d8eca5a22..14c2a7893f0 100755
--- a/tests/functional/validate/09-include-missing.t
+++ b/tests/functional/validate/09-include-missing.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -19,11 +19,11 @@
 . "$(dirname "$0")/test_header"
 #-------------------------------------------------------------------------------
 set_test_number 2
-echo '%include foo.rc' >suite.rc
-echo '%include bar.rc' >foo.rc
-run_fail "${TEST_NAME_BASE}" cylc validate suite.rc
+echo '%include foo.cylc' >flow.cylc
+echo '%include bar.cylc' >foo.cylc
+run_fail "${TEST_NAME_BASE}" cylc validate flow.cylc
 cmp_ok "${TEST_NAME_BASE}.stderr" <<__ERR__
-IncludeFileNotFoundError: bar.rc via foo.rc from $PWD/suite.rc
+IncludeFileNotFoundError: bar.cylc via foo.cylc from $PWD/flow.cylc
 __ERR__
 #-------------------------------------------------------------------------------
 exit
diff --git a/tests/functional/validate/10-bad-recurrence.t b/tests/functional/validate/10-bad-recurrence.t
index d49a4a98de2..97d629c3ed4 100755
--- a/tests/functional/validate/10-bad-recurrence.t
+++ b/tests/functional/validate/10-bad-recurrence.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -21,7 +21,7 @@
 set_test_number 10
 
 TEST_NAME="${TEST_NAME_BASE}-interval"
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     cycle point time zone = +01
 [scheduling]
@@ -34,13 +34,13 @@ cat >'suite.rc' <<'__SUITE__'
     [[foo]]
         script = true
 __SUITE__
-run_fail "${TEST_NAME}" cylc validate 'suite.rc'
+run_fail "${TEST_NAME}" cylc validate 'flow.cylc'
 cmp_ok "${TEST_NAME}.stderr" <<'__ERR__'
 SuiteConfigError: Cannot process recurrence R/T00/PT5D (initial cycle point=20140101T0000+01) (final cycle point=20140201T0000+01)
 __ERR__
 
 TEST_NAME="${TEST_NAME_BASE}-old-icp"
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     UTC mode = True
 [scheduling]
@@ -51,13 +51,13 @@ cat >'suite.rc' <<'__SUITE__'
     [[root]]
         script = true
 __SUITE__
-run_fail "${TEST_NAME}" cylc validate 'suite.rc'
+run_fail "${TEST_NAME}" cylc validate 'flow.cylc'
 cmp_ok "${TEST_NAME}.stderr" <<'__ERR__'
 SuiteConfigError: Cannot process recurrence R1/P0D (initial cycle point=20140101T0000Z) (final cycle point=None) This suite requires a final cycle point.
 __ERR__
 
 TEST_NAME="${TEST_NAME_BASE}-2-digit-century"
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     cycle point time zone = +01
 [scheduling]
@@ -71,13 +71,13 @@ cat >'suite.rc' <<'__SUITE__'
     [[foo]]
         script = true
 __SUITE__
-run_fail "${TEST_NAME}" cylc validate 'suite.rc'
+run_fail "${TEST_NAME}" cylc validate 'flow.cylc'
 cmp_ok "${TEST_NAME}.stderr" <<'__ERR__'
 SuiteConfigError: Cannot process recurrence R/00/P5D (initial cycle point=20140101T0000+01) (final cycle point=20140201T0000+01) '00': 2 digit centuries not allowed. Did you mean T-digit-digit e.g. 'T00'?
 __ERR__
 
 TEST_NAME="${TEST_NAME_BASE}-old-recurrences"
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     cycle point time zone = +01
 [scheduling]
@@ -85,13 +85,13 @@ cat >'suite.rc' <<'__SUITE__'
     [[graph]]
         0,6,12 = "foo"
 __SUITE__
-run_fail "${TEST_NAME}" cylc validate 'suite.rc'
+run_fail "${TEST_NAME}" cylc validate 'flow.cylc'
 cmp_ok "${TEST_NAME}.stderr" <<'__ERR__'
 SuiteConfigError: Cannot process recurrence 0 (initial cycle point=20100101T0000+01) (final cycle point=None) '0': not a valid cylc-shorthand or full ISO 8601 date representation
 __ERR__
 
 TEST_NAME="${TEST_NAME_BASE}-old-cycle-point-format"
-cat >'suite.rc' <<'__SUITE__'
+cat >'flow.cylc' <<'__SUITE__'
 [cylc]
     cycle point format = %Y%m%d%H
 [scheduling]
@@ -99,7 +99,7 @@ cat >'suite.rc' <<'__SUITE__'
     [[graph]]
         R1 = foo
 __SUITE__
-run_fail "${TEST_NAME}" cylc validate 'suite.rc'
+run_fail "${TEST_NAME}" cylc validate 'flow.cylc'
 cmp_ok "${TEST_NAME}.stderr" <<'__ERR__'
 SuiteConfigError: Cannot process recurrence R1 (initial cycle point=2010010101) (final cycle point=None) '2010010101': not a valid cylc-shorthand or full ISO 8601 date representation
 __ERR__
diff --git a/tests/functional/validate/13-fail-old-syntax-2/suite.rc b/tests/functional/validate/13-fail-old-syntax-2/flow.cylc
similarity index 100%
rename from tests/functional/validate/13-fail-old-syntax-2/suite.rc
rename to tests/functional/validate/13-fail-old-syntax-2/flow.cylc
diff --git a/tests/functional/validate/14-fail-old-syntax-3/suite.rc b/tests/functional/validate/14-fail-old-syntax-3/flow.cylc
similarity index 100%
rename from tests/functional/validate/14-fail-old-syntax-3/suite.rc
rename to tests/functional/validate/14-fail-old-syntax-3/flow.cylc
diff --git a/tests/functional/validate/15-fail-old-syntax-4/suite.rc b/tests/functional/validate/15-fail-old-syntax-4/flow.cylc
similarity index 100%
rename from tests/functional/validate/15-fail-old-syntax-4/suite.rc
rename to tests/functional/validate/15-fail-old-syntax-4/flow.cylc
diff --git a/tests/functional/validate/16-fail-old-syntax-5/suite.rc b/tests/functional/validate/16-fail-old-syntax-5/flow.cylc
similarity index 100%
rename from tests/functional/validate/16-fail-old-syntax-5/suite.rc
rename to tests/functional/validate/16-fail-old-syntax-5/flow.cylc
diff --git a/tests/functional/validate/17-fail-old-syntax-6.t b/tests/functional/validate/17-fail-old-syntax-6.t
index 1c56ec7d9fe..915b6830cc1 100755
--- a/tests/functional/validate/17-fail-old-syntax-6.t
+++ b/tests/functional/validate/17-fail-old-syntax-6.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -20,16 +20,16 @@
 #-------------------------------------------------------------------------------
 set_test_number 2
 #-------------------------------------------------------------------------------
-cat >'suite.rc' <<'__SUITERC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     initial cycle point = 20100101T00
     [[graph]]
         R1 = "cold_foo"
         12 = "cold_foo => foo"
-__SUITERC__
+__FLOW_CONFIG__
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}"
-run_fail "${TEST_NAME}" cylc validate -v 'suite.rc'
+run_fail "${TEST_NAME}" cylc validate -v 'flow.cylc'
 grep_ok 'SuiteConfigError: Cannot process recurrence 12' "${TEST_NAME}.stderr"
 #-------------------------------------------------------------------------------
 exit
diff --git a/tests/functional/validate/18-fail-no-scheduling/suite.rc b/tests/functional/validate/18-fail-no-scheduling/flow.cylc
similarity index 100%
rename from tests/functional/validate/18-fail-no-scheduling/suite.rc
rename to tests/functional/validate/18-fail-no-scheduling/flow.cylc
diff --git a/tests/functional/validate/19-fail-no-dependencies/suite.rc b/tests/functional/validate/19-fail-no-dependencies/flow.cylc
similarity index 100%
rename from tests/functional/validate/19-fail-no-dependencies/suite.rc
rename to tests/functional/validate/19-fail-no-dependencies/flow.cylc
diff --git a/tests/functional/validate/20-fail-no-graph-async/suite.rc b/tests/functional/validate/20-fail-no-graph-async/flow.cylc
similarity index 100%
rename from tests/functional/validate/20-fail-no-graph-async/suite.rc
rename to tests/functional/validate/20-fail-no-graph-async/flow.cylc
diff --git a/tests/functional/validate/21-fail-no-graph-sequence/suite.rc b/tests/functional/validate/21-fail-no-graph-sequence/flow.cylc
similarity index 100%
rename from tests/functional/validate/21-fail-no-graph-sequence/suite.rc
rename to tests/functional/validate/21-fail-no-graph-sequence/flow.cylc
diff --git a/tests/functional/validate/22-fail-year-bounds/suite.rc b/tests/functional/validate/22-fail-year-bounds/flow.cylc
similarity index 100%
rename from tests/functional/validate/22-fail-year-bounds/suite.rc
rename to tests/functional/validate/22-fail-year-bounds/flow.cylc
diff --git a/tests/functional/validate/23-fail-old-syntax-7/suite.rc b/tests/functional/validate/23-fail-old-syntax-7/flow.cylc
similarity index 100%
rename from tests/functional/validate/23-fail-old-syntax-7/suite.rc
rename to tests/functional/validate/23-fail-old-syntax-7/flow.cylc
diff --git a/tests/functional/validate/24-fail-initial-greater-final/suite.rc b/tests/functional/validate/24-fail-initial-greater-final/flow.cylc
similarity index 100%
rename from tests/functional/validate/24-fail-initial-greater-final/suite.rc
rename to tests/functional/validate/24-fail-initial-greater-final/flow.cylc
diff --git a/tests/functional/validate/25-fail-constrained-initial/suite.rc b/tests/functional/validate/25-fail-constrained-initial/flow.cylc
similarity index 100%
rename from tests/functional/validate/25-fail-constrained-initial/suite.rc
rename to tests/functional/validate/25-fail-constrained-initial/flow.cylc
diff --git a/tests/functional/validate/26-fail-graph-double-conditionals.t b/tests/functional/validate/26-fail-graph-double-conditionals.t
index cb338f95d22..f87b68c4f80 100755
--- a/tests/functional/validate/26-fail-graph-double-conditionals.t
+++ b/tests/functional/validate/26-fail-graph-double-conditionals.t
@@ -20,22 +20,22 @@
 #-------------------------------------------------------------------------------
 set_test_number 8
 #-------------------------------------------------------------------------------
-cat > suite.rc <<__END__
+cat > flow.cylc <<__END__
 [scheduling]
     [[graph]]
         R1 = foo && bar => baz
 __END__
 #-------------------------------------------------------------------------------
 TEST_NAME=${TEST_NAME_BASE}-async-and
-run_fail "${TEST_NAME}" cylc validate -v suite.rc
+run_fail "${TEST_NAME}" cylc validate -v flow.cylc
 grep_ok "GraphParseError: the graph AND operator is '&': " "${TEST_NAME}.stderr"
 #-------------------------------------------------------------------------------
 TEST_NAME=${TEST_NAME_BASE}-async-or
-sed -i -e 's/&&/||/' suite.rc
-run_fail "${TEST_NAME}" cylc validate -v suite.rc
+sed -i -e 's/&&/||/' flow.cylc
+run_fail "${TEST_NAME}" cylc validate -v flow.cylc
 grep_ok "GraphParseError: the graph OR operator is '|': " "${TEST_NAME}.stderr"
 #-------------------------------------------------------------------------------
-cat > suite.rc <<__END__
+cat > flow.cylc <<__END__
 [scheduling]
     initial cycle point = 2015
     [[graph]]
@@ -43,10 +43,10 @@ cat > suite.rc <<__END__
 __END__
 #-------------------------------------------------------------------------------
 TEST_NAME=${TEST_NAME_BASE}-cycling-and
-run_fail "${TEST_NAME}" cylc validate -v suite.rc
+run_fail "${TEST_NAME}" cylc validate -v flow.cylc
 grep_ok "GraphParseError: the graph AND operator is '&': " "${TEST_NAME}.stderr"
 #-------------------------------------------------------------------------------
 TEST_NAME=${TEST_NAME_BASE}-cycling-or
-sed -i -e 's/&&/||/' suite.rc
-run_fail "${TEST_NAME}" cylc validate -v suite.rc
+sed -i -e 's/&&/||/' flow.cylc
+run_fail "${TEST_NAME}" cylc validate -v flow.cylc
 grep_ok "GraphParseError: the graph OR operator is '|': " "${TEST_NAME}.stderr"
diff --git a/tests/functional/validate/27-fail-constrained-final/suite.rc b/tests/functional/validate/27-fail-constrained-final/flow.cylc
similarity index 100%
rename from tests/functional/validate/27-fail-constrained-final/suite.rc
rename to tests/functional/validate/27-fail-constrained-final/flow.cylc
diff --git a/tests/functional/validate/28-fail-max-active-cycle-points-zero/suite.rc b/tests/functional/validate/28-fail-max-active-cycle-points-zero/flow.cylc
similarity index 100%
rename from tests/functional/validate/28-fail-max-active-cycle-points-zero/suite.rc
rename to tests/functional/validate/28-fail-max-active-cycle-points-zero/flow.cylc
diff --git a/tests/functional/validate/29-fail-graph-double-pipe/suite.rc b/tests/functional/validate/29-fail-graph-double-pipe/flow.cylc
similarity index 100%
rename from tests/functional/validate/29-fail-graph-double-pipe/suite.rc
rename to tests/functional/validate/29-fail-graph-double-pipe/flow.cylc
diff --git a/tests/functional/validate/29-pass-constrained-initial/suite.rc b/tests/functional/validate/29-pass-constrained-initial/flow.cylc
similarity index 100%
rename from tests/functional/validate/29-pass-constrained-initial/suite.rc
rename to tests/functional/validate/29-pass-constrained-initial/flow.cylc
diff --git a/tests/functional/validate/30-pass-constrained-final/suite.rc b/tests/functional/validate/30-pass-constrained-final/flow.cylc
similarity index 100%
rename from tests/functional/validate/30-pass-constrained-final/suite.rc
rename to tests/functional/validate/30-pass-constrained-final/flow.cylc
diff --git a/tests/functional/validate/31-fail-not-integer.t b/tests/functional/validate/31-fail-not-integer.t
index b7300925355..9b092596aa6 100755
--- a/tests/functional/validate/31-fail-not-integer.t
+++ b/tests/functional/validate/31-fail-not-integer.t
@@ -20,7 +20,7 @@
 #-------------------------------------------------------------------------------
 set_test_number 2
 #-------------------------------------------------------------------------------
-cat >'suite.rc' <<'__SUITERC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     initial cycle point = 2015-01-01
     final cycle point = 2015-01-01
@@ -30,10 +30,10 @@ cat >'suite.rc' <<'__SUITERC__'
 [runtime]
     [[foo]]
     script = sleep 10
-__SUITERC__
+__FLOW_CONFIG__
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}"
-run_fail "${TEST_NAME}" cylc validate -v 'suite.rc'
+run_fail "${TEST_NAME}" cylc validate -v 'flow.cylc'
 grep_ok "SuiteConfigError: Cannot process recurrence 1" "${TEST_NAME}.stderr"
 #-------------------------------------------------------------------------------
 exit
diff --git a/tests/functional/validate/32-fail-graph-bracket-missing/suite.rc b/tests/functional/validate/32-fail-graph-bracket-missing/flow.cylc
similarity index 100%
rename from tests/functional/validate/32-fail-graph-bracket-missing/suite.rc
rename to tests/functional/validate/32-fail-graph-bracket-missing/flow.cylc
diff --git a/tests/functional/validate/35-pass-special-tasks-non-word-names.t b/tests/functional/validate/35-pass-special-tasks-non-word-names.t
index 6d1be4440f8..f191d094069 100755
--- a/tests/functional/validate/35-pass-special-tasks-non-word-names.t
+++ b/tests/functional/validate/35-pass-special-tasks-non-word-names.t
@@ -18,7 +18,7 @@
 # Test validation of special tasks names with non-word characters
 . "$(dirname "$0")/test_header"
 set_test_number 1
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     initial cycle point = 20200202
     final cycle point = 20300303
@@ -35,6 +35,6 @@ t@1
 [runtime]
     [[t-1, t+1, t%1, t@1]]
         script = true
-__SUITE_RC__
-run_ok "${TEST_NAME_BASE}" cylc validate --strict "${PWD}/suite.rc"
+__FLOW_CONFIG__
+run_ok "${TEST_NAME_BASE}" cylc validate --strict "${PWD}/flow.cylc"
 exit
diff --git a/tests/functional/validate/36-fail-double-runahead/suite.rc b/tests/functional/validate/36-fail-double-runahead/flow.cylc
similarity index 100%
rename from tests/functional/validate/36-fail-double-runahead/suite.rc
rename to tests/functional/validate/36-fail-double-runahead/flow.cylc
diff --git a/tests/functional/validate/37-clock-trigger-task-not-defined.t b/tests/functional/validate/37-clock-trigger-task-not-defined.t
index 459814fa7a1..191176a8101 100755
--- a/tests/functional/validate/37-clock-trigger-task-not-defined.t
+++ b/tests/functional/validate/37-clock-trigger-task-not-defined.t
@@ -18,7 +18,7 @@
 # Test validation of special tasks names with non-word characters
 . "$(dirname "$0")/test_header"
 set_test_number 2
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     initial cycle point = 20200101
     [[special tasks]]
@@ -28,8 +28,8 @@ cat >'suite.rc' <<'__SUITE_RC__'
 [runtime]
     [[bar]]
         script = true
-__SUITE_RC__
-run_fail "${TEST_NAME_BASE}" cylc validate --strict "${PWD}/suite.rc"
+__FLOW_CONFIG__
+run_fail "${TEST_NAME_BASE}" cylc validate --strict "${PWD}/flow.cylc"
 cmp_ok "${TEST_NAME_BASE}.stderr" <<'__ERR__'
 SuiteConfigError: clock-trigger task "foo" is not defined.
 __ERR__
diff --git a/tests/functional/validate/38-degenerate-point-format/suite.rc b/tests/functional/validate/38-degenerate-point-format/flow.cylc
similarity index 100%
rename from tests/functional/validate/38-degenerate-point-format/suite.rc
rename to tests/functional/validate/38-degenerate-point-format/flow.cylc
diff --git a/tests/functional/validate/39-fail-suicide-left.t b/tests/functional/validate/39-fail-suicide-left.t
index 87e190f44b8..b810237f40a 100755
--- a/tests/functional/validate/39-fail-suicide-left.t
+++ b/tests/functional/validate/39-fail-suicide-left.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -19,15 +19,15 @@
 . "$(dirname "$0")/test_header"
 set_test_number 2
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = """!dont-kill-me => no-problem"""
 [runtime]
     [[dont-kill-me, no-problem]]
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_fail "${TEST_NAME_BASE}" cylc validate 'suite.rc'
+run_fail "${TEST_NAME_BASE}" cylc validate 'flow.cylc'
 cmp_ok "${TEST_NAME_BASE}.stderr" <<'__ERR__'
 GraphParseError: suicide markers must be on the right of a trigger: !dont-kill-me
 __ERR__
diff --git a/tests/functional/validate/40-jinja2-template-syntax-error-main.t b/tests/functional/validate/40-jinja2-template-syntax-error-main.t
index 64db7685b02..0df33feaa84 100755
--- a/tests/functional/validate/40-jinja2-template-syntax-error-main.t
+++ b/tests/functional/validate/40-jinja2-template-syntax-error-main.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -22,7 +22,7 @@ set_test_number 2
 install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-val"
-run_fail "${TEST_NAME}" cylc validate suite.rc
+run_fail "${TEST_NAME}" cylc validate flow.cylc
 cmp_ok "${TEST_NAME}.stderr" <<'__ERROR__'
 Jinja2Error: Encountered unknown tag 'end'.
 Jinja was looking for the following tags: 'elif' or 'else' or 'endif'.
diff --git a/tests/functional/validate/40-jinja2-template-syntax-error-main/suite.rc b/tests/functional/validate/40-jinja2-template-syntax-error-main/flow.cylc
similarity index 100%
rename from tests/functional/validate/40-jinja2-template-syntax-error-main/suite.rc
rename to tests/functional/validate/40-jinja2-template-syntax-error-main/flow.cylc
diff --git a/tests/functional/validate/41-jinja2-template-syntax-error-cylc-include.t b/tests/functional/validate/41-jinja2-template-syntax-error-cylc-include.t
index b652330ce09..c8466aa1ab2 100755
--- a/tests/functional/validate/41-jinja2-template-syntax-error-cylc-include.t
+++ b/tests/functional/validate/41-jinja2-template-syntax-error-cylc-include.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -22,7 +22,7 @@ set_test_number 2
 install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-val"
-run_fail "${TEST_NAME}" cylc validate suite.rc
+run_fail "${TEST_NAME}" cylc validate flow.cylc
 cmp_ok "${TEST_NAME}.stderr" <<'__ERROR__'
 Jinja2Error: Encountered unknown tag 'end'.
 Jinja was looking for the following tags: 'elif' or 'else' or 'endif'.
diff --git a/tests/functional/validate/41-jinja2-template-syntax-error-cylc-include/suite-includeme.rc b/tests/functional/validate/41-jinja2-template-syntax-error-cylc-include/flow-includeme.cylc
similarity index 100%
rename from tests/functional/validate/41-jinja2-template-syntax-error-cylc-include/suite-includeme.rc
rename to tests/functional/validate/41-jinja2-template-syntax-error-cylc-include/flow-includeme.cylc
diff --git a/tests/functional/validate/41-jinja2-template-syntax-error-cylc-include/suite.rc b/tests/functional/validate/41-jinja2-template-syntax-error-cylc-include/flow.cylc
similarity index 74%
rename from tests/functional/validate/41-jinja2-template-syntax-error-cylc-include/suite.rc
rename to tests/functional/validate/41-jinja2-template-syntax-error-cylc-include/flow.cylc
index d24f60e86ac..aafc6423a89 100644
--- a/tests/functional/validate/41-jinja2-template-syntax-error-cylc-include/suite.rc
+++ b/tests/functional/validate/41-jinja2-template-syntax-error-cylc-include/flow.cylc
@@ -2,7 +2,7 @@
 
 [scheduling]
     [[graph]]
-%include suite-includeme.rc
+%include flow-includeme.cylc
 [runtime]
     [[foo]]
         script = sleep 1
diff --git a/tests/functional/validate/42-jinja2-template-syntax-error-jinja-include.t b/tests/functional/validate/42-jinja2-template-syntax-error-jinja-include.t
index 10fab2cf826..2f1bc0ddcb9 100755
--- a/tests/functional/validate/42-jinja2-template-syntax-error-jinja-include.t
+++ b/tests/functional/validate/42-jinja2-template-syntax-error-jinja-include.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -22,10 +22,10 @@ set_test_number 2
 install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-val"
-run_fail "${TEST_NAME}" cylc validate suite.rc
+run_fail "${TEST_NAME}" cylc validate flow.cylc
 cmp_ok "${TEST_NAME}.stderr" <<'__ERROR__'
 Jinja2Error: Encountered unknown tag 'end'.
-Error in file "suite-includeme.rc"
+Error in file "flow-includeme.cylc"
 Jinja was looking for the following tags: 'elif' or 'else' or 'endif'.
 The innermost block that needs to be closed is 'if'.
 Context lines:
diff --git a/tests/functional/validate/42-jinja2-template-syntax-error-jinja-include/suite-includeme.rc b/tests/functional/validate/42-jinja2-template-syntax-error-jinja-include/flow-includeme.cylc
similarity index 100%
rename from tests/functional/validate/42-jinja2-template-syntax-error-jinja-include/suite-includeme.rc
rename to tests/functional/validate/42-jinja2-template-syntax-error-jinja-include/flow-includeme.cylc
diff --git a/tests/functional/validate/42-jinja2-template-syntax-error-jinja-include/suite.rc b/tests/functional/validate/42-jinja2-template-syntax-error-jinja-include/flow.cylc
similarity index 69%
rename from tests/functional/validate/42-jinja2-template-syntax-error-jinja-include/suite.rc
rename to tests/functional/validate/42-jinja2-template-syntax-error-jinja-include/flow.cylc
index 884e2c2a8cd..e05005cdac2 100644
--- a/tests/functional/validate/42-jinja2-template-syntax-error-jinja-include/suite.rc
+++ b/tests/functional/validate/42-jinja2-template-syntax-error-jinja-include/flow.cylc
@@ -1,7 +1,7 @@
 #!jinja2
 [scheduling]
     [[graph]]
-{% include 'suite-includeme.rc' %}
+{% include 'flow-includeme.cylc' %}
 [runtime]
     [[foo]]
         script = sleep 1
diff --git a/tests/functional/validate/43-jinja2-template-error-main.t b/tests/functional/validate/43-jinja2-template-error-main.t
index ef01e86412e..f4266c9a468 100755
--- a/tests/functional/validate/43-jinja2-template-error-main.t
+++ b/tests/functional/validate/43-jinja2-template-error-main.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -20,7 +20,7 @@
 
 set_test_number 2
 
-cat >'suite.rc' <<'__SUITERC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 #!jinja2
 {% set foo = {} %}
 [scheduling]
@@ -29,8 +29,8 @@ cat >'suite.rc' <<'__SUITERC__'
 [runtime]
     [[foo]]
         script = sleep 1
-__SUITERC__
-run_fail "${TEST_NAME_BASE}" cylc validate 'suite.rc'
+__FLOW_CONFIG__
+run_fail "${TEST_NAME_BASE}" cylc validate 'flow.cylc'
 cmp_ok "${TEST_NAME_BASE}.stderr" <<'__ERROR__'
 Jinja2Error: You can only sort by either "key" or "value"
 Context lines:
diff --git a/tests/functional/validate/44-jinja2-template-not-found.t b/tests/functional/validate/44-jinja2-template-not-found.t
index 88cc6289ee8..883125df6a1 100755
--- a/tests/functional/validate/44-jinja2-template-not-found.t
+++ b/tests/functional/validate/44-jinja2-template-not-found.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -22,13 +22,13 @@ set_test_number 2
 install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-val"
-run_fail "${TEST_NAME}" cylc validate suite.rc
+run_fail "${TEST_NAME}" cylc validate flow.cylc
 cmp_ok "${TEST_NAME}.stderr" <<'__ERROR__'
-Jinja2Error: suite-foo.rc
+Jinja2Error: flow-foo.cylc
 Context lines:
         R1 = foo
 [runtime]
-{% include 'suite-foo.rc' %}	<-- TemplateNotFound
+{% include 'flow-foo.cylc' %}	<-- TemplateNotFound
 __ERROR__
 #-------------------------------------------------------------------------------
 purge_suite "${SUITE_NAME}"
diff --git a/tests/functional/validate/44-jinja2-template-not-found/suite.rc b/tests/functional/validate/44-jinja2-template-not-found/flow.cylc
similarity index 67%
rename from tests/functional/validate/44-jinja2-template-not-found/suite.rc
rename to tests/functional/validate/44-jinja2-template-not-found/flow.cylc
index ed35474c2ea..02c9c1bbdc4 100644
--- a/tests/functional/validate/44-jinja2-template-not-found/suite.rc
+++ b/tests/functional/validate/44-jinja2-template-not-found/flow.cylc
@@ -3,4 +3,4 @@
     [[graph]]
         R1 = foo
 [runtime]
-{% include 'suite-foo.rc' %}
+{% include 'flow-foo.cylc' %}
diff --git a/tests/functional/validate/45-jinja2-type-error.t b/tests/functional/validate/45-jinja2-type-error.t
index 9639e54891a..583bc77d7b6 100755
--- a/tests/functional/validate/45-jinja2-type-error.t
+++ b/tests/functional/validate/45-jinja2-type-error.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -21,15 +21,15 @@
 set_test_number 4
 
 TEST_NAME="${TEST_NAME_BASE}-type-error"
-cat >'suite.rc' <<'__SUITERC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 #!jinja2
 
 [scheduling]
     [[graph]]
         R1 = foo
 {{ 1 / 'foo' }}
-__SUITERC__
-run_fail "${TEST_NAME}" cylc validate 'suite.rc'
+__FLOW_CONFIG__
+run_fail "${TEST_NAME}" cylc validate 'flow.cylc'
 cmp_ok "${TEST_NAME}.stderr" <<'__ERROR__'
 Jinja2Error: unsupported operand type(s) for /: 'int' and 'str'
 Context lines:
@@ -39,12 +39,12 @@ Context lines:
 __ERROR__
 
 TEST_NAME="${TEST_NAME}-value-error"
-cat >'suite.rc' <<'__SUITERC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 #!Jinja2
 {% set foo = [1, 2] %}
 {% set a, b, c = foo %}
-__SUITERC__
-run_fail "${TEST_NAME}" cylc validate 'suite.rc'
+__FLOW_CONFIG__
+run_fail "${TEST_NAME}" cylc validate 'flow.cylc'
 cmp_ok "${TEST_NAME}.stderr" <<'__ERROR__'
 Jinja2Error: not enough values to unpack (expected 3, got 2)
 Context lines:
diff --git a/tests/functional/validate/46-fail-bad-vis-nod-attrs/suite.rc b/tests/functional/validate/46-fail-bad-vis-nod-attrs/flow.cylc
similarity index 100%
rename from tests/functional/validate/46-fail-bad-vis-nod-attrs/suite.rc
rename to tests/functional/validate/46-fail-bad-vis-nod-attrs/flow.cylc
diff --git a/tests/functional/validate/47-fail-no-graph.t b/tests/functional/validate/47-fail-no-graph.t
index 77016bc29af..092677b87d9 100755
--- a/tests/functional/validate/47-fail-no-graph.t
+++ b/tests/functional/validate/47-fail-no-graph.t
@@ -21,19 +21,19 @@
 set_test_number 4
 #-------------------------------------------------------------------------------
 TEST_NAME=${TEST_NAME_BASE}-empty-graph
-cat > suite.rc <<__END__
+cat > flow.cylc <<__END__
 [scheduling]
     [[graph]]
         R1 = ""
 __END__
-run_fail "${TEST_NAME}" cylc validate -v suite.rc
+run_fail "${TEST_NAME}" cylc validate -v flow.cylc
 grep_ok "No suite dependency graph defined." "${TEST_NAME}.stderr"
 #-------------------------------------------------------------------------------
 TEST_NAME=${TEST_NAME_BASE}-no-graph
-cat > suite.rc <<__END__
+cat > flow.cylc <<__END__
 [scheduling]
     initial cycle point = 2015
     [[graph]]
 __END__
-run_fail "${TEST_NAME}" cylc validate -v suite.rc
+run_fail "${TEST_NAME}" cylc validate -v flow.cylc
 grep_ok "No suite dependency graph defined." "${TEST_NAME}.stderr"
diff --git a/tests/functional/validate/48-reg-then-pwd.t b/tests/functional/validate/48-reg-then-pwd.t
index 55e903ce0ea..95cb8e30418 100755
--- a/tests/functional/validate/48-reg-then-pwd.t
+++ b/tests/functional/validate/48-reg-then-pwd.t
@@ -22,22 +22,22 @@ set_test_number 2
 SUITE_NAME="cylctb-${CYLC_TEST_TIME_INIT}/${TEST_SOURCE_DIR_BASE}/${TEST_NAME_BASE}"
 
 mkdir -p 'good' "${SUITE_NAME}"
-cat >'good/suite.rc' <<'__SUITE_RC__'
+cat >'good/flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = t0
 [runtime]
     [[t0]]
         script = true
-__SUITE_RC__
-cat >"${SUITE_NAME}/suite.rc" <<'__SUITE_RC__'
+__FLOW_CONFIG__
+cat >"${SUITE_NAME}/flow.cylc" <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = t0
 [runtime]
     [[t0]]
         scribble = true
-__SUITE_RC__
+__FLOW_CONFIG__
 
 # This should validate bad suite under current directory
 run_fail "${TEST_NAME_BASE}" cylc validate "${SUITE_NAME}"
diff --git a/tests/functional/validate/49-jinja2-undefined-error.t b/tests/functional/validate/49-jinja2-undefined-error.t
index a906e9ace2e..35404d59919 100755
--- a/tests/functional/validate/49-jinja2-undefined-error.t
+++ b/tests/functional/validate/49-jinja2-undefined-error.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -22,7 +22,7 @@ set_test_number 2
 install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-val"
-run_fail "${TEST_NAME}" cylc validate suite.rc
+run_fail "${TEST_NAME}" cylc validate flow.cylc
 cmp_ok "${TEST_NAME}.stderr" <<'__ERROR__'
 Jinja2Error: 'UNDEFINED_WHATEVER' is undefined
 Context lines:
diff --git a/tests/functional/validate/49-jinja2-undefined-error/suite.rc b/tests/functional/validate/49-jinja2-undefined-error/flow.cylc
similarity index 100%
rename from tests/functional/validate/49-jinja2-undefined-error/suite.rc
rename to tests/functional/validate/49-jinja2-undefined-error/flow.cylc
diff --git a/tests/functional/validate/50-hyphen-fam.t b/tests/functional/validate/50-hyphen-fam.t
index d72af3fa9ba..c53d61be3ce 100755
--- a/tests/functional/validate/50-hyphen-fam.t
+++ b/tests/functional/validate/50-hyphen-fam.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -20,7 +20,7 @@
 . "$(dirname "$0")/test_header"
 set_test_number 2
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = "baz-foo => bar"
@@ -28,11 +28,11 @@ cat >'suite.rc' <<'__SUITE_RC__'
     [[foo]]
     [[bar, baz-foo]]
         inherit = foo
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_ok "${TEST_NAME_BASE}" cylc validate 'suite.rc'
+run_ok "${TEST_NAME_BASE}" cylc validate 'flow.cylc'
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = "foo-baz => bar"
@@ -40,7 +40,7 @@ cat >'suite.rc' <<'__SUITE_RC__'
     [[foo]]
     [[bar, foo-baz]]
         inherit = foo
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_ok "${TEST_NAME_BASE}" cylc validate 'suite.rc'
+run_ok "${TEST_NAME_BASE}" cylc validate 'flow.cylc'
 exit
diff --git a/tests/functional/validate/51-zero-interval.t b/tests/functional/validate/51-zero-interval.t
index d6a93da9839..437d7a40382 100755
--- a/tests/functional/validate/51-zero-interval.t
+++ b/tests/functional/validate/51-zero-interval.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -20,7 +20,7 @@
 . "$(dirname "$0")/test_header"
 set_test_number 2
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [cylc]
     UTC mode = True
 [scheduling]
@@ -30,9 +30,9 @@ cat >'suite.rc' <<'__SUITE_RC__'
 [runtime]
     [[foo]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_fail "${TEST_NAME_BASE}" cylc validate 'suite.rc'
+run_fail "${TEST_NAME_BASE}" cylc validate 'flow.cylc'
 cmp_ok "${TEST_NAME_BASE}.stderr" <<'__ERR__'
 SequenceDegenerateError: R/20100101T0000Z/P0Y, point format CCYYMMDDThhmmZ: equal adjacent points: 20100101T0000Z => 20100101T0000Z.
 __ERR__
diff --git a/tests/functional/validate/52-null-timeout.t b/tests/functional/validate/52-null-timeout.t
index 067c7caadda..42100c695f9 100755
--- a/tests/functional/validate/52-null-timeout.t
+++ b/tests/functional/validate/52-null-timeout.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -21,7 +21,7 @@
 
 set_test_number 1
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = foo
@@ -29,8 +29,8 @@ cat >'suite.rc' <<'__SUITE_RC__'
     [[foo]]
         [[[events]]]
             execution timeout =
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_ok "${TEST_NAME_BASE}" cylc validate 'suite.rc'
+run_ok "${TEST_NAME_BASE}" cylc validate 'flow.cylc'
 
 exit
diff --git a/tests/functional/validate/53-missing-parentage/suite.rc b/tests/functional/validate/53-missing-parentage/flow.cylc
similarity index 100%
rename from tests/functional/validate/53-missing-parentage/suite.rc
rename to tests/functional/validate/53-missing-parentage/flow.cylc
diff --git a/tests/functional/validate/54-self-suicide/suite.rc b/tests/functional/validate/54-self-suicide/flow.cylc
similarity index 100%
rename from tests/functional/validate/54-self-suicide/suite.rc
rename to tests/functional/validate/54-self-suicide/flow.cylc
diff --git a/tests/functional/validate/55-hyphen-finish.t b/tests/functional/validate/55-hyphen-finish.t
index 1ba8029c3b1..0bd99f24a21 100755
--- a/tests/functional/validate/55-hyphen-finish.t
+++ b/tests/functional/validate/55-hyphen-finish.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -21,15 +21,15 @@
 
 set_test_number 1
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = foo-bar:finish => baz
 [runtime]
     [[foo-bar,baz]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_ok "${TEST_NAME_BASE}" cylc validate 'suite.rc'
+run_ok "${TEST_NAME_BASE}" cylc validate 'flow.cylc'
 
 exit
diff --git a/tests/functional/validate/56-succeed-sub.t b/tests/functional/validate/56-succeed-sub.t
index 3120dca23db..737a0820450 100755
--- a/tests/functional/validate/56-succeed-sub.t
+++ b/tests/functional/validate/56-succeed-sub.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -22,15 +22,15 @@
 
 set_test_number 1
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
 [[graph]]
 R1 = foo:fail | (foo & bar:fail) => something
 [runtime]
 [[root]]
 script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_ok "${TEST_NAME_BASE}" cylc validate 'suite.rc'
+run_ok "${TEST_NAME_BASE}" cylc validate 'flow.cylc'
 
 exit
diff --git a/tests/functional/validate/57-offset-no-offset.t b/tests/functional/validate/57-offset-no-offset.t
index 9928380dcc4..2fc8bad269a 100755
--- a/tests/functional/validate/57-offset-no-offset.t
+++ b/tests/functional/validate/57-offset-no-offset.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -23,7 +23,7 @@
 
 set_test_number 1
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     initial cycle point = 2010
 [[graph]]
@@ -31,8 +31,8 @@ cat >'suite.rc' <<'__SUITE_RC__'
 [runtime]
     [[root]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_ok "${TEST_NAME_BASE}" cylc validate 'suite.rc'
+run_ok "${TEST_NAME_BASE}" cylc validate 'flow.cylc'
 
 exit
diff --git a/tests/functional/validate/58-icp-quoted-now.t b/tests/functional/validate/58-icp-quoted-now.t
index 2a59d52c8c5..05ca819d0da 100755
--- a/tests/functional/validate/58-icp-quoted-now.t
+++ b/tests/functional/validate/58-icp-quoted-now.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -21,7 +21,7 @@
 
 set_test_number 1
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [cylc]
     cycle point format = %Y%m%d
 [scheduling]
@@ -31,8 +31,8 @@ cat >'suite.rc' <<'__SUITE_RC__'
 [runtime]
     [[t1]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_ok "${TEST_NAME_BASE}" cylc validate 'suite.rc'
+run_ok "${TEST_NAME_BASE}" cylc validate 'flow.cylc'
 
 exit
diff --git a/tests/functional/validate/60-group/suite.rc b/tests/functional/validate/60-group/flow.cylc
similarity index 100%
rename from tests/functional/validate/60-group/suite.rc
rename to tests/functional/validate/60-group/flow.cylc
diff --git a/tests/functional/validate/61-include-missing-quote.t b/tests/functional/validate/61-include-missing-quote.t
index 50e10ce83b7..17fa4c5ca25 100755
--- a/tests/functional/validate/61-include-missing-quote.t
+++ b/tests/functional/validate/61-include-missing-quote.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -21,14 +21,14 @@
 
 set_test_number 2
 
-cat >'suite.rc' <<'__SUITE_RC__'
-%include 'foo.rc
-__SUITE_RC__
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
+%include 'foo.cylc
+__FLOW_CONFIG__
 
-run_fail "${TEST_NAME_BASE}" cylc validate 'suite.rc'
+run_fail "${TEST_NAME_BASE}" cylc validate 'flow.cylc'
 cmp_ok "${TEST_NAME_BASE}.stderr" <<__ERR__
-FileParseError: mismatched quotes (in $PWD/suite.rc):
-   %include 'foo.rc
+FileParseError: mismatched quotes (in $PWD/flow.cylc):
+   %include 'foo.cylc
 __ERR__
 
 exit
diff --git a/tests/functional/validate/62-null-task-name.t b/tests/functional/validate/62-null-task-name.t
index f922295657e..10b0fc0e255 100755
--- a/tests/functional/validate/62-null-task-name.t
+++ b/tests/functional/validate/62-null-task-name.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -23,12 +23,12 @@ set_test_number 10
 
 for GRAPH in 't1 => & t2' 't1 => t2 &' '& t1 => t2' 't1 & => t2' 't1 => => t2'
 do
-    cat >'suite.rc' <<__SUITE_RC__
+    cat >'flow.cylc' <<__FLOW_CONFIG__
 [scheduling]
     [[graph]]
         R1 = ${GRAPH}
-__SUITE_RC__
-    run_fail "${TEST_NAME_BASE}" cylc validate 'suite.rc'
+__FLOW_CONFIG__
+    run_fail "${TEST_NAME_BASE}" cylc validate 'flow.cylc'
     grep_ok 'GraphParseError: null task name in graph: ' \
         "${TEST_NAME_BASE}.stderr"
 done
diff --git a/tests/functional/validate/63-collapse-secondary-parent.t b/tests/functional/validate/63-collapse-secondary-parent.t
index 46639f8673f..dbbb5b905f9 100755
--- a/tests/functional/validate/63-collapse-secondary-parent.t
+++ b/tests/functional/validate/63-collapse-secondary-parent.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -22,7 +22,7 @@
 
 set_test_number 2
 
-cat >'suite.rc' <<__SUITE_RC__
+cat >'flow.cylc' <<__FLOW_CONFIG__
 [scheduling]
     [[graph]]
         R1 = BAR
@@ -35,9 +35,9 @@ cat >'suite.rc' <<__SUITE_RC__
         inherit = FOO, BAR
 [visualization]
     collapsed families = BAR  # Troublesome setting.
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_fail "${TEST_NAME_BASE}" cylc validate 'suite.rc'
+run_fail "${TEST_NAME_BASE}" cylc validate 'flow.cylc'
 
 ERR='SuiteConfigError: \[visualization\]collapsed families: BAR is not a first parent'
 grep_ok "$ERR" "${TEST_NAME_BASE}.stderr"
diff --git a/tests/functional/validate/64-circular.t b/tests/functional/validate/64-circular.t
index 60eed4dbe82..64a8be545d9 100755
--- a/tests/functional/validate/64-circular.t
+++ b/tests/functional/validate/64-circular.t
@@ -20,29 +20,29 @@
 
 set_test_number 13
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = a => a
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_fail "${TEST_NAME_BASE}-simple-1" cylc validate 'suite.rc'
+run_fail "${TEST_NAME_BASE}-simple-1" cylc validate 'flow.cylc'
 contains_ok "${TEST_NAME_BASE}-simple-1.stderr" <<'__ERR__'
 SuiteConfigError: self-edge detected: a:succeed => a
 __ERR__
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = a => b => c => d => a => z
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_fail "${TEST_NAME_BASE}-simple-2" cylc validate 'suite.rc'
+run_fail "${TEST_NAME_BASE}-simple-2" cylc validate 'flow.cylc'
 contains_ok "${TEST_NAME_BASE}-simple-2.stderr" <<'__ERR__'
 SuiteConfigError: circular edges detected:  d.1 => a.1  a.1 => b.1  b.1 => c.1  c.1 => d.1
 __ERR__
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1 = FAM:succeed-all => f & g => z
@@ -50,14 +50,14 @@ cat >'suite.rc' <<'__SUITE_RC__'
     [[FAM]]
     [[f,g,h]]
        inherit = FAM
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_fail "${TEST_NAME_BASE}-simple-fam" cylc validate 'suite.rc'
+run_fail "${TEST_NAME_BASE}-simple-fam" cylc validate 'flow.cylc'
 contains_ok "${TEST_NAME_BASE}-simple-fam.stderr" <<'__ERR__'
 SuiteConfigError: self-edge detected: f:succeed => f
 __ERR__
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [cylc]
     cycle point format = %Y
 [scheduling]
@@ -68,28 +68,28 @@ cat >'suite.rc' <<'__SUITE_RC__'
 a[-P1Y] => a
 a[+P1Y] => a
 '''
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_fail "${TEST_NAME_BASE}-intercycle-1" cylc validate 'suite.rc'
+run_fail "${TEST_NAME_BASE}-intercycle-1" cylc validate 'flow.cylc'
 contains_ok "${TEST_NAME_BASE}-intercycle-1.stderr" <<'__ERR__'
 SuiteConfigError: circular edges detected:  a.2002 => a.2001  a.2001 => a.2002  a.2003 => a.2002  a.2002 => a.2003
 __ERR__
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     cycling mode = integer
     initial cycle point = 1
     [[graph]]
         2/P3 = foo => bar => baz
         8/P1 = baz => foo
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_fail "${TEST_NAME_BASE}-intercycle-2" cylc validate 'suite.rc'
+run_fail "${TEST_NAME_BASE}-intercycle-2" cylc validate 'flow.cylc'
 contains_ok "${TEST_NAME_BASE}-intercycle-2.stderr" <<'__ERR__'
 SuiteConfigError: circular edges detected:  foo.8 => bar.8  bar.8 => baz.8  baz.8 => foo.8
 __ERR__
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [cylc]
     [[parameters]]
         foo = 1..5
@@ -99,22 +99,22 @@ cat >'suite.rc' <<'__SUITE_RC__'
             fool<foo-1> => fool<foo>
             fool<foo=2> => fool<foo=1>
         """
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_fail "${TEST_NAME_BASE}-param-1" cylc validate 'suite.rc'
+run_fail "${TEST_NAME_BASE}-param-1" cylc validate 'flow.cylc'
 contains_ok "${TEST_NAME_BASE}-param-1.stderr" <<'__ERR__'
 SuiteConfigError: circular edges detected:  fool_foo2.1 => fool_foo1.1  fool_foo1.1 => fool_foo2.1
 __ERR__
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     cycling mode = integer
     initial cycle point = 1
     [[graph]]
         1/P3 = foo => bar
         2/P3 = bar => foo
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_ok "${TEST_NAME_BASE}-param-2" cylc validate 'suite.rc'
+run_ok "${TEST_NAME_BASE}-param-2" cylc validate 'flow.cylc'
 
 exit
diff --git a/tests/functional/validate/65-bad-task-event-handler-tmpl.t b/tests/functional/validate/65-bad-task-event-handler-tmpl.t
index a8cdf2dbb57..39757f54325 100755
--- a/tests/functional/validate/65-bad-task-event-handler-tmpl.t
+++ b/tests/functional/validate/65-bad-task-event-handler-tmpl.t
@@ -21,7 +21,7 @@
 set_test_number 4
 
 TEST_NAME="${TEST_NAME_BASE}-bad-key"
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1=t1
@@ -30,14 +30,14 @@ cat >'suite.rc' <<'__SUITE_RC__'
         script=true
         [[[events]]]
             failed handler = echo %(id)s, echo %(rubbish)s
-__SUITE_RC__
-run_fail "${TEST_NAME}" cylc validate 'suite.rc'
+__FLOW_CONFIG__
+run_fail "${TEST_NAME}" cylc validate 'flow.cylc'
 cmp_ok "${TEST_NAME}.stderr" <<'__ERR__'
 SuiteConfigError: bad task event handler template t1: echo %(rubbish)s: KeyError('rubbish')
 __ERR__
 
 TEST_NAME="${TEST_NAME_BASE}-bad-value"
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     [[graph]]
         R1=t1
@@ -46,8 +46,8 @@ cat >'suite.rc' <<'__SUITE_RC__'
         script=true
         [[[events]]]
             failed handler = echo %(ids
-__SUITE_RC__
-run_fail "${TEST_NAME}" cylc validate 'suite.rc'
+__FLOW_CONFIG__
+run_fail "${TEST_NAME}" cylc validate 'flow.cylc'
 cmp_ok "${TEST_NAME}.stderr" <<'__ERR__'
 SuiteConfigError: bad task event handler template t1: echo %(ids: ValueError('incomplete format key')
 __ERR__
diff --git a/tests/functional/validate/66-fail-consec-spaces.t b/tests/functional/validate/66-fail-consec-spaces.t
index 31f4624ceef..8f13eece500 100755
--- a/tests/functional/validate/66-fail-consec-spaces.t
+++ b/tests/functional/validate/66-fail-consec-spaces.t
@@ -21,7 +21,7 @@
 set_test_number 2
 
 TEST_NAME="${TEST_NAME_BASE}-val"
-cat > suite.rc <<__END__
+cat > flow.cylc <<__END__
 [scheduling]
     [[graph]]
         R1 = task1
@@ -36,7 +36,7 @@ cat > suite.rc <<__END__
         [[[directives]]]
             -l  select=1:ncpus=24:mem=20GB  # ERROR!
 __END__
-run_fail "${TEST_NAME}" cylc validate suite.rc
+run_fail "${TEST_NAME}" cylc validate flow.cylc
 cmp_ok "${TEST_NAME}.stderr" <<__END__
 IllegalItemError: [runtime][task1][directives]-l  select - (consecutive spaces)
 __END__
diff --git a/tests/functional/validate/67-relative-icp.t b/tests/functional/validate/67-relative-icp.t
index cb57bcbce14..7e4ba3d87a1 100755
--- a/tests/functional/validate/67-relative-icp.t
+++ b/tests/functional/validate/67-relative-icp.t
@@ -22,7 +22,7 @@
 
 set_test_number 2
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [cylc]
     UTC mode = true
 [scheduling]
@@ -32,9 +32,9 @@ cat >'suite.rc' <<'__SUITE_RC__'
 [runtime]
     [[t1]]
         script = true
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_ok "${TEST_NAME_BASE}" cylc graph --reference 'suite.rc'
+run_ok "${TEST_NAME_BASE}" cylc graph --reference 'flow.cylc'
 grep_ok "t1.20171231T1200Z" "${TEST_NAME_BASE}.stdout"
 
 exit
diff --git a/tests/functional/validate/68-trailing_whitespace.t b/tests/functional/validate/68-trailing_whitespace.t
index 25190e5d554..32e1201cab9 100644
--- a/tests/functional/validate/68-trailing_whitespace.t
+++ b/tests/functional/validate/68-trailing_whitespace.t
@@ -21,12 +21,13 @@
 set_test_number 3
 
 # Test example with trailing whitespace
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     initial cycle point = 20000101T06
     final cycle point = 20010101T18
     [[graph]]
         T00 = """
+            # NOTE: don't let editor strip trailing space on next line
             foo | bar \ 
             => baz & qux
             pub
@@ -35,16 +36,16 @@ cat >'suite.rc' <<'__SUITE_RC__'
             qux
             baz
         """
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_fail "${TEST_NAME_BASE}-simple-fail" cylc validate 'suite.rc'
+run_fail "${TEST_NAME_BASE}-simple-fail" cylc validate 'flow.cylc'
 cmp_ok "${TEST_NAME_BASE}-simple-fail.stderr" <<'__ERR__'
-FileParseError: Syntax error line 6: Whitespace after the line continuation character (\).
+FileParseError: Syntax error line 7: Whitespace after the line continuation character (\).
 __ERR__
 
 # Test example with correct syntax
-sed -i 's/\\ /\\/' 'suite.rc'
-run_ok "${TEST_NAME_BASE}-simple-pass" cylc validate 'suite.rc'
+sed -i 's/\\ /\\/' 'flow.cylc'
+run_ok "${TEST_NAME_BASE}-simple-pass" cylc validate 'flow.cylc'
 
 
 exit
diff --git a/tests/functional/validate/69-bare-clock-xtrigger.t b/tests/functional/validate/69-bare-clock-xtrigger.t
index e2207a04703..57980b09632 100644
--- a/tests/functional/validate/69-bare-clock-xtrigger.t
+++ b/tests/functional/validate/69-bare-clock-xtrigger.t
@@ -20,11 +20,11 @@
 
 set_test_number 1
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     initial cycle point = now
     [[graph]]
         T00 = "@wall_clock => foo"
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_ok "${TEST_NAME_BASE}-val" cylc validate 'suite.rc'
+run_ok "${TEST_NAME_BASE}-val" cylc validate 'flow.cylc'
diff --git a/tests/functional/validate/69-task-proxy-sequence-bounds-err.t b/tests/functional/validate/69-task-proxy-sequence-bounds-err.t
index 3918f53c442..4d6d042a9bc 100755
--- a/tests/functional/validate/69-task-proxy-sequence-bounds-err.t
+++ b/tests/functional/validate/69-task-proxy-sequence-bounds-err.t
@@ -15,12 +15,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Test for handling task proxy sequence bounds error. #2735 
+# Test for handling task proxy sequence bounds error. #2735
 
 . "$(dirname "$0")/test_header"
 set_test_number 7
 
-cat > suite.rc <<__END__
+cat > flow.cylc <<__END__
 [cylc]
     UTC mode = True
 [scheduling]
@@ -32,17 +32,17 @@ cat > suite.rc <<__END__
         script = true
 __END__
 
-run_ok "${TEST_NAME_BASE}" cylc validate 'suite.rc'
-run_ok "${TEST_NAME_BASE}-v" cylc validate -v 'suite.rc'
+run_ok "${TEST_NAME_BASE}" cylc validate 'flow.cylc'
+run_ok "${TEST_NAME_BASE}-v" cylc validate -v 'flow.cylc'
 contains_ok "${TEST_NAME_BASE}-v.stderr" <<'__ERR__'
  + R1/P0Y/19990101T0000Z: sequence out of bounds for initial cycle point 20000101T0000Z
 __ERR__
-run_ok "${TEST_NAME_BASE}-strict" cylc validate --strict 'suite.rc'
+run_ok "${TEST_NAME_BASE}-strict" cylc validate --strict 'flow.cylc'
 cmp_ok "${TEST_NAME_BASE}-strict.stderr" <<'__ERR__'
 WARNING - R1/P0Y/19990101T0000Z: sequence out of bounds for initial cycle point 20000101T0000Z
 __ERR__
 
-cat > suite.rc <<__END__
+cat > flow.cylc <<__END__
 [cylc]
     UTC mode = True
 [scheduling]
@@ -54,7 +54,7 @@ cat > suite.rc <<__END__
         script = true
 __END__
 
-run_ok "${TEST_NAME_BASE}-strict" cylc validate --strict 'suite.rc'
+run_ok "${TEST_NAME_BASE}-strict" cylc validate --strict 'flow.cylc'
 contains_ok "${TEST_NAME_BASE}-strict.stderr" <<'__ERR__'
 WARNING - multiple sequences out of bounds for initial cycle point 20000101T0000Z:
 	R1/P0Y/19960101T0000Z, R1/P0Y/19970101T0000Z, R1/P0Y/19980101T0000Z,
diff --git a/tests/functional/validate/70-no-clock-int-cycle.t b/tests/functional/validate/70-no-clock-int-cycle.t
index 174e488e693..b4e6d4d677c 100644
--- a/tests/functional/validate/70-no-clock-int-cycle.t
+++ b/tests/functional/validate/70-no-clock-int-cycle.t
@@ -20,7 +20,7 @@
 
 set_test_number 2
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
    cycling mode = integer
    initial cycle point = 1
@@ -29,9 +29,9 @@ cat >'suite.rc' <<'__SUITE_RC__'
        c1 = wall_clock(offset=P0Y)
    [[graph]]
       R/^/P1 = "@c1 & foo[-P1] => foo"
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_fail "${TEST_NAME_BASE}-val" cylc validate 'suite.rc'
+run_fail "${TEST_NAME_BASE}-val" cylc validate 'flow.cylc'
 
 contains_ok "${TEST_NAME_BASE}-val.stderr" <<'__END__'
 SuiteConfigError: clock xtriggers need date-time cycling: c1 = wall_clock(offset=P0Y)
diff --git a/tests/functional/validate/71-platform-basic.t b/tests/functional/validate/71-platform-basic.t
index 43c94bba4d0..d14bf7dcfc3 100755
--- a/tests/functional/validate/71-platform-basic.t
+++ b/tests/functional/validate/71-platform-basic.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -22,7 +22,7 @@ set_test_number 1
 
 TEST_NAME="${TEST_NAME_BASE}-val"
 
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [meta]
     title = "Test validation of simple multiple inheritance"
 
@@ -36,6 +36,6 @@ R1 = """foo"""
 platform=lewis
 
 
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_ok "${TEST_NAME}" cylc validate suite.rc
+run_ok "${TEST_NAME}" cylc validate flow.cylc
diff --git a/tests/functional/validate/73-xtrigger-names.t b/tests/functional/validate/73-xtrigger-names.t
index decea8c1247..5dc557e1c6b 100644
--- a/tests/functional/validate/73-xtrigger-names.t
+++ b/tests/functional/validate/73-xtrigger-names.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
 # Copyright (C) NIWA & British Crown (Met Office) & Contributors.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -23,27 +23,27 @@ set_test_number 3
 TEST_NAME="${TEST_NAME_BASE}-val"
 
 # test a valid xtrigger
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     initial cycle point = 2000
     [[xtriggers]]
         foo = wall_clock():PT1S
     [[graph]]
         R1 = @foo => bar
-__SUITE_RC__
-run_ok "${TEST_NAME}-valid" cylc validate suite.rc
+__FLOW_CONFIG__
+run_ok "${TEST_NAME}-valid" cylc validate flow.cylc
 
 # test an invalid xtrigger
-cat >'suite.rc' <<'__SUITE_RC__'
+cat >'flow.cylc' <<'__FLOW_CONFIG__'
 [scheduling]
     initial cycle point = 2000
     [[xtriggers]]
         foo-1 = wall_clock():PT1S
     [[graph]]
             R1 = @foo-1 => bar
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_fail "${TEST_NAME}-invalid" cylc validate suite.rc
+run_fail "${TEST_NAME}-invalid" cylc validate flow.cylc
 grep_ok 'Invalid xtrigger name' "${TEST_NAME}-invalid.stderr"
 
 exit
diff --git a/tests/functional/xtriggers/02-persistence/suite.rc b/tests/functional/xtriggers/02-persistence/flow.cylc
similarity index 100%
rename from tests/functional/xtriggers/02-persistence/suite.rc
rename to tests/functional/xtriggers/02-persistence/flow.cylc
diff --git a/tests/functional/xtriggers/03-sequence.t b/tests/functional/xtriggers/03-sequence.t
index 22cd3e153f0..a2ba02a0d00 100644
--- a/tests/functional/xtriggers/03-sequence.t
+++ b/tests/functional/xtriggers/03-sequence.t
@@ -23,7 +23,7 @@
 set_test_number 3
 
 # Test suite uses built-in 'echo' xtrigger.
-init_suite "${TEST_NAME_BASE}" << '__SUITE_RC__'
+init_suite "${TEST_NAME_BASE}" << '__FLOW_CONFIG__'
 [cylc]
    cycle point format = %Y
 [scheduling]
@@ -42,9 +42,9 @@ init_suite "${TEST_NAME_BASE}" << '__SUITE_RC__'
 [runtime]
    [[start]]
    [[foo]]
-__SUITE_RC__
+__FLOW_CONFIG__
 
-run_ok "${TEST_NAME_BASE}-val" cylc validate 'suite.rc'
+run_ok "${TEST_NAME_BASE}-val" cylc validate 'flow.cylc'
 
 # Run suite; it will stall waiting on the never-satisfied xtriggers.
 cylc run "${SUITE_NAME}"
diff --git a/tests/integration/test_examples.py b/tests/integration/test_examples.py
index 4414238f89f..bf577fd8fb0 100644
--- a/tests/integration/test_examples.py
+++ b/tests/integration/test_examples.py
@@ -32,7 +32,7 @@
 @pytest.mark.asyncio
 async def test_create_flow(flow, run_dir):
     """Use the flow fixture to create workflows on the file system."""
-    # Ensure a suite.rc file gets written out
+    # Ensure a flow.cylc file gets written out
     reg = flow({
         'scheduling': {
             'graph': {
@@ -41,10 +41,10 @@ async def test_create_flow(flow, run_dir):
         }
     })
     suite_dir = run_dir / reg
-    suite_rc = suite_dir / 'suite.rc'
+    flow_file = suite_dir / 'flow.cylc'
 
     assert suite_dir.exists()
-    assert suite_rc.exists()
+    assert flow_file.exists()
 
 
 @pytest.mark.asyncio
diff --git a/tests/integration/utils/flow_tools.py b/tests/integration/utils/flow_tools.py
index f8c0847b309..66a0211baba 100644
--- a/tests/integration/utils/flow_tools.py
+++ b/tests/integration/utils/flow_tools.py
@@ -28,6 +28,7 @@
 from uuid import uuid1
 
 from cylc.flow import CYLC_LOG
+from cylc.flow.suite_files import SuiteFiles
 from cylc.flow.scheduler import Scheduler
 from cylc.flow.scheduler_cli import (
     RunOptions,
@@ -35,7 +36,7 @@
 )
 from cylc.flow.suite_status import StopMode
 
-from .flow_writer import suiterc
+from .flow_writer import flow_config_str
 from . import _poll_file
 
 
@@ -47,9 +48,9 @@ def _make_flow(run_dir, test_dir, conf, name=None):
     flow_run_dir.mkdir()
     reg = str(flow_run_dir.relative_to(run_dir))
     if isinstance(conf, dict):
-        conf = suiterc(conf)
-    with open((flow_run_dir / 'suite.rc'), 'w+') as suiterc_file:
-        suiterc_file.write(conf)
+        conf = flow_config_str(conf)
+    with open((flow_run_dir / SuiteFiles.FLOW_FILE), 'w+') as flow_file:
+        flow_file.write(conf)
     return reg
 
 
@@ -68,7 +69,8 @@ def _make_scheduler(reg, is_restart=False, **opts):
 @asynccontextmanager
 async def _run_flow(run_dir, caplog, scheduler, level=logging.INFO):
     """Start a scheduler."""
-    contact = (run_dir / scheduler.suite / '.service' / 'contact')
+    contact = (run_dir / scheduler.suite / SuiteFiles.Service.DIRNAME /
+               SuiteFiles.Service.CONTACT)
     if caplog:
         caplog.set_level(level, CYLC_LOG)
     task = None
diff --git a/tests/integration/utils/flow_writer.py b/tests/integration/utils/flow_writer.py
index 604e509902c..3cafa99b5ab 100644
--- a/tests/integration/utils/flow_writer.py
+++ b/tests/integration/utils/flow_writer.py
@@ -69,7 +69,7 @@ def _write_section(name, section, level):
     return ret
 
 
-def suiterc(conf):
+def flow_config_str(conf):
     """Convert a configuration dictionary into cylc/parsec format.
 
     Args:
diff --git a/tests/integration/utils/test_flow_tools.py b/tests/integration/utils/test_flow_tools.py
index 8424ac6fdba..577e13266bd 100644
--- a/tests/integration/utils/test_flow_tools.py
+++ b/tests/integration/utils/test_flow_tools.py
@@ -27,6 +27,6 @@ def test_flow(run_dir, flow, one_conf):
     """It should create a flow in the run directory."""
     reg = flow(one_conf)
     assert Path(run_dir / reg).exists()
-    assert Path(run_dir / reg / 'suite.rc').exists()
-    with open(Path(run_dir / reg / 'suite.rc'), 'r') as suiterc:
-        assert 'scheduling' in suiterc.read()
+    assert Path(run_dir / reg / 'flow.cylc').exists()
+    with open(Path(run_dir / reg / 'flow.cylc'), 'r') as flow_file:
+        assert 'scheduling' in flow_file.read()
diff --git a/tests/integration/utils/test_flow_writer.py b/tests/integration/utils/test_flow_writer.py
index 9f8fa01b379..46c62f2b379 100644
--- a/tests/integration/utils/test_flow_writer.py
+++ b/tests/integration/utils/test_flow_writer.py
@@ -27,7 +27,7 @@
     _write_header,
     _write_setting,
     _write_section,
-    suiterc
+    flow_config_str
 )
 
 
@@ -97,9 +97,9 @@ def test_write_section():
     ]
 
 
-def test_suiterc():
+def test_flow_config_str():
     """It should write out entire cylc configuration files."""
-    assert suiterc(
+    assert flow_config_str(
         {
             'foo': {
                 'bar': {
diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
index 721504aacef..920cf259c0a 100644
--- a/tests/unit/conftest.py
+++ b/tests/unit/conftest.py
@@ -38,7 +38,7 @@ def _cycling_mode(integer=True):
 
 @pytest.fixture
 def mock_glbl_cfg(tmp_path, monkeypatch):
-    """A Pytest fixture for fiddling globalrc values.
+    """A Pytest fixture for fiddling global config values.
 
     * Hacks the specified `glbl_cfg` object.
     * Can be called multiple times within a test function.
@@ -50,7 +50,7 @@ def mock_glbl_cfg(tmp_path, monkeypatch):
             E.G. if you want to hack the `glbl_cfg` in
             `cylc.flow.scheduler` you would provide
             `cylc.flow.scheduler.glbl_cfg`
-        rc_string (str):
+        global_config (str):
             The globlal configuration as a multi-line string.
 
     Example:
@@ -68,12 +68,12 @@ def test_something(mock_glbl_cfg):
 
     """
     # TODO: modify Parsec so we can use StringIO rather than a temp file.
-    def _mock(pypath, rc_string):
+    def _mock(pypath, global_config):
         nonlocal tmp_path, monkeypatch
-        global_rc_path = tmp_path / 'flow.rc'
-        global_rc_path.write_text(rc_string)
+        global_config_path = tmp_path / 'global.cylc'
+        global_config_path.write_text(global_config)
         glbl_cfg = ParsecConfig(SPEC)
-        glbl_cfg.loadcfg(global_rc_path)
+        glbl_cfg.loadcfg(global_config_path)
 
         def _inner(cached=False):
             nonlocal glbl_cfg
diff --git a/tests/unit/parsec/__init__.py b/tests/unit/parsec/__init__.py
index 101b7818f37..90d7eed6260 100644
--- a/tests/unit/parsec/__init__.py
+++ b/tests/unit/parsec/__init__.py
@@ -40,7 +40,7 @@ def _inner(spec, conf):
         Returns:
             cylc.flow.parsec.ParsecConfig
         """
-        filepath = tmp_path / 'cfg.rc'
+        filepath = tmp_path / 'cfg.cylc'
         with open(filepath, 'w+') as filehandle:
             filehandle.write(conf)
         cfg = ParsecConfig(spec)
diff --git a/tests/unit/parsec/test_config_node.py b/tests/unit/parsec/test_config_node.py
index b5d88042e23..b190224fda0 100644
--- a/tests/unit/parsec/test_config_node.py
+++ b/tests/unit/parsec/test_config_node.py
@@ -6,7 +6,7 @@
 @pytest.fixture(scope='module')
 def basic_config():
     """A basic config with a file, section and setting."""
-    with Conf('file.rc') as file_:
+    with Conf('file.cylc') as file_:
         with Conf('section') as section:
             setting = Conf('setting')
         return (file_, section, setting)
@@ -15,7 +15,7 @@ def basic_config():
 def test_config_node(basic_config):
     """It should associate parents & children in a tree."""
     file_, section, setting = basic_config
-    assert file_.name == 'file.rc'
+    assert file_.name == 'file.cylc'
     assert file_._parent is None
     assert file_._children == {'section': section}
 
@@ -31,7 +31,7 @@ def test_config_node(basic_config):
 def test_config_str(basic_config):
     """A node should str as a relative path from its parent node.."""
     file_, section, setting = basic_config
-    assert str(file_) == 'file.rc'
+    assert str(file_) == 'file.cylc'
     assert str(section) == '[section]'
     assert str(setting) == 'setting'
 
@@ -39,15 +39,15 @@ def test_config_str(basic_config):
 def test_config_repr(basic_config):
     """A node should repr as a full path."""
     file_, section, setting = basic_config
-    assert repr(file_) == 'file.rc'
-    assert repr(section) == 'file.rc[section]'
-    assert repr(setting) == 'file.rc[section]setting'
+    assert repr(file_) == 'file.cylc'
+    assert repr(section) == 'file.cylc[section]'
+    assert repr(setting) == 'file.cylc[section]setting'
 
 
 @pytest.fixture(scope='module')
 def many_setting():
     """A config containing a user-definable setting."""
-    with Conf('file.rc') as file_:
+    with Conf('file.cylc') as file_:
         Conf('<setting>')  # __MANY__
     return file_
 
@@ -58,13 +58,13 @@ def test_many_setting(many_setting):
     assert setting.name == '__MANY__'
     assert setting.display_name == '<setting>'
     assert str(setting) == '<setting>'
-    assert repr(setting) == 'file.rc|<setting>'
+    assert repr(setting) == 'file.cylc|<setting>'
 
 
 @pytest.fixture(scope='module')
 def many_section():
     """A config containing a user-definable section."""
-    with Conf('file.rc') as file_:
+    with Conf('file.cylc') as file_:
         with Conf('<section>'):
             Conf('setting')
     return file_
@@ -76,10 +76,10 @@ def test_many_section(many_section):
     assert section.name == '__MANY__'
     assert section.display_name == '<section>'
     assert str(section) == '[<section>]'
-    assert repr(section) == 'file.rc[<section>]'
+    assert repr(section) == 'file.cylc[<section>]'
     setting = list(section)[0]
     assert str(setting) == 'setting'
-    assert repr(setting) == 'file.rc[<section>]setting'
+    assert repr(setting) == 'file.cylc[<section>]setting'
 
 
 @pytest.fixture(scope='module')
diff --git a/tests/unit/test_config.py b/tests/unit/test_config.py
index 8f78c0ace69..57478ecb13a 100644
--- a/tests/unit/test_config.py
+++ b/tests/unit/test_config.py
@@ -110,8 +110,8 @@ def test_xfunction_imports(self, mock_glbl_cfg):
                 # NB: we are not returning a lambda, instead we have a scalar
                 f.write("""name_a_tree = lambda: 'jacaranda'""")
                 f.flush()
-            suite_rc = Path(temp_dir, "suite.rc")
-            with suite_rc.open(mode="w") as f:
+            flow_file = Path(temp_dir, "flow.cylc")
+            with flow_file.open(mode="w") as f:
                 f.write("""
     [scheduling]
         initial cycle point = 2018-01-01
@@ -143,8 +143,8 @@ def test_xfunction_import_error(self, mock_glbl_cfg):
                 # NB: we are not returning a lambda, instead we have a scalar
                 f.write("""caiman = lambda: True""")
                 f.flush()
-            suite_rc = Path(temp_dir, "suite.rc")
-            with suite_rc.open(mode="w") as f:
+            flow_file = Path(temp_dir, "flow.cylc")
+            with flow_file.open(mode="w") as f:
                 f.write("""
     [scheduling]
         initial cycle point = 2018-01-01
@@ -176,8 +176,8 @@ def test_xfunction_attribute_error(self, mock_glbl_cfg):
                 # NB: we are not returning a lambda, instead we have a scalar
                 f.write("""toucan = lambda: True""")
                 f.flush()
-            suite_rc = Path(temp_dir, "suite.rc")
-            with suite_rc.open(mode="w") as f:
+            flow_file = Path(temp_dir, "flow.cylc")
+            with flow_file.open(mode="w") as f:
                 f.write("""
     [scheduling]
         initial cycle point = 2018-01-01
@@ -209,8 +209,8 @@ def test_xfunction_not_callable(self, mock_glbl_cfg):
                 # NB: we are not returning a lambda, instead we have a scalar
                 f.write("""not_callable = 42""")
                 f.flush()
-            suite_rc = Path(temp_dir, "suite.rc")
-            with suite_rc.open(mode="w") as f:
+            flow_file = Path(temp_dir, "flow.cylc")
+            with flow_file.open(mode="w") as f:
                 f.write("""
     [scheduling]
         initial cycle point = 2018-01-01
@@ -260,7 +260,7 @@ def test_family_inheritance_and_quotes(self, mock_glbl_cfg):
 
 def test_queue_config_repeated(caplog, tmp_path):
     """Test repeated assignment to same queue."""
-    suiterc_content = """
+    flow_file_content = """
 [scheduling]
    [[queues]]
        [[[q1]]]
@@ -276,9 +276,9 @@ def test_queue_config_repeated(caplog, tmp_path):
        inherit = A, B
    [[y]]
     """
-    suite_rc = tmp_path / "suite.rc"
-    suite_rc.write_text(suiterc_content)
-    config = SuiteConfig(suite="qtest", fpath=suite_rc.absolute())
+    flow_file = tmp_path / "flow.cylc"
+    flow_file.write_text(flow_file_content)
+    config = SuiteConfig(suite="qtest", fpath=flow_file.absolute())
     log = caplog.messages[0].split('\n')
     assert log[0] == "Queue configuration warnings:"
     assert log[1] == "+ q2: ignoring x (already assigned to a queue)"
@@ -286,7 +286,7 @@ def test_queue_config_repeated(caplog, tmp_path):
 
 def test_queue_config_not_used_not_defined(caplog, tmp_path):
     """Test task not defined vs no used, in queue config."""
-    suiterc_content = """
+    flow_file_content = """
 [scheduling]
    [[queues]]
        [[[q1]]]
@@ -302,9 +302,9 @@ def test_queue_config_not_used_not_defined(caplog, tmp_path):
    [[foo]]
    # bar not even defined
     """
-    suite_rc = tmp_path / "suite.rc"
-    suite_rc.write_text(suiterc_content)
-    config = SuiteConfig(suite="qtest", fpath=suite_rc.absolute())
+    flow_file = tmp_path / "flow.cylc"
+    flow_file.write_text(flow_file_content)
+    config = SuiteConfig(suite="qtest", fpath=flow_file.absolute())
     log = caplog.messages[0].split('\n')
     assert log[0] == "Queue configuration warnings:"
     assert log[1] == "+ q1: ignoring foo (task not used in the graph)"
diff --git a/tests/unit/test_config_upgrader.py b/tests/unit/test_config_upgrader.py
index c166a360a4e..452e9d5c3cf 100644
--- a/tests/unit/test_config_upgrader.py
+++ b/tests/unit/test_config_upgrader.py
@@ -25,7 +25,7 @@
 
 # A set of tasks the host_to_platform_upgrader should be able to deal with
 # without hiccuping.
-SUITERC = """
+FLOW_CONFIG = """
 [runtime]
     [[alpha]]
         [[[remote]]]
@@ -62,7 +62,7 @@
 
 # A set of tasks which should return a validation failure because no
 # matching platform can be found.
-NOPLATFORM_SUITERC = """
+NOPLATFORM_FLOW_CONFIG = """
 [runtime]
     [[beta]]
     # => validation failure (no matching platform)
@@ -74,7 +74,7 @@
 
 # A set of tasks which should return a python error because Cylc 7 & 8
 # Settings have both been used.
-BADSUITERC = """
+BAD_FLOW_CONFIG = """
 [runtime]
     [[kappa]]
         platform = sugar
@@ -84,7 +84,7 @@
             batch system = slurm
 """
 
-FUNC_SUITERC = """
+FUNC_FLOW_CONFIG = """
 [runtime]
     [[delta]]
         [[[remote]]]
@@ -104,7 +104,7 @@
 
 # A global rc file (platforms section) defining platforms which look a bit
 # like those on a major Cylc user site.
-GLOBALRC = """
+GLOBAL_CONFIG = """
 [platforms]
     [[desktop[0-9]{2}|laptop[0-9]{2}]]
         # hosts = platform name (default)
@@ -142,34 +142,34 @@ def memoized_func(*args):
 
 
 @memoize
-def set_up(global_rc_str, suite_rc_str, tmp_path):
+def set_up(global_config, flow_config, tmp_path):
     """Set up configs before and after the upgrader has been run on them,
     and return these to the test function
 
     Args:
-        global_rc_str (str):
-            String of a `global.rc` file
-        suite_rc_str (str):
-            String of a `suite.rc` file
+        global_config (str):
+            String of a `global.cylc` file
+        flow_config (str):
+            String of a `flow.cylc` file
         tmp_path (path object):
             A path to a temporary location to put some files.
     """
     # Set Up Config File
-    globalrc = tmp_path / 'flow.rc'
-    suiterc = tmp_path / 'suite.rc'
-    with open(str(globalrc), 'w') as file_handle:
-        file_handle.write(global_rc_str)
-    with open(str(suiterc), 'w') as file_handle:
-        file_handle.write(suite_rc_str)
+    global_file = tmp_path / 'global.cylc'
+    flow_file = tmp_path / 'flow.cylc'
+    with open(str(global_file), 'w') as file_handle:
+        file_handle.write(global_config)
+    with open(str(flow_file), 'w') as file_handle:
+        file_handle.write(flow_config)
     os.environ['CYLC_CONF_PATH'] = str(tmp_path)
-    suite_config = RawSuiteConfig(str(suiterc), None, None)
+    suite_config = RawSuiteConfig(str(flow_file), None, None)
     upgraded_suite_config = host_to_platform_upgrader(suite_config.sparse)
     return (suite_config, upgraded_suite_config)
 
 
 def test_upgrader_fn_not_used(tmp_path):
     # Check that nothing happens if nothing needs to.
-    before, after = set_up(GLOBALRC, SUITERC, tmp_path)
+    before, after = set_up(GLOBAL_CONFIG, FLOW_CONFIG, tmp_path)
     assert after['runtime']['nu'] == before.get(['runtime', 'nu'])
 
 
@@ -185,7 +185,7 @@ def test_upgrader_fn_not_used(tmp_path):
 )
 def test_upgrader_function(tmp_path, task, output):
     # Check that upgradable configs are returned with platform settings added
-    before, after = set_up(GLOBALRC, SUITERC, tmp_path)
+    before, after = set_up(GLOBAL_CONFIG, FLOW_CONFIG, tmp_path)
     assert after['runtime'][task]['platform'] == output
 
     # Assure ourselves that the old items have been removed
@@ -202,14 +202,14 @@ def test_upgrader_fails_mixed_syntax(tmp_path):
     """Check that mixed Cylc 7/8 configs return error messages.
     """
     with pytest.raises(PlatformLookupError):
-        set_up(GLOBALRC, BADSUITERC, tmp_path)
+        set_up(GLOBAL_CONFIG, BAD_FLOW_CONFIG, tmp_path)
 
 
 def test_upgrader_fails_noplatform(tmp_path):
     """Check that an error is raised if no matchin Platfrom is found
     """
     with pytest.raises(PlatformLookupError):
-        set_up(GLOBALRC, NOPLATFORM_SUITERC, tmp_path)
+        set_up(GLOBAL_CONFIG, NOPLATFORM_FLOW_CONFIG, tmp_path)
 
 
 def test_upgrader_where_host_is_function(tmp_path, caplog):
@@ -219,7 +219,7 @@ def test_upgrader_where_host_is_function(tmp_path, caplog):
     """
     import logging
     caplog.set_level(logging.DEBUG)
-    set_up(GLOBALRC, FUNC_SUITERC, tmp_path)
+    set_up(GLOBAL_CONFIG, FUNC_FLOW_CONFIG, tmp_path)
     debug_tasks_messages = [
         (f"The host setting of '{name}' is a function: "
          f"Cylc will try to upgrade this task on job submission.")
diff --git a/tests/unit/test_pathutil.py b/tests/unit/test_pathutil.py
index 090a208beb6..19dc2c36bf2 100644
--- a/tests/unit/test_pathutil.py
+++ b/tests/unit/test_pathutil.py
@@ -16,14 +16,12 @@
 """Tests for "cylc.flow.pathutil"."""
 
 from unittest import TestCase
-from unittest.mock import call, patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 import pytest
 import os
 import logging
 
-from tests.unit.conftest import mock_glbl_cfg
-
 from cylc.flow.pathutil import (
     get_remote_suite_run_dir,
     get_remote_suite_run_job_dir,
@@ -33,7 +31,7 @@
     get_suite_run_log_dir,
     get_suite_run_log_name,
     get_suite_run_pub_db_name,
-    get_suite_run_rc_dir,
+    get_suite_run_config_log_dir,
     get_suite_run_share_dir,
     get_suite_run_work_dir,
     get_suite_test_log_name,
@@ -111,7 +109,7 @@ def test_get_suite_run_dirs(self, mocked_platform):
             (get_suite_run_dir, ''),
             (get_suite_run_job_dir, '/log/job'),
             (get_suite_run_log_dir, '/log/suite'),
-            (get_suite_run_rc_dir, '/log/suiterc'),
+            (get_suite_run_config_log_dir, '/log/flow-config'),
             (get_suite_run_share_dir, '/share'),
             (get_suite_run_work_dir, '/work'),
         ):
@@ -157,7 +155,7 @@ def test_get_suite_run_names(self, mocked_platform):
         '',
         '/log/suite',
         '/log/job',
-        '/log/suiterc',
+        '/log/flow-config',
         '/share',
         '/work'
     ]
diff --git a/tests/unit/test_rundb.py b/tests/unit/test_rundb.py
index 01cd5aecb7b..e686daae718 100644
--- a/tests/unit/test_rundb.py
+++ b/tests/unit/test_rundb.py
@@ -25,7 +25,7 @@
 from cylc.flow.rundb import CylcSuiteDAO
 
 
-GLOBALRC = """
+GLOBAL_CONFIG = """
 [platforms]
     [[desktop[0-9]{2}|laptop[0-9]{2}]]
         # hosts = platform name (default)
@@ -198,8 +198,8 @@ def test_upgrade_hold_swap():
 def test_upgrade_to_platforms(mock_glbl_cfg):
     """Test upgrader logic for platforms in the database.
     """
-    # Set up the globalrc
-    mock_glbl_cfg('cylc.flow.rundb.glbl_cfg', GLOBALRC)
+    # Set up the global config
+    mock_glbl_cfg('cylc.flow.rundb.glbl_cfg', GLOBAL_CONFIG)
 
     # task name, cycle, user_at_host, batch_system
     initial_data = [
diff --git a/tests/unit/test_suite_files.py b/tests/unit/test_suite_files.py
index d99b6452c42..b5c9a2b40bb 100644
--- a/tests/unit/test_suite_files.py
+++ b/tests/unit/test_suite_files.py
@@ -26,7 +26,7 @@ def get_register_test_cases():
     """Test cases for suite_files.register function."""
     return [
         # 1 no parameters provided, current directory is not a symlink,
-        # and contains a valid suite.rc
+        # and contains a valid flow.cylc
         (None,  # reg
          None,  # source
          False,  # redirect,
@@ -41,7 +41,7 @@ def get_register_test_cases():
          None  # expected part of exception message
          ),
         # 2 suite name provided, current directory is not a symlink,
-        # and contains a valid suite.rc
+        # and contains a valid flow.cylc
         ("super-suite-2",  # reg
          None,  # source
          False,  # redirect,
@@ -55,10 +55,10 @@ def get_register_test_cases():
          None,  # expected exception
          None  # expected part of exception message
          ),
-        # 3 suite name and directory location of suite.rc provided,
-        # current directory is not a symlink, and contains a valid suite.rc
+        # 3 suite name and directory location of flow.cylc provided,
+        # current directory is not a symlink, and contains a valid flow.cylc
         ("suite3",  # reg
-         "/home/user/cylc-run/suite3/suite.rc",  # source
+         "/home/user/cylc-run/suite3/flow.cylc",  # source
          False,  # redirect,
          "/home/user/cylc-run/suite3",  # cwd
          False,  # isabs
@@ -70,8 +70,8 @@ def get_register_test_cases():
          None,  # expected exception
          None  # expected part of exception message
          ),
-        # 4 suite name and directory location of suite.rc provided,
-        # current directory is not a symlink, but the suite.rc does not
+        # 4 suite name and directory location of flow.cylc provided,
+        # current directory is not a symlink, but the flow.cylc does not
         # exist
         ("suite4",  # reg
          "/home/user/cylc-run/suite4/suite.txt",  # source
@@ -84,7 +84,7 @@ def get_register_test_cases():
          None,  # expected symlink
          "suite4",  # expected return value
          SuiteServiceFileError,  # expected exception
-         "no suite.rc"  # expected part of exception message
+         "no flow.cylc"  # expected part of exception message
          ),
         # 5 the source directory and the resolved symlink for $SOURCE in
         # $SOURCE/.service are not the same directory. No redirect
@@ -106,7 +106,7 @@ def get_register_test_cases():
         # $SOURCE/.service are not the same directory. The redirect
         # flag is true, so it must simply delete the old source link
         ("suite6",  # reg
-         "/home/user/cylc-run/suite6/suite.rc",  # source
+         "/home/user/cylc-run/suite6/flow.cylc",  # source
          True,  # redirect,
          "/home/user/cylc-run/suite6",  # cwd
          False,  # isabs
@@ -123,7 +123,7 @@ def get_register_test_cases():
         # flag is true. But the resolved orig_source's parent directory,
         # is the source directory. So the symlink must be '..'
         ("suite7",  # reg
-         "/home/user/cylc-run/suite7/suite.rc",  # source
+         "/home/user/cylc-run/suite7/flow.cylc",  # source
          True,  # redirect,
          "/home/user/cylc-run/suite7",  # cwd
          False,  # isabs
@@ -137,7 +137,7 @@ def get_register_test_cases():
          ),
         # 8 fails to readlink, resulting in a new symlink created
         ("suite8",  # reg
-         "/home/user/cylc-run/suite8/suite.rc",  # source
+         "/home/user/cylc-run/suite8/flow.cylc",  # source
          False,  # redirect,
          "/home/user/cylc-run/suite8",  # cwd
          False,  # isabs