diff --git a/Makefile b/Makefile
index 585b920..3b9ea40 100644
--- a/Makefile
+++ b/Makefile
@@ -197,11 +197,11 @@
 test: test-shell test-web
 
 test-shell: build-shell
-	# We must pass --veyron.tcp.address=localhost:0, otherwise the chat server
+	# We must pass --v23.tcp.address=localhost:0, otherwise the chat server
 	# will listen on the external IP address of the gce instance, and our
 	# firewall rules prevent connections on unknown ports unless coming from
 	# localhost.
-	$(GO) test chat/... --veyron.tcp.address=localhost:0
+	$(GO) test chat/... --v23.tcp.address=localhost:0
 
 # We use the same test runner as vanadium.js.  It handles starting and stopping
 # all required services (proxy, wspr, mounntabled), and runs tests in chrome
diff --git a/README.md b/README.md
index 74936bf..d64860f 100644
--- a/README.md
+++ b/README.md
@@ -186,8 +186,7 @@
     export V23_CREDENTIALS=/tmp/vanadium-credentials
     $VANADIUM_ROOT/release/go/bin/principal seekblessings
 
-Then run the binary and pass in the veyron.namespace.root and veyron.proxy
-flags.
+Then run the binary and pass in the v23.namespace.root and v23.proxy flags.
 TODO(nlacasse): Update the flag names when they change.
 
     ./clients/shell/bin/chat --mounttable=/localhost:8101 --proxy=proxy
diff --git a/clients/shell/src/chat/channel_test.go b/clients/shell/src/chat/channel_test.go
index 52041fa..39adac9 100644
--- a/clients/shell/src/chat/channel_test.go
+++ b/clients/shell/src/chat/channel_test.go
@@ -57,7 +57,7 @@
 		t.Fatalf("unexpected error: %s", err)
 	}
 
-	rootMT, err := sh.Start("rootMT", nil, "--veyron.tcp.address=127.0.0.1:0")
+	rootMT, err := sh.Start("rootMT", nil, "--v23.tcp.address=127.0.0.1:0")
 	if err != nil {
 		t.Fatalf("failed to start root mount table: %s", err)
 	}
diff --git a/tools/services.sh b/tools/services.sh
index e684b5c..0c6afa3 100755
--- a/tools/services.sh
+++ b/tools/services.sh
@@ -33,22 +33,22 @@
 
   # Generate a self-signed identity to run identityd as.
   local -r VANADIUM_CREDENTIALS=$(shell::tmp_dir)
-  "${VANADIUM_BIN}/principal" seekblessings --veyron.credentials "${VANADIUM_CREDENTIALS}"
+  "${VANADIUM_BIN}/principal" seekblessings --v23.credentials "${VANADIUM_CREDENTIALS}"
 
   local -r PROXYD_ADDR="localhost:8100"
   local -r MOUNTTABLED_ADDR="localhost:8101"
 
-  "${VANADIUM_BIN}/mounttabled" --veyron.tcp.address="${MOUNTTABLED_ADDR}" \
-      --veyron.credentials="${VANADIUM_CREDENTIALS}" \
-      --veyron.tcp.protocol=ws \
+  "${VANADIUM_BIN}/mounttabled" --v23.tcp.address="${MOUNTTABLED_ADDR}" \
+      --v23.credentials="${VANADIUM_CREDENTIALS}" \
+      --v23.tcp.protocol=ws \
       --v=1 --alsologtostderr=true &
 
   # Give the mounttable time to start.
   sleep 2
 
-  "${VANADIUM_BIN}/proxyd" --veyron.namespace.root="/${MOUNTTABLED_ADDR}" \
-      --veyron.credentials="${VANADIUM_CREDENTIALS}" \
-      --veyron.tcp.address="${PROXYD_ADDR}" \
+  "${VANADIUM_BIN}/proxyd" --v23.namespace.root="/${MOUNTTABLED_ADDR}" \
+      --v23.credentials="${VANADIUM_CREDENTIALS}" \
+      --v23.tcp.address="${PROXYD_ADDR}" \
       --name=proxy \
       --v=1 --alsologtostderr=true &