diff --git a/.drone.yml b/.drone.yml
index 6568e53f8..cb162042c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,7 +19,7 @@ steps:
     - cd ../cffi
     - LDFLAGS=-L/usr/local/lib CFLAGS=-I/usr/local/include python3 setup.py sdist build install
     - env LD_LIBRARY_PATH=/usr/local/lib ./notcurses-pydemo > /dev/null
-    - env LD_LIBRARY_PATH=/usr/local/lib ./notcurses-direct-pydemo > /dev/null
+    - env LD_LIBRARY_PATH=/usr/local/lib ./ncdirect-pydemo > /dev/null
     - cd ../rust
     - rustc --version
     - cargo build
@@ -64,7 +64,7 @@ steps:
     - cargo t_all
     - LDFLAGS=-L/usr/local/lib CFLAGS=-I/usr/local/include python3 setup.py sdist build install
     - env LD_LIBRARY_PATH=/usr/local/lib ./notcurses-pydemo > /dev/null
-    - env LD_LIBRARY_PATH=/usr/local/lib ./notcurses-direct-pydemo > /dev/null
+    - env LD_LIBRARY_PATH=/usr/local/lib ./ncdirect-pydemo > /dev/null
 ---
 kind: pipeline
 type: docker
diff --git a/cffi/notcurses-direct-pydemo b/cffi/ncdirect-pydemo
similarity index 100%
rename from cffi/notcurses-direct-pydemo
rename to cffi/ncdirect-pydemo
diff --git a/cffi/notcurses-direct-pydemo.1.md b/cffi/ncdirect-pydemo.1.md
similarity index 60%
rename from cffi/notcurses-direct-pydemo.1.md
rename to cffi/ncdirect-pydemo.1.md
index 6e994934d..2cbd1d50b 100644
--- a/cffi/notcurses-direct-pydemo.1.md
+++ b/cffi/ncdirect-pydemo.1.md
@@ -1,20 +1,20 @@
-% notcurses-direct-pydemo(1)
+% ncdirect-pydemo(1)
 % nick black <nickblack@linux.com>
 % v1.6.20
 
 # NAME
 
-notcurses-direct-pydemo - Verify that the ncdirect Python wrappers work
+ncdirect-pydemo - Verify that the ncdirect Python wrappers work
 
 # SYNOPSIS
 
-**notcurses-direct-pydemo**
+**ncdirect-pydemo**
 
 # DESCRIPTION
 
-**notcurses-direct-pydemo** dumps some stylized output to the attached terminal
+**ncdirect-pydemo** dumps some stylized output to the attached terminal
 using the notcurses Python module's "direct mode" capability (see
-**notcurses-direct(3)**. This output is a minimal means of verifying that
+**notcurses_direct(3)**. This output is a minimal means of verifying that
 the module is correctly installed and can be used in the current environment.
 
 For a more full-featured demonstration, see **notcurses-demo(1)**.
@@ -33,4 +33,4 @@ Notcurses supports only Python 3.
 **notcurses-pydemo(1)**,
 **python(1)**,
 **notcurses(3)**,
-**notcurses-direct(3)**
+**notcurses_direct(3)**
diff --git a/cffi/notcurses-pydemo.1.md b/cffi/notcurses-pydemo.1.md
index 038928e4f..e17a87e9d 100644
--- a/cffi/notcurses-pydemo.1.md
+++ b/cffi/notcurses-pydemo.1.md
@@ -29,6 +29,6 @@ Notcurses supports only Python 3.
 # SEE ALSO
 
 **notcurses-demo(1)**,
-**notcurses-direct-pydemo(1)**,
+**ncdirect-pydemo(1)**,
 **python(1)**,
 **notcurses(3)**
diff --git a/cffi/setup.py b/cffi/setup.py
index 52f82dafa..935a1bf60 100644
--- a/cffi/setup.py
+++ b/cffi/setup.py
@@ -10,8 +10,8 @@ class ManPageGenerator(install):
         outfile = 'notcurses-pydemo.1'
         pypandoc.convert_file(os.path.join(here, 'notcurses-pydemo.1.md'), 'man', outputfile=outfile, extra_args=['-s'])
         files.append(outfile)
-        outfile = 'notcurses-direct-pydemo.1'
-        pypandoc.convert_file(os.path.join(here, 'notcurses-direct-pydemo.1.md'), 'man', outputfile=outfile, extra_args=['-s'])
+        outfile = 'ncdirect-pydemo.1'
+        pypandoc.convert_file(os.path.join(here, 'ncdirect-pydemo.1.md'), 'man', outputfile=outfile, extra_args=['-s'])
         files.append(outfile)
         # this breaks when using --user without --prefix
         ipage = (os.path.join(self.prefix, 'share', 'man', 'man1'), files)
@@ -36,7 +36,7 @@ setup(
     name="notcurses",
     version="2.2.2",
     packages=['notcurses'],
-    scripts=['notcurses-pydemo', 'notcurses-direct-pydemo'],
+    scripts=['notcurses-pydemo', 'ncdirect-pydemo'],
     package_dir={'': 'src'},
     author="Nick Black",
     author_email="nickblack@linux.com",
diff --git a/doc/man/index.html b/doc/man/index.html
index ec554e667..898de253e 100644
--- a/doc/man/index.html
+++ b/doc/man/index.html
@@ -41,10 +41,10 @@
   <a href="ncplayer.1.html">ncplayer</a>—renders images and video to a terminal<br/>
   <a href="nctetris.1.html">nctetris</a>—Tetris in a terminal<br/>
   <a href="notcurses-demo.1.html">notcurses-demo</a>—shows off some notcurses features<br/>
-  <a href="notcurses-direct-pydemo.1.html">notcurses-direct-pydemo</a>—validates the Python direct-mode wrappers<br/>
   <a href="notcurses-input.1.html">notcurses-input</a>—reads and decodes input events<br/>
-  <a href="notcurses-pydemo.1.html">notcurses-pydemo</a>—validates the Python wrappers<br/>
   <a href="notcurses-tester.1.html">notcurses-tester</a>—unit test driver<br/>
+  <a href="ncdirect-pydemo.1.html">ncdirect-pydemo</a>—validates the Python direct-mode wrappers<br/>
+  <a href="notcurses-pydemo.1.html">notcurses-pydemo</a>—validates the Python wrappers<br/>
   <div style="float:left">
    <h3>C library (section 3)</h3>
    <a href="notcurses_capabilities.3.html">notcurses_capabilities</a>—runtime capability detection<br/>