diff --git a/packages/cli/src/endo.js b/packages/cli/src/endo.js
index c400d785f7..3bde8853c4 100644
--- a/packages/cli/src/endo.js
+++ b/packages/cli/src/endo.js
@@ -86,7 +86,7 @@ export const main = async rawArgs => {
       [],
     )
     .option('-b,--bundle <bundle>', 'Bundle name for the caplet program')
-    .option('--UNSAFE <path>', 'Or path of an unsafe plugin to run in Node.js')
+    .option('--UNCONFINED <path>', 'Or path of an unsafe plugin to run in Node.js')
     .option(
       '-p,--powers <endowment>',
       'Endowment to give the worklet (a name, NONE, HOST, or ENDO)',
@@ -95,7 +95,7 @@ export const main = async rawArgs => {
       const {
         as: partyNames,
         bundle: bundleName,
-        UNSAFE: importPath,
+        UNCONFINED: importPath,
         powers: powersName = 'NONE',
       } = cmd.opts();
       const { run } = await import('./run.js');
@@ -113,7 +113,7 @@ export const main = async rawArgs => {
     .command('make [file]')
     .description('make a plugin or a worker caplet (worklet)')
     .option('-b,--bundle <bundle>', 'Bundle for a web page to open')
-    .option('--UNSAFE <file>', 'Path to a Node.js module')
+    .option('--UNCONFINED <file>', 'Path to a Node.js module')
     .option(
       '-a,--as <party>',
       'Pose as named party (as named by current party)',
@@ -131,7 +131,7 @@ export const main = async rawArgs => {
     )
     .action(async (filePath, cmd) => {
       const {
-        UNSAFE: importPath,
+        UNCONFINED: importPath,
         name: resultName,
         bundle: bundleName,
         worker: workerName = 'NEW',
diff --git a/packages/cli/src/make.js b/packages/cli/src/make.js
index 06c7c52f48..e63f2b9262 100644
--- a/packages/cli/src/make.js
+++ b/packages/cli/src/make.js
@@ -24,7 +24,7 @@ export const makeCommand = async ({
   powersName,
 }) => {
   if (filePath !== undefined && importPath !== undefined) {
-    console.error('Specify only one of [file] or --UNSAFE <file>');
+    console.error('Specify only one of [file] or --UNCONFINED <file>');
     process.exitCode = 1;
     return;
   }
@@ -34,7 +34,7 @@ export const makeCommand = async ({
     bundleName === undefined
   ) {
     console.error(
-      'Specify at least one of [file], --bundle <file>, or --UNSAFE <file>',
+      'Specify at least one of [file], --bundle <file>, or --UNCONFINED <file>',
     );
     process.exitCode = 1;
     return;
diff --git a/packages/cli/src/run.js b/packages/cli/src/run.js
index 8a0f1641a0..9f34d79d01 100644
--- a/packages/cli/src/run.js
+++ b/packages/cli/src/run.js
@@ -29,7 +29,7 @@ export const run = async ({
     importPath === undefined &&
     bundleName === undefined
   ) {
-    console.error('Specify at least one of --file, --bundle, or --UNSAFE');
+    console.error('Specify at least one of --file, --bundle, or --UNCONFINED');
     process.exitCode = 1;
     return;
   }
@@ -51,7 +51,7 @@ export const run = async ({
 
       if (importPath !== undefined) {
         if (bundleName !== undefined) {
-          console.error('Must specify either --bundle or --UNSAFE, not both');
+          console.error('Must specify either --bundle or --UNCONFINED, not both');
           process.exitCode = 1;
           return;
         }
@@ -70,7 +70,7 @@ export const run = async ({
         let bundle;
         if (bundleName !== undefined) {
           if (importPath !== undefined) {
-            console.error('Must specify either --bundle or --UNSAFE, not both');
+            console.error('Must specify either --bundle or --UNCONFINED, not both');
             process.exitCode = 1;
             return;
           }