diff --git a/manpages/conf.py b/manpages/conf.py
index 95c4f8d..d707354 100644
--- a/manpages/conf.py
+++ b/manpages/conf.py
@@ -29,7 +29,6 @@
 needs_sphinx = '4.0'
 extensions = []
 
-templates_path = ['_templates']
 exclude_patterns = ['Thumbs.db', '.DS_Store']
 
 
@@ -39,11 +38,11 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('ndn-dissect',   'ndn-dissect',   'NDN packet format inspector',                [], 1),
-    ('ndndump',       'ndndump',       'traffic analysis tool',                      [], 8),
-    ('ndnpeek',       'ndnpeek',       'simple consumer to send one Interest and receive one Data', [], 1),
-    ('ndnpoke',       'ndnpoke',       'simple producer to publish one Data',        [], 1),
-    ('ndnping',       'ndnping',       'reachability testing client',                [], 1),
-    ('ndnpingserver', 'ndnpingserver', 'reachability testing server',                [], 1),
-    ('ndnserve',      'ndnserve',      'producer program with content segmentation', [], 1),
+    ('ndndissect',    'ndndissect',    'NDN packet format inspector',               [], 1),
+    ('ndndump',       'ndndump',       'NDN traffic analysis tool',                 [], 8),
+    ('ndnpeek',       'ndnpeek',       'simple NDN consumer to send one Interest and receive one Data', [], 1),
+    ('ndnpoke',       'ndnpoke',       'simple NDN producer to publish one Data',   [], 1),
+    ('ndnping',       'ndnping',       'NDN reachability testing client',           [], 1),
+    ('ndnpingserver', 'ndnpingserver', 'NDN reachability testing server',           [], 1),
+    ('ndnserve',      'ndnserve',      'NDN producer with content segmentation',    [], 1),
 ]
diff --git a/manpages/ndn-dissect.rst b/manpages/ndndissect.rst
similarity index 81%
rename from manpages/ndn-dissect.rst
rename to manpages/ndndissect.rst
index fbdb751..856d476 100644
--- a/manpages/ndn-dissect.rst
+++ b/manpages/ndndissect.rst
@@ -1,15 +1,15 @@
-ndn-dissect
-===========
+ndndissect
+==========
 
 Synopsis
 --------
 
-**ndn-dissect** [**-h**] [**-c**] [**-V**] [*file*]
+**ndndissect** [**-h**] [**-c**] [**-V**] [*file*]
 
 Description
 -----------
 
-:program:`ndn-dissect` is an NDN packet format inspector.
+:program:`ndndissect` is an NDN packet format inspector.
 It reads zero or more NDN packets from either an input file or the standard
 input, and displays the Type-Length-Value (TLV) structure of those packets
 on the standard output.
@@ -40,4 +40,4 @@
 
 Inspect the response to Interest ``/app1/video``::
 
-    ndnpeek /app1/video | ndn-dissect
+    ndnpeek /app1/video | ndndissect