diff --git a/actions/ql/src/codeql-suites/actions-ccr.qls b/actions/ql/src/codeql-suites/actions-code-quality.qls
similarity index 100%
rename from actions/ql/src/codeql-suites/actions-ccr.qls
rename to actions/ql/src/codeql-suites/actions-code-quality.qls
diff --git a/cpp/ql/src/codeql-suites/cpp-ccr.qls b/cpp/ql/src/codeql-suites/cpp-code-quality.qls
similarity index 100%
rename from cpp/ql/src/codeql-suites/cpp-ccr.qls
rename to cpp/ql/src/codeql-suites/cpp-code-quality.qls
diff --git a/csharp/ql/src/codeql-suites/csharp-ccr.qls b/csharp/ql/src/codeql-suites/csharp-code-quality.qls
similarity index 100%
rename from csharp/ql/src/codeql-suites/csharp-ccr.qls
rename to csharp/ql/src/codeql-suites/csharp-code-quality.qls
diff --git a/go/ql/src/codeql-suites/go-ccr.qls b/go/ql/src/codeql-suites/go-code-quality.qls
similarity index 100%
rename from go/ql/src/codeql-suites/go-ccr.qls
rename to go/ql/src/codeql-suites/go-code-quality.qls
diff --git a/java/ql/src/codeql-suites/java-ccr.qls b/java/ql/src/codeql-suites/java-code-quality.qls
similarity index 100%
rename from java/ql/src/codeql-suites/java-ccr.qls
rename to java/ql/src/codeql-suites/java-code-quality.qls
diff --git a/javascript/ql/src/codeql-suites/javascript-ccr.qls b/javascript/ql/src/codeql-suites/javascript-code-quality.qls
similarity index 100%
rename from javascript/ql/src/codeql-suites/javascript-ccr.qls
rename to javascript/ql/src/codeql-suites/javascript-code-quality.qls
diff --git a/misc/scripts/generate-code-scanning-query-list.py b/misc/scripts/generate-code-scanning-query-list.py
index 7cfad6ae2003..dae6e3d38351 100755
--- a/misc/scripts/generate-code-scanning-query-list.py
+++ b/misc/scripts/generate-code-scanning-query-list.py
@@ -31,7 +31,7 @@
 
 # Define which languages and query packs to consider
 languages = [ "actions", "cpp", "csharp", "go", "java", "javascript", "python", "ruby", "swift" ]
-packs = [ "code-scanning", "security-and-quality", "security-extended", "security-experimental", "ccr"]
+packs = [ "code-scanning", "security-and-quality", "security-extended", "security-experimental", "code-quality"]
 
 class CodeQL:
     def __init__(self):
@@ -183,9 +183,9 @@ def subprocess_run(cmd):
                     else:
                         sys.exit("You can use '--ignore-missing-query-packs' to ignore this error")
 
-                # Exception for the CCR suites, which might be empty, but must be resolvable.
-                if pack == 'ccr' and queries_subp == '':
-                    print(f'Warning: skipping empty suite ccr', file=sys.stderr)
+                # Exception for the code-quality suites, which might be empty, but must be resolvable.
+                if pack == 'code-quality' and queries_subp == '':
+                    print(f'Warning: skipping empty suite code-quality', file=sys.stderr)
                     continue
 
                 # Investigate metadata for every query by using 'codeql resolve metadata'
diff --git a/python/ql/src/codeql-suites/python-ccr.qls b/python/ql/src/codeql-suites/python-code-quality.qls
similarity index 100%
rename from python/ql/src/codeql-suites/python-ccr.qls
rename to python/ql/src/codeql-suites/python-code-quality.qls
diff --git a/ruby/ql/src/codeql-suites/ruby-ccr.qls b/ruby/ql/src/codeql-suites/ruby-code-quality.qls
similarity index 100%
rename from ruby/ql/src/codeql-suites/ruby-ccr.qls
rename to ruby/ql/src/codeql-suites/ruby-code-quality.qls
diff --git a/rust/ql/src/codeql-suites/rust-ccr.qls b/rust/ql/src/codeql-suites/rust-code-quality.qls
similarity index 100%
rename from rust/ql/src/codeql-suites/rust-ccr.qls
rename to rust/ql/src/codeql-suites/rust-code-quality.qls
diff --git a/swift/ql/src/codeql-suites/swift-ccr.qls b/swift/ql/src/codeql-suites/swift-code-quality.qls
similarity index 100%
rename from swift/ql/src/codeql-suites/swift-ccr.qls
rename to swift/ql/src/codeql-suites/swift-code-quality.qls