diff --git a/doc/haskell-mode.texi b/doc/haskell-mode.texi
index 68a25d8b7..27c4f1ed8 100644
--- a/doc/haskell-mode.texi
+++ b/doc/haskell-mode.texi
@@ -49,20 +49,20 @@ interpreter (e.g. GHCi).
 @end ifnottex
 
 @menu
-* Introduction::
-* Getting Help and Reporting Bugs::
-* Getting Started::
-* Editing Haskell Code::
-* Unicode support::
-* Indentation::
-* haskell-decl-scan-mode::
-* Compilation::
-* inferior-haskell-mode::
-* haskell-interactive-mode::
-* haskell-cabal-mode::
-* Concept index::
-* Function index::
-* Variable index::
+* Introduction::                    An introduction to Haskell Mode
+* Getting Help and Reporting Bugs:: How to improve Haskell Mode
+* Getting Started::                 How to get started
+* Editing Haskell Code::            How to edit code
+* Unicode support::                 How to use Unicode
+* Indentation::                     Notes about indentation
+* Declaration scanning::            How to navigate in a source file
+* Compilation::                     How to compile
+* Inferior Haskell interpreter::    How to interact with GHCi (1)
+* Interactive Haskell::             How to interact with GHCi (2)
+* Editing Cabal files::             Cabal support
+* Concept index::                   Index of Haskell Mode concepts
+* Function index::                  index of commands
+* Variable index::                  Index of options and types
 @end menu
 
 @ifhtml
@@ -348,8 +348,8 @@ selection mode (without redefining @kbd{C-x},@kbd{C-c},@kbd{C-v}, and
 @kbd{C-z}) by calling @kbd{M-x cua-selection-mode} (or adding
 @code{(cua-selection-mode nil)} to your @code{haskell-mode-hook}).
 
-@node haskell-decl-scan-mode
-@chapter @code{haskell-decl-scan-mode}
+@node Declaration scanning
+@chapter Declaration scannning
 
 @findex turn-on-haskell-decl-scan
 @findex haskell-decl-scan-mode
@@ -479,8 +479,8 @@ temporarily by invoking @code{haskell-compile} with a prefix argument
 same customized compile command, invoke @code{recompile} (bound to
 @kbd{g}) inside the @samp{*haskell-compilation*} buffer.
 
-@node inferior-haskell-mode
-@chapter @code{inferior-haskell-mode}
+@node Inferior Haskell interpreter
+@chapter Inferior Haskell interpreter
 
 @findex inferior-haskell-find-definition
 @findex inferior-haskell-find-haddock
@@ -522,8 +522,8 @@ Currently, GHCi and Hugs are support as Haskell interpreter.
 TODO/WRITEME
 @c write about supported features
 
-@node haskell-interactive-mode
-@chapter @code{haskell-interactive-mode}
+@node Interactive Haskell
+@chapter Interactive Haskell
 
 An alternative mode providing a @acronym{REPL,read–eval–print loop} via
 GHCi sessions is called @code{haskell-interactive-mode}, which
@@ -566,8 +566,8 @@ associate with.
 
 TODO/WRITEME
 
-@node haskell-cabal-mode
-@chapter @code{haskell-cabal-mode}
+@node Editing Cabal files
+@chapter Editing Cabal files
 
 @findex haskell-cabal-mode
 @vindex haskell-cabal-mode-hook