diff --git a/Makefile b/Makefile
index e24b1f1..1901f2f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 GOPATH := $(JIRI_ROOT)/release/javascript/core/go
 VDLPATH := $(JIRI_ROOT)/release/go/src:$(GOPATH)/src
 GOBIN := $(JIRI_ROOT)/release/javascript/core/go/bin
-VGO := GOPATH="$(GOPATH)" VDLPATH="$(VDLPATH)" v23 go
+VGO := GOPATH="$(GOPATH)" VDLPATH="$(VDLPATH)" jiri go
 GO_FILES := $(shell find go/src $(JIRI_ROOT)/release/go/src/v.io -name "*.go")
 
 NODE_MODULE_JS_FILES := $(shell find node_modules -name *.js | sed 's/ /\\ /')
@@ -321,7 +321,7 @@
 endif
 
 check-that-npm-is-in-path:
-	@which npm > /dev/null || { echo "npm is not in the path. Did you remember to run 'v23 profile install nodejs'?"; exit 1; }
+	@which npm > /dev/null || { echo "npm is not in the path. Did you remember to run 'jiri profile install nodejs'?"; exit 1; }
 
 .PHONY: all build clean dependency-check lint test
 .PHONY: test-integration test-integration-node test-integration-browser
diff --git a/extension/Makefile b/extension/Makefile
index 6dd6ac6..4c6f602 100644
--- a/extension/Makefile
+++ b/extension/Makefile
@@ -17,7 +17,7 @@
 
 define COMPILE-NACL-PLUGIN
 	mkdir -p $(dir $2)
-	GOROOT= JIRI_PROFILE=nacl v23 go build -o $2 $1
+	GOROOT= JIRI_PROFILE=nacl jiri go build -o $2 $1
 endef
 
 all: vanadium.zip
@@ -149,7 +149,7 @@
 	@npm install --quiet
 
 check-that-npm-is-in-path:
-	@which npm > /dev/null || { echo "npm is not in the path. Did you remember to run 'v23 profile install nodejs'?"; exit 1; }
+	@which npm > /dev/null || { echo "npm is not in the path. Did you remember to run 'jiri profile install nodejs'?"; exit 1; }
 
 .PHONY: all build build-dev clean dependency-check gen-vdl lint