diff --git a/black.r2.yml b/black.r2.yml
new file mode 100644
index 0000000000000000000000000000000000000000..322cde15f5f96923c079a7a9eba8bb45b57e524c
--- /dev/null
+++ b/black.r2.yml
@@ -0,0 +1,14 @@
+files:
+    template: ./python/code_quality/black/black.yml
+    documentation: ./python/code_quality/black/README.md
+data:
+    description: "Run black on a package"
+    icon: âš«
+    public: true
+    labels:
+        - Lint
+        - Utilities
+        - Code Quality
+        - Python
+    license: MIT
+    deprecated: false
diff --git a/python/quality/black/README.md b/python/code_quality/black/README.md
similarity index 100%
rename from python/quality/black/README.md
rename to python/code_quality/black/README.md
diff --git a/python/quality/black/black.yml b/python/code_quality/black/black.yml
similarity index 94%
rename from python/quality/black/black.yml
rename to python/code_quality/black/black.yml
index f32c5986b18351f43a77c785557aea9e37cfa723..77a917dd75ac9586a5894061dec11e860b38d8e3 100644
--- a/python/quality/black/black.yml
+++ b/python/code_quality/black/black.yml
@@ -1,6 +1,6 @@
 black:
     image: python:latest
-    stage: quality
+    stage: code_quality
     script:
         - python --version  # Debug
         - python -m venv venv --upgrade-deps || python -m venv venv
diff --git a/python/quality/black/black.r2.yml b/python/quality/black/black.r2.yml
deleted file mode 100644
index 915d102cdd6703bc9f60a2146217210ac2d210c9..0000000000000000000000000000000000000000
--- a/python/quality/black/black.r2.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-files:
-    template: ./black_code_formatter.yml
-    documentation: ./README.md
-data:
-    description: "Run black on a package"
-    icon: âš«
-    public: true
-    labels:
-        - black
-        - python
-        - quality
-    license: MIT
-    deprecated: false