diff --git a/.pql/pql-plan.json b/.pql/pql-plan.json
index 097958f0..86a7d610 100644
--- a/.pql/pql-plan.json
+++ b/.pql/pql-plan.json
@@ -1,5 +1,5 @@
 {
-  "exported_at": "2026-05-01T10:08:01Z",
+  "exported_at": "2026-05-01T10:11:15Z",
   "decisions": [
     {
       "id": "D-1",
diff --git a/Makefile b/Makefile
index 074a7953..536cdeba 100644
--- a/Makefile
+++ b/Makefile
@@ -33,9 +33,9 @@ help: ## Show this help.
 .PHONY: run
 run: ## Launch the Flutter desktop app.
 ifeq ($(FLUTTER_OS),linux)
-	GDK_BACKEND=x11 LD_LIBRARY_PATH=$(CURDIR)/native/linux-x64$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} flutter run -d linux --dart-define=CLIDE_WORKSPACE=$(CURDIR)
+	GDK_BACKEND=x11 LD_LIBRARY_PATH=$(CURDIR)/native/linux-x64$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} flutter run -d linux --dart-define=CLIDE_PROJECT=$(CURDIR)
 else
-	flutter run -d $(FLUTTER_OS) --dart-define=CLIDE_WORKSPACE=$(CURDIR)
+	flutter run -d $(FLUTTER_OS) --dart-define=CLIDE_PROJECT=$(CURDIR)
 endif
 
 TESTMODE_CATEGORY ?= all
@@ -46,7 +46,7 @@ run-testmode: ## Launch ClideTestApp (TESTMODE_CATEGORY=toolchain|ipc|extensions
 ifeq ($(FLUTTER_OS),linux)
 	@GDK_BACKEND=x11 LD_LIBRARY_PATH=$(CURDIR)/native/linux-x64$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \
 	  flutter run -d linux \
-	    --dart-define=CLIDE_WORKSPACE=$(CURDIR) \
+	    --dart-define=CLIDE_PROJECT=$(CURDIR) \
 	    --dart-define=CLIDE_TESTMODE=$(TESTMODE_CATEGORY) 2>&1 \
 	  | tee /tmp/clide-testmode.log & PID=$$!; \
 	  (sleep $(TESTMODE_TIMEOUT) && kill $$PID 2>/dev/null) & TIMER=$$!; \
@@ -54,7 +54,7 @@ ifeq ($(FLUTTER_OS),linux)
 	  grep -q '"failed":0' /tmp/clide-testmode.log
 else
 	@flutter run -d $(FLUTTER_OS) \
-	    --dart-define=CLIDE_WORKSPACE=$(CURDIR) \
+	    --dart-define=CLIDE_PROJECT=$(CURDIR) \
 	    --dart-define=CLIDE_TESTMODE=$(TESTMODE_CATEGORY) 2>&1 \
 	  | tee /tmp/clide-testmode.log & PID=$$!; \
 	  (sleep $(TESTMODE_TIMEOUT) && kill $$PID 2>/dev/null) & TIMER=$$!; \
diff --git a/lib/kernel/src/backend_entry.dart b/lib/kernel/src/backend_entry.dart
index b0b4e334..193584cf 100644
--- a/lib/kernel/src/backend_entry.dart
+++ b/lib/kernel/src/backend_entry.dart
@@ -30,7 +30,7 @@ import 'package:clide/src/pql/client.dart';
 class BackendBootMessage {
   const BackendBootMessage({required this.frontendPort, this.hintRoot});
   final SendPort frontendPort;
-  /// Optional path hint for initial toolchain resolution (e.g. CLIDE_WORKSPACE).
+  /// Optional path hint for initial toolchain resolution (e.g. CLIDE_PROJECT).
   /// Used to find project-local binaries like dugite before a project opens.
   final String? hintRoot;
 }
diff --git a/lib/main.dart b/lib/main.dart
index 4386be92..6cb65e13 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -66,7 +66,7 @@ Future<void> main() async {
   // With proper signing (Developer ID), no sandbox or isolate needed.
   final toolchain = Toolchain();
   if (!kIsWeb) {
-    const workspace = String.fromEnvironment('CLIDE_WORKSPACE');
+    const workspace = String.fromEnvironment('CLIDE_PROJECT');
     final root = workspace.isNotEmpty ? workspace : Directory.current.path;
     toolchain.applyResolved(resolveToolchainPaths(root));
   }
diff --git a/lib/test_app.dart b/lib/test_app.dart
index 8ebcada9..f5e34b62 100644
--- a/lib/test_app.dart
+++ b/lib/test_app.dart
@@ -67,7 +67,7 @@ class _ClideTestAppState extends State<ClideTestApp> {
   }
 
   Future<void> _runTests() async {
-    const workspace = String.fromEnvironment('CLIDE_WORKSPACE');
+    const workspace = String.fromEnvironment('CLIDE_PROJECT');
     const category = String.fromEnvironment('CLIDE_TESTMODE');
     final workDir = workspace.isNotEmpty ? workspace : Directory.current.path;