diff --git a/.flake8 b/.flake8
index 49ec5c9c822e..ba9747235819 100644
--- a/.flake8
+++ b/.flake8
@@ -32,7 +32,7 @@ exclude =
     testing/condprofile/condprof/desktop.py,
     testing/condprofile/condprof/runner.py,
     testing/condprofile/condprof/scenarii/heavy.py,
-    testing/condprofile/condprof/scenarii/cold.py,
+    testing/condprofile/condprof/scenarii/settled.py,
     testing/condprofile/condprof/helpers.py,
     testing/jsshell/benchmark.py,
     testing/marionette/mach_commands.py,
diff --git a/testing/condprofile/README.rst b/testing/condprofile/README.rst
index ea67e8719bca..b8c584b0486e 100644
--- a/testing/condprofile/README.rst
+++ b/testing/condprofile/README.rst
@@ -87,7 +87,7 @@ Unlike the profile creator, the client is Python 2 and 3 compatible.
 You can grab a conditioned profile using the client API::
 
    >>> from condprof.client import get_profile
-   >>> get_profile(".", "win64", "cold", "default")
+   >>> get_profile(".", "win64", "settled", "default")
 
 or the **cp-client** script that gets install when you run the
 conditioned profile installer.
diff --git a/testing/condprofile/condprof/client.py b/testing/condprofile/condprof/client.py
index cea8ea9bd5bb..ab56ac635e4f 100644
--- a/testing/condprofile/condprof/client.py
+++ b/testing/condprofile/condprof/client.py
@@ -117,7 +117,7 @@ def main():
     older_change = read_changelog("win64").history()[0]
     task_id = older_change["TASK_ID"]
     target_dir = tempfile.mkdtemp()
-    filename = get_profile(target_dir, "win64", "cold", "default", task_id)
+    filename = get_profile(target_dir, "win64", "settled", "default", task_id)
     print("Profile downloaded and extracted at %s" % filename)
 
 
diff --git a/testing/condprofile/condprof/scenarii/__init__.py b/testing/condprofile/condprof/scenarii/__init__.py
index 0610c9b660bb..e18587f05439 100644
--- a/testing/condprofile/condprof/scenarii/__init__.py
+++ b/testing/condprofile/condprof/scenarii/__init__.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from condprof.scenarii.heavy import heavy
-from condprof.scenarii.cold import cold
+from condprof.scenarii.settled import settled
 
 
-scenarii = {"heavy": heavy, "cold": cold}
+scenarii = {"heavy": heavy, "settled": settled}
diff --git a/testing/condprofile/condprof/scenarii/cold.py b/testing/condprofile/condprof/scenarii/settled.py
similarity index 78%
rename from testing/condprofile/condprof/scenarii/cold.py
rename to testing/condprofile/condprof/scenarii/settled.py
index cff27a5f3126..144db202276f 100644
--- a/testing/condprofile/condprof/scenarii/cold.py
+++ b/testing/condprofile/condprof/scenarii/settled.py
@@ -1,7 +1,7 @@
 import asyncio
 
 
-async def cold(session, options):
+async def settled(session, options):
     # nothing is done, we just settle here for 30 seconds
     await asyncio.sleep(options.get("sleep", 30))
     return {}
diff --git a/testing/condprofile/condprof/tests/test_client.py b/testing/condprofile/condprof/tests/test_client.py
index 1b33f5989880..012318da1389 100644
--- a/testing/condprofile/condprof/tests/test_client.py
+++ b/testing/condprofile/condprof/tests/test_client.py
@@ -47,7 +47,7 @@ class TestClient(unittest.TestCase):
         else:
             num_elmts = 0
 
-        get_profile(self.target, "win64", "cold", "default")
+        get_profile(self.target, "win64", "settled", "default")
 
         # grabbing a profile should generate two files
         self.assertEqual(len(os.listdir(download_dir)), num_elmts + 2)
@@ -57,7 +57,7 @@ class TestClient(unittest.TestCase):
         self.assertEqual(response_calls, 2)
 
         # and we should reuse them without downloading the file again
-        get_profile(self.target, "win64", "cold", "default")
+        get_profile(self.target, "win64", "settled", "default")
 
         # grabbing a profile should not download new stuff
         self.assertEqual(len(os.listdir(download_dir)), num_elmts + 2)