diff --git a/Makefile b/Makefile
index 18281a5..1279fbe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 SHELL := /bin/bash -euo pipefail
-export PATH := $(V23_ROOT)/release/go/bin:node_modules/.bin:$(V23_ROOT)/third_party/cout/node/bin:clients/shell/go/bin:$(PATH)
+export PATH := $(JIRI_ROOT)/release/go/bin:node_modules/.bin:$(JIRI_ROOT)/third_party/cout/node/bin:clients/shell/go/bin:$(PATH)
 export GOPATH := $(shell pwd)/clients/shell/go:$(GOPATH)
-export VDLPATH := $(shell pwd)/clients/shell/go/src:$(V23_ROOT)/release/go/src
+export VDLPATH := $(shell pwd)/clients/shell/go/src:$(JIRI_ROOT)/release/go/src
 GO := v23 go
 
 # This target causes any target files to be deleted if the target task fails.
@@ -84,18 +84,18 @@
 
 .PHONY: deploy-production
 deploy-production: build-web-assets
-	make -C $(V23_ROOT)/infrastructure/deploy chat-production
+	make -C $(JIRI_ROOT)/infrastructure/deploy chat-production
 
 .PHONY: deploy-staging
 deploy-staging: build-web-assets
-	make -C $(V23_ROOT)/infrastructure/deploy chat-staging
+	make -C $(JIRI_ROOT)/infrastructure/deploy chat-staging
 
 node_modules: package.json
 	npm prune
 	npm install
-	# Link Vanadium from V23_ROOT.
+	# Link Vanadium from JIRI_ROOT.
 	rm -rf ./node_modules/vanadium
-	cd "$(V23_ROOT)/release/javascript/core" && npm link
+	cd "$(JIRI_ROOT)/release/javascript/core" && npm link
 	npm link vanadium
 	touch node_modules
 
@@ -183,7 +183,7 @@
 # command so that we can then reference these vars in the Vanadium extension
 # and our prova command.
 test-web-runner: APP_FRAME := "./build/index.html?mtname=$(V23_NAMESPACE)"
-test-web-runner: VANADIUM_JS := $(V23_ROOT)/release/javascript/core
+test-web-runner: VANADIUM_JS := $(JIRI_ROOT)/release/javascript/core
 test-web-runner: BROWSER_OPTS := --options="--load-extension=$(VANADIUM_JS)/extension/build-test/,--ignore-certificate-errors,--enable-logging=stderr" $(BROWSER_OPTS)
 test-web-runner:
 	$(MAKE) -C $(VANADIUM_JS)/extension clean
@@ -199,15 +199,15 @@
 # This test takes additional environment variables (typically temporary)
 # - GOOGLE_BOT_USERNAME and GOOGLE_BOT_PASSWORD (To sign into Google/Chrome)
 # - CHROME_WEBDRIVER (The path to the chrome web driver)
-# - WORKSPACE (optional, defaults to $V23_ROOT/release/projects/chat)
+# - WORKSPACE (optional, defaults to $JIRI_ROOT/release/projects/chat)
 # - TEST_URL (optional, defaults to https://chat.staging.v.io)
 # - NO_XVFB (optional, defaults to using Xvfb. Set to true to watch the test.)
 # - BUILD_EXTENSION (optional, defaults to using the live one. Set to true to
 #                    use a local build of the Vanadium extension.)
 #
 # In addition, this test requires that maven, Xvfb, and xvfb-run be installed.
-# The HTML report will be in $V23_ROOT/release/projects/chat/htmlReports
-WORKSPACE ?= $(V23_ROOT)/release/projects/chat
+# The HTML report will be in $JIRI_ROOT/release/projects/chat/htmlReports
+WORKSPACE ?= $(JIRI_ROOT)/release/projects/chat
 TEST_URL ?= https://chat.staging.v.io
 ifndef NO_XVFB
 	XVFB := TMPDIR=/tmp xvfb-run -s '-ac -screen 0 1024x768x24'
@@ -223,7 +223,7 @@
 endif
 	WORKSPACE=$(WORKSPACE) $(XVFB) \
 	  mvn test \
-	  -f=$(V23_ROOT)/release/projects/chat/clients/web/test/ui/pom.xml \
+	  -f=$(JIRI_ROOT)/release/projects/chat/clients/web/test/ui/pom.xml \
 	  -Dtest=ChatUITest \
 	  -DchromeDriverBin=$(CHROME_WEBDRIVER) \
 	  -DhtmlReportsRelativePath=htmlReports \
diff --git a/README.md b/README.md
index a6aa199..520ceb4 100644
--- a/README.md
+++ b/README.md
@@ -21,11 +21,11 @@
 ### Running the shell client
 
 These instructions assume you have an up-to-date [Vanadium development
-environment][vanadium-installation] inside `$V23_ROOT`.
+environment][vanadium-installation] inside `$JIRI_ROOT`.
 
 In order to run the shell client:
 
-    cd $V23_ROOT/release/projects/chat
+    cd $JIRI_ROOT/release/projects/chat
     make run-shell
 
 This will generate Vanadium credentials (a new principal and a blessing) the
@@ -36,7 +36,7 @@
 
 If you'd only like to build the binary, not run it:
 
-    cd $V23_ROOT/release/projects/chat
+    cd $JIRI_ROOT/release/projects/chat
     make build-shell
 
 <a name="architecture"></a>
@@ -217,7 +217,7 @@
 will need to get an identity from the identity server:
 
     export V23_CREDENTIALS=/tmp/vanadium-credentials
-    $V23_ROOT/release/go/bin/principal seekblessings
+    $JIRI_ROOT/release/go/bin/principal seekblessings
 
 Then run the binary and pass in the v23.namespace.root and v23.proxy flags.
 
diff --git a/clients/web/test/ui/pom.xml b/clients/web/test/ui/pom.xml
index 5fe189e..7fe7eda 100644
--- a/clients/web/test/ui/pom.xml
+++ b/clients/web/test/ui/pom.xml
@@ -61,7 +61,7 @@
                 <goals><goal>add-source</goal></goals>
                 <configuration>
                     <sources>
-                        <source>${env.V23_ROOT}/release/javascript/core/test/ui/</source>
+                        <source>${env.JIRI_ROOT}/release/javascript/core/test/ui/</source>
                     </sources>
                 </configuration>
             </execution>
diff --git a/tools/services.sh b/tools/services.sh
index 5899623..25cf82a 100755
--- a/tools/services.sh
+++ b/tools/services.sh
@@ -7,7 +7,7 @@
 # Generate identities and starts daemons for chat app host.
 # TODO(nlacasse): Consider re-writing this in Go.
 
-source $V23_ROOT/release/projects/chat/tools/shell.sh
+source $JIRI_ROOT/release/projects/chat/tools/shell.sh
 
 trap at_exit INT TERM EXIT
 
@@ -29,7 +29,7 @@
 
   make vanadium-binaries
 
-  local -r VANADIUM_BIN="${V23_ROOT}/release/go/bin"
+  local -r VANADIUM_BIN="${JIRI_ROOT}/release/go/bin"
 
   # Generate a self-signed identity to run identityd as.
   local -r VANADIUM_CREDENTIALS=$(shell::tmp_dir)