diff --git a/Makefile b/Makefile
index 9fc0a37..0bbadf1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-export PATH:=$(V23_ROOT)/third_party/cout/node/bin:$(CURDIR)/node_modules/.bin:$(PATH)
+export PATH:=$(JIRI_ROOT)/third_party/cout/node/bin:$(CURDIR)/node_modules/.bin:$(PATH)
 export GOPATH=$(CURDIR)/go
 export VDLPATH=$(GOPATH)
 
@@ -26,7 +26,7 @@
 # TODO(nlacasse): Remove this and put vanadium.js in package.json once we can get
 # it from npm
 browser/third-party/npm/vanadium@0.0.1: node_modules
-	cd $(V23_ROOT)/release/javascript/core && \
+	cd $(JIRI_ROOT)/release/javascript/core && \
 	:;jspm link -y npm:vanadium@0.0.1
 	cd browser && \
 	:;jspm install -y -l npm:vanadium@0.0.1
diff --git a/shell.sh b/shell.sh
index 700ea6a..9627f07 100755
--- a/shell.sh
+++ b/shell.sh
@@ -9,9 +9,9 @@
 main() {
   if [[ -d "${DIR}/credentials" ]]
   then
-    ${V23_ROOT}/release/go/bin/agentd bash
+    ${JIRI_ROOT}/release/go/bin/agentd bash
   else
-    ${V23_ROOT}/release/go/bin/agentd bash -c "${V23_ROOT}/release/go/bin/principal seekblessings && exec bash"
+    ${JIRI_ROOT}/release/go/bin/agentd bash -c "${JIRI_ROOT}/release/go/bin/principal seekblessings && exec bash"
   fi
 }