diff --git a/ql/extractor/Cargo.toml b/ql/extractor/Cargo.toml
index 4f9b4aebef0..57ffc5c5ad6 100644
--- a/ql/extractor/Cargo.toml
+++ b/ql/extractor/Cargo.toml
@@ -18,4 +18,4 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
 rayon = "1.7.0"
 regex = "1.7.2"
-codeql-extractor = { path = "../../shared/extractor" }
+codeql-extractor = { path = "../../shared/tree-sitter-extractor" }
diff --git a/ruby/extractor/Cargo.toml b/ruby/extractor/Cargo.toml
index 439d86d4c41..ced118609fd 100644
--- a/ruby/extractor/Cargo.toml
+++ b/ruby/extractor/Cargo.toml
@@ -17,4 +17,4 @@ rayon = "1.5.0"
 regex = "1.7.1"
 encoding = "0.2"
 lazy_static = "1.4.0"
-codeql-extractor = { path = "../../shared/extractor" }
+codeql-extractor = { path = "../../shared/tree-sitter-extractor" }
diff --git a/ruby/extractor/Cross.toml b/ruby/extractor/Cross.toml
index 043f2826a7a..f3ed51aee59 100644
--- a/ruby/extractor/Cross.toml
+++ b/ruby/extractor/Cross.toml
@@ -5,4 +5,4 @@ image = "centos/devtoolset-7-toolchain-centos7"
 # Provide the path to the shared extractor
 # Cross mounts this directory as a volume, so builds inside the docker container
 # can see it.
-volumes = ["__CODEQL-EXTRACTOR=../../shared/extractor"]
+volumes = ["__CODEQL-EXTRACTOR=../../shared/tree-sitter-extractor"]
diff --git a/shared/extractor/.gitignore b/shared/tree-sitter-extractor/.gitignore
similarity index 100%
rename from shared/extractor/.gitignore
rename to shared/tree-sitter-extractor/.gitignore
diff --git a/shared/extractor/Cargo.toml b/shared/tree-sitter-extractor/Cargo.toml
similarity index 100%
rename from shared/extractor/Cargo.toml
rename to shared/tree-sitter-extractor/Cargo.toml
diff --git a/shared/extractor/src/diagnostics.rs b/shared/tree-sitter-extractor/src/diagnostics.rs
similarity index 100%
rename from shared/extractor/src/diagnostics.rs
rename to shared/tree-sitter-extractor/src/diagnostics.rs
diff --git a/shared/extractor/src/extractor.rs b/shared/tree-sitter-extractor/src/extractor.rs
similarity index 100%
rename from shared/extractor/src/extractor.rs
rename to shared/tree-sitter-extractor/src/extractor.rs
diff --git a/shared/extractor/src/file_paths.rs b/shared/tree-sitter-extractor/src/file_paths.rs
similarity index 100%
rename from shared/extractor/src/file_paths.rs
rename to shared/tree-sitter-extractor/src/file_paths.rs
diff --git a/shared/extractor/src/generator/dbscheme.rs b/shared/tree-sitter-extractor/src/generator/dbscheme.rs
similarity index 100%
rename from shared/extractor/src/generator/dbscheme.rs
rename to shared/tree-sitter-extractor/src/generator/dbscheme.rs
diff --git a/shared/extractor/src/generator/language.rs b/shared/tree-sitter-extractor/src/generator/language.rs
similarity index 100%
rename from shared/extractor/src/generator/language.rs
rename to shared/tree-sitter-extractor/src/generator/language.rs
diff --git a/shared/extractor/src/generator/mod.rs b/shared/tree-sitter-extractor/src/generator/mod.rs
similarity index 100%
rename from shared/extractor/src/generator/mod.rs
rename to shared/tree-sitter-extractor/src/generator/mod.rs
diff --git a/shared/extractor/src/generator/ql.rs b/shared/tree-sitter-extractor/src/generator/ql.rs
similarity index 100%
rename from shared/extractor/src/generator/ql.rs
rename to shared/tree-sitter-extractor/src/generator/ql.rs
diff --git a/shared/extractor/src/generator/ql_gen.rs b/shared/tree-sitter-extractor/src/generator/ql_gen.rs
similarity index 100%
rename from shared/extractor/src/generator/ql_gen.rs
rename to shared/tree-sitter-extractor/src/generator/ql_gen.rs
diff --git a/shared/extractor/src/lib.rs b/shared/tree-sitter-extractor/src/lib.rs
similarity index 100%
rename from shared/extractor/src/lib.rs
rename to shared/tree-sitter-extractor/src/lib.rs
diff --git a/shared/extractor/src/node_types.rs b/shared/tree-sitter-extractor/src/node_types.rs
similarity index 100%
rename from shared/extractor/src/node_types.rs
rename to shared/tree-sitter-extractor/src/node_types.rs
diff --git a/shared/extractor/src/options.rs b/shared/tree-sitter-extractor/src/options.rs
similarity index 100%
rename from shared/extractor/src/options.rs
rename to shared/tree-sitter-extractor/src/options.rs
diff --git a/shared/extractor/src/trap.rs b/shared/tree-sitter-extractor/src/trap.rs
similarity index 100%
rename from shared/extractor/src/trap.rs
rename to shared/tree-sitter-extractor/src/trap.rs