diff --git a/README.md b/README.md
index 1c21fa064a..cddbd8875a 100644
--- a/README.md
+++ b/README.md
@@ -121,7 +121,7 @@ For describing tests which we want to run we use __contexts__. A context has the
     image[/scenario][@bots#bots_pr][@owner/project/ref]
 
 where items have the following meaning:
-- image: Name of the image on which tests should run (e.g. 'fedora-testing').
+- image: Name of the image on which tests should run (e.g. 'fedora-coreos').
 - scenario: Name of a specific test. This is specific for each separate project and
   is passed verbatim to 'test/run' in `$TEST_SCENARIO`.
 - bots_pr: Number of pull request that exists in bots repository. When specified,
@@ -131,28 +131,28 @@ where items have the following meaning:
 - ref: Reference in the project (usually branch) (e.g. 'rhel-8.2'). Default is
   the project's primary branch.
 
-For example, context for scenario 'firefox' on 'fedora-testing' is:
+For example, context for scenario 'firefox' on 'fedora-coreos' is:
 
-    fedora-testing/firefox
+    fedora-coreos/firefox
 
 If we want to trigger it on 'cockpit-project/cockpit':
 
-    fedora-testing/firefox@cockpit-project/cockpit
+    fedora-coreos/firefox@cockpit-project/cockpit
 
 If we want to also not run it on the primary branch, but on 'rhel-8-0' branch:
 
-    fedora-testing/firefox@cockpit-project/cockpit/rhel-8-0
+    fedora-coreos/firefox@cockpit-project/cockpit/rhel-8-0
 
-If we want to run tests on 'fedora-testing' but with bots from pull request '169':
+If we want to run tests on 'fedora-coreos' but with bots from pull request '169':
 
-    fedora-testing@bots#169
+    fedora-coreos@bots#169
 
 ### Retrying a failed test
 
-If you want to run the "fedora-testing" testsuite again for pull
+If you want to run the "fedora-coreos" testsuite again for pull
 request #1234 of cockpit-project/cockpit, run tests-trigger like so:
 
-    ./tests-trigger --repo cockpit-project/cockpit 1234 fedora-testing
+    ./tests-trigger --repo cockpit-project/cockpit 1234 fedora-coreos
 
 You can also invoke bots/tests/trigger from any project checkout, in which case
 you don't need the explicit `--repo` -- it will default to the GitHub origin of
@@ -183,21 +183,21 @@ tests-trigger reads the repo. This has to be set per cockpit project.
 Test images are refreshed automatically once per week, and even if the
 last refresh has failed, the machines wait one week before trying again.
 
-If you want the machines to refresh the fedora-testing image immediately,
+If you want the machines to refresh the fedora-coreos image immediately,
 run image-trigger like so:
 
-    ./image-trigger fedora-testing
+    ./image-trigger fedora-coreos
 
 ### Creating new images for a pull request
 
 If as part of some new feature you need to change the content of some
 or all images, you can ask the machines to create those images.
 
-If you want to have a new fedora-testing image for pull request #1234, add
+If you want to have a new fedora-coreos image for pull request #1234, add
 a bullet point to that pull request's description like so, and add the
 "bot" label to the pull request.
 
-    * [ ] image-refresh fedora-testing
+    * [ ] image-refresh fedora-coreos
 
 The machines will post comments to the pull request about their
 progress and at the end there will be links to commits with the new
diff --git a/test-failure-policy b/test-failure-policy
index aee12c2f5e..551e5a7035 100755
--- a/test-failure-policy
+++ b/test-failure-policy
@@ -179,7 +179,7 @@ def check_known_issue(api, trace, image):
 # The idea is to combine repeated errors into fewer comments by
 # editing them and keeping all relevant information.
 #
-# For this we keep one comment per context (e.g. 'fedora-testing')
+# For this we keep one comment per context (e.g. 'fedora-coreos')
 # and divide that into sections, one each per error description / trace.
 # In each section, we keep the error description / trace as well as
 # the number of recorded events, the first occurrence and the last 10
diff --git a/tests-policy b/tests-policy
index e7fb83ed13..821eed68f5 100755
--- a/tests-policy
+++ b/tests-policy
@@ -200,7 +200,7 @@ def check_known_issue(api, trace, image):
 # The idea is to combine repeated errors into fewer comments by
 # editing them and keeping all relevant information.
 #
-# For this we keep one comment per context (e.g. 'fedora-testing')
+# For this we keep one comment per context (e.g. 'fedora-coreos')
 # and divide that into sections, one each per error description / trace.
 # In each section, we keep the error description / trace as well as
 # the number of recorded events, the first occurrence and the last 10