diff --git a/unified/extractor/src/extractor.rs b/unified/extractor/src/extractor.rs
index 137b2f3c0e4..eb6f06eb259 100644
--- a/unified/extractor/src/extractor.rs
+++ b/unified/extractor/src/extractor.rs
@@ -9,7 +9,7 @@ mod swift;
 
 #[derive(Args)]
 pub struct Options {
-    /// Sets a custom source achive folder
+    /// Sets a custom source archive folder
     #[arg(long)]
     source_archive_dir: PathBuf,
 
@@ -23,7 +23,7 @@ pub struct Options {
 }
 
 pub fn run(options: Options) -> std::io::Result<()> {
-    codeql_extractor::extractor::set_tracing_level("ql");
+    codeql_extractor::extractor::set_tracing_level("unified");
 
     let extractor = simple::Extractor {
         prefix: "unified".to_string(),
@@ -31,7 +31,7 @@ pub fn run(options: Options) -> std::io::Result<()> {
             swift::language_spec(),
         ],
         trap_dir: options.output_dir,
-        trap_compression: trap::Compression::from_env("CODEQL_QL_TRAP_COMPRESSION"),
+        trap_compression: trap::Compression::from_env("CODEQL_EXTRACTOR_UNIFIED_OPTION_TRAP_COMPRESSION"),
         source_archive_dir: options.source_archive_dir,
         file_lists: vec![options.file_list],
     };
diff --git a/unified/extractor/src/generator.rs b/unified/extractor/src/generator.rs
index ee65da7a600..ce1f37144a4 100644
--- a/unified/extractor/src/generator.rs
+++ b/unified/extractor/src/generator.rs
@@ -15,7 +15,7 @@ pub struct Options {
 }
 
 pub fn run(options: Options) -> std::io::Result<()> {
-    codeql_extractor::extractor::set_tracing_level("ql");
+    codeql_extractor::extractor::set_tracing_level("unified");
 
     let languages = vec![Language {
         name: "Swift".to_owned(),
@@ -23,5 +23,5 @@ pub fn run(options: Options) -> std::io::Result<()> {
         desugar: None,
     }];
 
-    generate(languages, options.dbscheme, options.library, "run ql/unified/scripts/create-extractor-pack.sh")
+    generate(languages, options.dbscheme, options.library, "run unified/scripts/create-extractor-pack.sh")
 }
diff --git a/unified/ql/lib/unified.dbscheme b/unified/ql/lib/unified.dbscheme
index 026d4add415..c580e8e6927 100644
--- a/unified/ql/lib/unified.dbscheme
+++ b/unified/ql/lib/unified.dbscheme
@@ -1,6 +1,6 @@
 // CodeQL database schema for Swift
 // Automatically generated from the tree-sitter grammar; do not edit
-// To regenerate, run ql/unified/scripts/create-extractor-pack.sh
+// To regenerate, run unified/scripts/create-extractor-pack.sh
 
 /*- Files and folders -*/