diff --git a/cmd/kinflate/longerDemo/customization.md b/cmd/kinflate/longerDemo/customization.md
index 88c9c747b..fdb5a46cd 100644
--- a/cmd/kinflate/longerDemo/customization.md
+++ b/cmd/kinflate/longerDemo/customization.md
@@ -17,7 +17,7 @@ Add a _namePrefix_ specification to the manifest:
 <!-- @addNamePrefix @test -->
 ```
 cd $TUT_APP
-kinflate setnameprefix acme-
+kinflate set nameprefix acme-
 ```
 
 Run it:
diff --git a/cmd/kinflate/longerDemo/editor.md b/cmd/kinflate/longerDemo/editor.md
index fdef012c2..743e59253 100644
--- a/cmd/kinflate/longerDemo/editor.md
+++ b/cmd/kinflate/longerDemo/editor.md
@@ -53,7 +53,7 @@ Add it to the manifest:
 
 <!-- @addResource @test -->
 ```
-kinflate addresource configMap.yaml
+kinflate add resource configMap.yaml
 ```
 
 <!-- @showItAgain @test -->
@@ -65,7 +65,7 @@ Add one that isn't there:
 
 <!-- @addNoResource @test -->
 ```
-kinflate addresource does_not_exist.yaml
+kinflate add resource does_not_exist.yaml
 ```
 
 Try to reinit
diff --git a/cmd/kinflate/shortDemo.md b/cmd/kinflate/shortDemo.md
index c140b543e..54532271b 100644
--- a/cmd/kinflate/shortDemo.md
+++ b/cmd/kinflate/shortDemo.md
@@ -17,6 +17,8 @@ TUT_DIR=$HOME/kinflate_demo
 mkdir -p $TUT_DIR
 ```
 
+Download the app:
+
 <!-- @downloadTutorialHelloApp @test -->
 ```
 cd $TUT_DIR
@@ -24,20 +26,34 @@ git clone https://github.com/kinflate/tuthello
 cd tuthello
 ```
 
+Customize the base application by specifying a prefix that will be applied to
+all resource names:
+
 <!-- @customizeApp @test -->
 ```
-kinflate setnameprefix acme-
+kinflate set nameprefix acme-
 ```
 
+Confirm that the edit happened:
+
 <!-- @confirmEdit @test -->
 ```
-grep namePrefix Kube-manifest.yaml
+grep --context=3 namePrefix Kube-manifest.yaml
 ```
 
-<!-- @applyToCluster @test -->
+Confirm that the prefix appears in the output:
+
+<!-- @confirmResourceNames @test -->
+```
+kinflate inflate -f . | grep --context=3 acme-
+```
+
+Optionally apply to a cluster:
+
+<!-- @applyToCluster -->
 ```
 kinflate inflate -f . | kubectl apply -f -
 ```
 
-This fork of the app repository could be
-committed to a private repo.  Rebase as desired.
+This fork of the app repository could be committed to a private repo.  Rebase as
+desired.