diff --git a/.jenkins.d/20-tests.sh b/.jenkins.d/20-tests.sh
index 512842b..ebb429f 100755
--- a/.jenkins.d/20-tests.sh
+++ b/.jenkins.d/20-tests.sh
@@ -8,7 +8,7 @@
     security unlock-keychain -p named-data
 fi
 
-ndnsec-keygen "/tmp/jenkins/$NODE_NAME" | ndnsec-install-cert -
+ndnsec key-gen "/tmp/jenkins/$NODE_NAME" | ndnsec cert-install -
 
 # https://github.com/google/sanitizers/wiki/AddressSanitizerFlags
 ASAN_OPTIONS="color=always"
diff --git a/docs/FAQ.rst b/docs/FAQ.rst
index 21efead..bcc0225 100644
--- a/docs/FAQ.rst
+++ b/docs/FAQ.rst
@@ -107,11 +107,12 @@
 
 ::
 
-    ndnsec-keygen /`whoami` | ndnsec-install-cert -
+    ndnsec key-gen /$(whoami) | ndnsec cert-install -
 
-Note that the argument to ndnsec-key will be the identity name of the new key (in this case,
-``/your-username``). Identity names are hierarchical NDN names and may have multiple components
-(e.g.  ``/ndn/ucla/edu/alice``). You may create additional keys and identities as you see fit.
+Note that the argument to ``ndnsec key-gen`` will be the identity name of the new key (in this
+case, ``/your-username``). Identity names are hierarchical NDN names and may have multiple
+components (e.g.  ``/ndn/ucla/edu/alice``). You may create additional keys and identities as
+needed.
 
 **Exporting the NDN certificate to a file**:
 
@@ -121,5 +122,5 @@
 ::
 
     sudo mkdir -p /usr/local/etc/ndn/keys
-    ndnsec-cert-dump -i /`whoami` > default.ndncert
+    ndnsec cert-dump -i /$(whoami) > default.ndncert
     sudo mv default.ndncert /usr/local/etc/ndn/keys/default.ndncert
diff --git a/launchd/README.md b/launchd/README.md
index 6b453aa..b04d55f 100644
--- a/launchd/README.md
+++ b/launchd/README.md
@@ -66,7 +66,7 @@
       mkdir -p /usr/local/var/lib/ndn/nfd/.ndn; \
       export HOME=/usr/local/var/lib/ndn/nfd; \
       echo tpm=tpm-file > /usr/local/var/lib/ndn/nfd/.ndn/client.conf; \
-      ndnsec-keygen /localhost/daemons/nfd | ndnsec-install-cert -; \
+      ndnsec key-gen /localhost/daemons/nfd | ndnsec cert-install -; \
     '
 
 ### Configuring NFD's security
@@ -111,7 +111,7 @@
     sudo -s -- '\
       mkdir -p /usr/local/etc/ndn/certs || true; \
       export HOME=/usr/local/var/lib/ndn/nfd; \
-      ndnsec-dump-certificate -i /localhost/daemons/nfd > \
+      ndnsec cert-dump -i /localhost/daemons/nfd > \
         /usr/local/etc/ndn/certs/localhost_daemons_nfd.ndncert; \
       '
 
diff --git a/nfd.conf.sample.in b/nfd.conf.sample.in
index 9e8d22b..00f3bf6 100644
--- a/nfd.conf.sample.in
+++ b/nfd.conf.sample.in
@@ -281,17 +281,17 @@
     ;
     ; 1. Generate and install a self-signed identity certificate:
     ;
-    ;      ndnsec-keygen /`whoami` | ndnsec-install-cert -
+    ;      ndnsec key-gen /$(whoami) | ndnsec cert-install -
     ;
-    ; Note that the argument to ndnsec-key will be the identity name of the
-    ; new key (in this case, /your-username). Identities are hierarchical NDN
-    ; names and may have multiple components (e.g. `/ndn/ucla/edu/alice`).
-    ; You may create additional keys and identities as you see fit.
+    ; Note that the argument to 'ndnsec key-gen' will be the identity name of
+    ; the new key (in this case, /your-username). Identities are hierarchical
+    ; NDN names and may have multiple components (e.g., /ndn/ucla/edu/alice).
+    ; You may create additional keys and identities as needed.
     ;
-    ; 2. Dump the NDN certificate to a file:
+    ; 2. Export the certificate to a file:
     ;
-    ;      sudo mkdir -p @SYSCONFDIR@/ndn/keys/
-    ;      ndnsec-cert-dump -i /`whoami` >  default.ndncert
+    ;      ndnsec cert-dump -i /$(whoami) > default.ndncert
+    ;      sudo mkdir -p @SYSCONFDIR@/ndn/keys
     ;      sudo mv default.ndncert @SYSCONFDIR@/ndn/keys/default.ndncert
     ;
     ; The "certfile" field below specifies the default key directory for
diff --git a/tools/nfd-start.sh b/tools/nfd-start.sh
index 5283f19..449c108 100755
--- a/tools/nfd-start.sh
+++ b/tools/nfd-start.sh
@@ -37,9 +37,9 @@
   exit 1
 fi
 
-if ! ndnsec-get-default &>/dev/null
+if ! ndnsec get-default &>/dev/null
 then
-  ndnsec-keygen /localhost/operator | ndnsec-install-cert -
+  ndnsec key-gen /localhost/operator | ndnsec cert-install -
 fi
 
 if ! sudo true