diff --git a/generate-epub.retro b/generate-epub.retro
index 1a61a86..16682fc 100755
--- a/generate-epub.retro
+++ b/generate-epub.retro
@@ -89,7 +89,9 @@ Then create `META-INF/container.xml`.
   '<navMap>
 } [ file:s:put file:nl ] a:for-each
 
-#0 TOC [ #1 a:fetch over dup dup '____<navPoint_id="CHAP%n"_playOrder="%n"><navLabel><text>Chapter_%n</text></navLabel><content_src="chapters/%s.html"/></navPoint> s:format file:s:put file:nl n:inc ] a:for-each drop
+:a:unpack [ ] a:for-each ;
+
+#1 TOC [ a:unpack 'abc 'acbaaa reorder '____<navPoint_id="CHAP%n"_playOrder="%n"><navLabel><text>Chapter_%n:_%s</text></navLabel><content_src="chapters/%s.html"/></navPoint> s:format file:s:put file:nl n:inc ] a:for-each drop
 
 { '</navMap>
   '</ncx>
@@ -125,12 +127,12 @@ that are used in the book.
 
 '__<manifest> file:s:put file:nl
 '____<item_id="ncx"_href="TOC.ncx"_media-type="application/x-dtbncx+xml"/> file:s:put file:nl
-#0 TOC [ #1 a:fetch over swap '____<item_href="chapters/%s.html"_id="CHAP%n"_media-type="application/xhtml+xml"/> s:format file:s:put file:nl n:inc ] a:for-each
+#1 TOC [ #1 a:fetch over swap '____<item_href="chapters/%s.html"_id="CHAP%n"_media-type="application/xhtml+xml"/> s:format file:s:put file:nl n:inc ] a:for-each
 drop
 '__</manifest> file:s:put file:nl
 
 '__<spine_toc="ncx"> file:s:put file:nl
-#0 TOC [ drop dup '____<itemref_idref="CHAP%n"_linear="yes"/> s:format file:s:put file:nl n:inc ] a:for-each drop
+#1 TOC [ drop dup '____<itemref_idref="CHAP%n"_linear="yes"/> s:format file:s:put file:nl n:inc ] a:for-each drop
 '__</spine> file:s:put file:nl
 ~~~
 
diff --git a/tools/book-chapters.retro b/tools/book-chapters.retro
index d09373d..73daf64 100755
--- a/tools/book-chapters.retro
+++ b/tools/book-chapters.retro
@@ -47,7 +47,7 @@ This contains the list of files for the chapters in the book.
   { 'Errors                         'techniques/errors }
   { 'Lexical_Scope                  'techniques/lexical-scope }
   { 'The_Stacks                     'techniques/the-stacks }
-  { 'Naa                            'internals/nga }
+  { 'The_Nga_Virtual_Machine        'internals/nga }
   { 'Interface_Layers               'internals/interface-layers }
   { 'I/O                            'internals/io }
   { 'Image                          'internals/image }