diff --git a/Doc/lib/libamoeba.tex b/Doc/lib/libamoeba.tex
index c4e61c0..0d3df2b 100644
--- a/Doc/lib/libamoeba.tex
+++ b/Doc/lib/libamoeba.tex
@@ -1,6 +1,6 @@
 \chapter{Amoeba Specific Services}
 
-\section{Built-in Module \sectcode{amoeba}}
+\section{Built-in Module \module{amoeba}}
 \label{module-amoeba}
 \bimodindex{amoeba}
 
diff --git a/Doc/lib/libanydbm.tex b/Doc/lib/libanydbm.tex
index 1c46c61..2d3fe67 100644
--- a/Doc/lib/libanydbm.tex
+++ b/Doc/lib/libanydbm.tex
@@ -1,4 +1,4 @@
-\section{Standard Modules \sectcode{anydbm} and \sectcode{dumbdbm}}
+\section{Standard Modules \module{anydbm} and \module{dumbdbm}}
 \label{module-anydbm}
 \label{module-dumbdbm}
 \stmodindex{anydbm}
diff --git a/Doc/lib/libarray.tex b/Doc/lib/libarray.tex
index 7ef0c53..19ba91d 100644
--- a/Doc/lib/libarray.tex
+++ b/Doc/lib/libarray.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{array}}
+\section{Built-in Module \module{array}}
 \label{module-array}
 \bimodindex{array}
 \index{arrays}
diff --git a/Doc/lib/libbastion.tex b/Doc/lib/libbastion.tex
index b5bec15..ddf6d9e 100644
--- a/Doc/lib/libbastion.tex
+++ b/Doc/lib/libbastion.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{Bastion}}
+\section{Standard Module \module{Bastion}}
 \label{module-Bastion}
 \stmodindex{Bastion}
 
diff --git a/Doc/lib/libbltin.tex b/Doc/lib/libbltin.tex
index 7413093..a4a0dd0 100644
--- a/Doc/lib/libbltin.tex
+++ b/Doc/lib/libbltin.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{__builtin__}}
+\section{Built-in Module \module{__builtin__}}
 \label{module-builtin}
 \bimodindex{__builtin__}
 
diff --git a/Doc/lib/libcmath.tex b/Doc/lib/libcmath.tex
index ae50743..adce12f 100644
--- a/Doc/lib/libcmath.tex
+++ b/Doc/lib/libcmath.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{cmath}}
+\section{Built-in Module \module{cmath}}
 \label{module-cmath}
 
 \bimodindex{cmath}
diff --git a/Doc/lib/libcode.tex b/Doc/lib/libcode.tex
index 4f360bf..023d276 100644
--- a/Doc/lib/libcode.tex
+++ b/Doc/lib/libcode.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{code}}
+\section{Standard Module \module{code}}
 \label{module-code}
 \stmodindex{code}
 
diff --git a/Doc/lib/libcopy.tex b/Doc/lib/libcopy.tex
index 1d1fd22..4e43585 100644
--- a/Doc/lib/libcopy.tex
+++ b/Doc/lib/libcopy.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{copy}}
+\section{Standard Module \module{copy}}
 \label{module-copy}
 \stmodindex{copy}
 \setindexsubitem{(copy function)}
diff --git a/Doc/lib/libcopyreg.tex b/Doc/lib/libcopyreg.tex
index 9816bc9..7dabf42 100644
--- a/Doc/lib/libcopyreg.tex
+++ b/Doc/lib/libcopyreg.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{copy_reg}}
+\section{Standard Module \module{copy_reg}}
 % Note that the label is a little off; the underscore causes LaTeX to
 % yell & scream.
 \label{module-copyreg}
diff --git a/Doc/lib/libcrypt.tex b/Doc/lib/libcrypt.tex
index bdcc7da..8e9a7d3 100644
--- a/Doc/lib/libcrypt.tex
+++ b/Doc/lib/libcrypt.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{crypt}}
+\section{Built-in Module \module{crypt}}
 \label{module-crypt}
 \bimodindex{crypt}
 
diff --git a/Doc/lib/libdbm.tex b/Doc/lib/libdbm.tex
index ac5343f..c4317fe 100644
--- a/Doc/lib/libdbm.tex
+++ b/Doc/lib/libdbm.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{dbm}}
+\section{Built-in Module \module{dbm}}
 \label{module-dbm}
 \bimodindex{dbm}
 
diff --git a/Doc/lib/liberrno.tex b/Doc/lib/liberrno.tex
index 28f68c5..40ab90d 100644
--- a/Doc/lib/liberrno.tex
+++ b/Doc/lib/liberrno.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{errno}}
+\section{Standard Module \module{errno}}
 \label{module-errno}
 \stmodindex{errno}
 
diff --git a/Doc/lib/libfcntl.tex b/Doc/lib/libfcntl.tex
index 6811008..1c64af9 100644
--- a/Doc/lib/libfcntl.tex
+++ b/Doc/lib/libfcntl.tex
@@ -1,5 +1,5 @@
 % Manual text by Jaap Vermeulen
-\section{Built-in Module \sectcode{fcntl}}
+\section{Built-in Module \module{fcntl}}
 \label{module-fcntl}
 \bimodindex{fcntl}
 \indexii{UNIX@\UNIX{}}{file control}
diff --git a/Doc/lib/libfm.tex b/Doc/lib/libfm.tex
index bac5d39..abcbaa4 100644
--- a/Doc/lib/libfm.tex
+++ b/Doc/lib/libfm.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{fm}}
+\section{Built-in Module \module{fm}}
 \label{module-fm}
 \bimodindex{fm}
 
diff --git a/Doc/lib/libfnmatch.tex b/Doc/lib/libfnmatch.tex
index cb1684e..f2f82ba 100644
--- a/Doc/lib/libfnmatch.tex
+++ b/Doc/lib/libfnmatch.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{fnmatch}}
+\section{Standard Module \module{fnmatch}}
 \label{module-fnmatch}
 \stmodindex{fnmatch}
 
diff --git a/Doc/lib/libformatter.tex b/Doc/lib/libformatter.tex
index 25e68d6..6a97f80 100644
--- a/Doc/lib/libformatter.tex
+++ b/Doc/lib/libformatter.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{formatter}}
+\section{Standard Module \module{formatter}}
 \label{module-formatter}
 \stmodindex{formatter}
 
diff --git a/Doc/lib/libframework.tex b/Doc/lib/libframework.tex
index 6e77870..5bd2e2a 100644
--- a/Doc/lib/libframework.tex
+++ b/Doc/lib/libframework.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{FrameWork}}
+\section{Standard Module \module{FrameWork}}
 \stmodindex{FrameWork}
 \label{module-FrameWork}
 
diff --git a/Doc/lib/libgdbm.tex b/Doc/lib/libgdbm.tex
index 0761991..8f2d7d1 100644
--- a/Doc/lib/libgdbm.tex
+++ b/Doc/lib/libgdbm.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{gdbm}}
+\section{Built-in Module \module{gdbm}}
 \label{module-gdbm}
 \bimodindex{gdbm}
 
diff --git a/Doc/lib/libgetopt.tex b/Doc/lib/libgetopt.tex
index ff0461c..be00fef 100644
--- a/Doc/lib/libgetopt.tex
+++ b/Doc/lib/libgetopt.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{getopt}}
+\section{Standard Module \module{getopt}}
 \label{module-getopt}
 \stmodindex{getopt}
 
diff --git a/Doc/lib/libgl.tex b/Doc/lib/libgl.tex
index de429ac..abbaf10 100644
--- a/Doc/lib/libgl.tex
+++ b/Doc/lib/libgl.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{gl}}
+\section{Built-in Module \module{gl}}
 \label{module-gl}
 \bimodindex{gl}
 
@@ -183,7 +183,7 @@
 main()
 \end{verbatim}
 %
-\section{Standard Modules \sectcode{GL} and \sectcode{DEVICE}}
+\section{Standard Modules \module{GL} and \module{DEVICE}}
 \nodename{GL and DEVICE}
 \stmodindex{GL}
 \stmodindex{DEVICE}
diff --git a/Doc/lib/libglob.tex b/Doc/lib/libglob.tex
index 97d0ed5..6864c77 100644
--- a/Doc/lib/libglob.tex
+++ b/Doc/lib/libglob.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{glob}}
+\section{Standard Module \module{glob}}
 \label{module-glob}
 \stmodindex{glob}
 
diff --git a/Doc/lib/libgopherlib.tex b/Doc/lib/libgopherlib.tex
index d0c7d77..156d6d7 100644
--- a/Doc/lib/libgopherlib.tex
+++ b/Doc/lib/libgopherlib.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{gopherlib}}
+\section{Standard Module \module{gopherlib}}
 \label{module-gopherlib}
 \stmodindex{gopherlib}
 \indexii{Gopher}{protocol}
diff --git a/Doc/lib/libgrp.tex b/Doc/lib/libgrp.tex
index da66800..551171b 100644
--- a/Doc/lib/libgrp.tex
+++ b/Doc/lib/libgrp.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{grp}}
+\section{Built-in Module \module{grp}}
 \label{module-grp}
 
 \bimodindex{grp}
diff --git a/Doc/lib/libgzip.tex b/Doc/lib/libgzip.tex
index a56e573..fd2bc28 100644
--- a/Doc/lib/libgzip.tex
+++ b/Doc/lib/libgzip.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{gzip}}
+\section{Standard Module \module{gzip}}
 \label{module-gzip}
 \stmodindex{gzip}
 
diff --git a/Doc/lib/libhtmllib.tex b/Doc/lib/libhtmllib.tex
index 7737845..c856b42 100644
--- a/Doc/lib/libhtmllib.tex
+++ b/Doc/lib/libhtmllib.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{htmllib}}
+\section{Standard Module \module{htmllib}}
 \label{module-htmllib}
 \stmodindex{htmllib}
 \index{HTML}
diff --git a/Doc/lib/libimghdr.tex b/Doc/lib/libimghdr.tex
index bf1c0ef..d624f06 100644
--- a/Doc/lib/libimghdr.tex
+++ b/Doc/lib/libimghdr.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{imghdr}}
+\section{Standard Module \module{imghdr}}
 \label{module-imghdr}
 \stmodindex{imghdr}
 
diff --git a/Doc/lib/libimp.tex b/Doc/lib/libimp.tex
index 5664c81..7d4f8d1 100644
--- a/Doc/lib/libimp.tex
+++ b/Doc/lib/libimp.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{imp}}
+\section{Built-in Module \module{imp}}
 \label{module-imp}
 \bimodindex{imp}
 \index{import}
diff --git a/Doc/lib/libkeyword.tex b/Doc/lib/libkeyword.tex
index b4910a6..7a263ef 100644
--- a/Doc/lib/libkeyword.tex
+++ b/Doc/lib/libkeyword.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{keyword}}
+\section{Standard Module \module{keyword}}
 \label{module-keyword}
 \stmodindex{keyword}
 
diff --git a/Doc/lib/liblocale.tex b/Doc/lib/liblocale.tex
index 44059d1..1752790 100644
--- a/Doc/lib/liblocale.tex
+++ b/Doc/lib/liblocale.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{locale}}
+\section{Standard Module \module{locale}}
 \stmodindex{locale}
 
 \label{module-locale}
diff --git a/Doc/lib/libmailbox.tex b/Doc/lib/libmailbox.tex
index e9dcb89..4ff2dedb 100644
--- a/Doc/lib/libmailbox.tex
+++ b/Doc/lib/libmailbox.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{mailbox}}
+\section{Standard Module \module{mailbox}}
 \label{module-mailbox}
 \stmodindex{mailbox}
 
diff --git a/Doc/lib/libmailcap.tex b/Doc/lib/libmailcap.tex
index 52e2ee4..0ea762a 100644
--- a/Doc/lib/libmailcap.tex
+++ b/Doc/lib/libmailcap.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{mailcap}}
+\section{Standard Module \module{mailcap}}
 \label{module-mailcap}
 \stmodindex{mailcap}
 
diff --git a/Doc/lib/libmain.tex b/Doc/lib/libmain.tex
index 8ce73a8..df1fbfb 100644
--- a/Doc/lib/libmain.tex
+++ b/Doc/lib/libmain.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{__main__}}
+\section{Built-in Module \module{__main__}}
 \label{module-main}
 \bimodindex{__main__}
 This module represents the (otherwise anonymous) scope in which the
diff --git a/Doc/lib/libmarshal.tex b/Doc/lib/libmarshal.tex
index a2a8084..5878cfa 100644
--- a/Doc/lib/libmarshal.tex
+++ b/Doc/lib/libmarshal.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{marshal}}
+\section{Built-in Module \module{marshal}}
 \label{module-marshal}
 \bimodindex{marshal}
 
diff --git a/Doc/lib/libmath.tex b/Doc/lib/libmath.tex
index 6cbf830..1cc6b20 100644
--- a/Doc/lib/libmath.tex
+++ b/Doc/lib/libmath.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{math}}
+\section{Built-in Module \module{math}}
 \label{module-math}
 
 \bimodindex{math}
diff --git a/Doc/lib/libmimify.tex b/Doc/lib/libmimify.tex
index 8ac73c2..366e940 100644
--- a/Doc/lib/libmimify.tex
+++ b/Doc/lib/libmimify.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{mimify}}
+\section{Standard Module \module{mimify}}
 \label{module-mimify}
 \stmodindex{mimify}
 
diff --git a/Doc/lib/libni.tex b/Doc/lib/libni.tex
index 8a251da..14ff395 100644
--- a/Doc/lib/libni.tex
+++ b/Doc/lib/libni.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{ni}}
+\section{Standard Module \module{ni}}
 \label{module-ni}
 \stmodindex{ni}
 
diff --git a/Doc/lib/liboperator.tex b/Doc/lib/liboperator.tex
index 812ca13..2169ea8 100644
--- a/Doc/lib/liboperator.tex
+++ b/Doc/lib/liboperator.tex
@@ -1,6 +1,6 @@
 % Contributed by Skip Montanaro, from the module's doc strings.
 
-\section{Built-in Module \sectcode{operator}}
+\section{Built-in Module \module{operator}}
 \label{module-operator}
 \bimodindex{operator}
 
diff --git a/Doc/lib/libos.tex b/Doc/lib/libos.tex
index 953e117..810e40c 100644
--- a/Doc/lib/libos.tex
+++ b/Doc/lib/libos.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{os}}
+\section{Standard Module \module{os}}
 \label{module-os}
 \stmodindex{os}
 
diff --git a/Doc/lib/libpanel.tex b/Doc/lib/libpanel.tex
index 57b8e4f..3553808 100644
--- a/Doc/lib/libpanel.tex
+++ b/Doc/lib/libpanel.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{panel}}
+\section{Standard Module \module{panel}}
 \label{module-panel}
 \stmodindex{panel}
 
@@ -29,7 +29,7 @@
 or
 \code{panel.defpanellist()}.
 
-\section{Standard Module \sectcode{panelparser}}
+\section{Standard Module \module{panelparser}}
 \label{module-panelparser}
 \stmodindex{panelparser}
 
@@ -45,7 +45,7 @@
 For more details, read the module file.
 % XXXXJH should be funcdesc, I think
 
-\section{Built-in Module \sectcode{pnl}}
+\section{Built-in Module \module{pnl}}
 \label{module-pnl}
 \bimodindex{pnl}
 
diff --git a/Doc/lib/libparser.tex b/Doc/lib/libparser.tex
index 56e1931..7b3f6f6 100644
--- a/Doc/lib/libparser.tex
+++ b/Doc/lib/libparser.tex
@@ -9,7 +9,7 @@
 % in any way.
 %
 
-\section{Built-in Module \sectcode{parser}}
+\section{Built-in Module \module{parser}}
 \label{module-parser}
 \bimodindex{parser}
 \index{parsing!Python source code}
@@ -293,7 +293,7 @@
 the complex example shows the use of a parse tree for information
 discovery.
 
-\subsubsection{Emulation of \sectcode{compile()}}
+\subsubsection{Emulation of \module{compile()}}
 
 While many useful operations may take place between parsing and
 bytecode generation, the simplest operation is to do nothing.  For
diff --git a/Doc/lib/libpickle.tex b/Doc/lib/libpickle.tex
index 3c1eaa6..038b763 100644
--- a/Doc/lib/libpickle.tex
+++ b/Doc/lib/libpickle.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{pickle}}
+\section{Standard Module \module{pickle}}
 \label{module-pickle}
 \stmodindex{pickle}
 \index{persistency}
diff --git a/Doc/lib/libposix.tex b/Doc/lib/libposix.tex
index 261c6aa..071cf56 100644
--- a/Doc/lib/libposix.tex
+++ b/Doc/lib/libposix.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{posix}}
+\section{Built-in Module \module{posix}}
 \label{module-posix}
 \bimodindex{posix}
 
diff --git a/Doc/lib/libposixfile.tex b/Doc/lib/libposixfile.tex
index 9ab584b..f3c5d98 100644
--- a/Doc/lib/libposixfile.tex
+++ b/Doc/lib/libposixfile.tex
@@ -1,5 +1,5 @@
 % Manual text and implementation by Jaap Vermeulen
-\section{Standard Module \sectcode{posixfile}}
+\section{Standard Module \module{posixfile}}
 \label{module-posixfile}
 \bimodindex{posixfile}
 \indexii{\POSIX{}}{file object}
diff --git a/Doc/lib/libppath.tex b/Doc/lib/libppath.tex
index 6639c7c..86b5a34 100644
--- a/Doc/lib/libppath.tex
+++ b/Doc/lib/libppath.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{posixpath}}
+\section{Standard Module \module{posixpath}}
 \label{module-posixpath}
 \stmodindex{posixpath}
 
diff --git a/Doc/lib/libpprint.tex b/Doc/lib/libpprint.tex
index 6c499df..0ad1dc5 100644
--- a/Doc/lib/libpprint.tex
+++ b/Doc/lib/libpprint.tex
@@ -1,6 +1,6 @@
 %%  Author:  Fred L. Drake, Jr.		<fdrake@acm.org>
 
-\section{Standard Module \sectcode{pprint}}
+\section{Standard Module \module{pprint}}
 \stmodindex{pprint}
 \label{module-pprint}
 
diff --git a/Doc/lib/libprofile.tex b/Doc/lib/libprofile.tex
index 174b51d..43d92c1 100644
--- a/Doc/lib/libprofile.tex
+++ b/Doc/lib/libprofile.tex
@@ -358,7 +358,7 @@
 \end{classdesc}
 
 
-\subsection{The \sectcode{Stats} Class}
+\subsection{The \module{Stats} Class}
 
 \setindexsubitem{(Stats method)}
 
diff --git a/Doc/lib/libpwd.tex b/Doc/lib/libpwd.tex
index 61de3fc..5275acd 100644
--- a/Doc/lib/libpwd.tex
+++ b/Doc/lib/libpwd.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{pwd}}
+\section{Built-in Module \module{pwd}}
 \label{module-pwd}
 
 \bimodindex{pwd}
diff --git a/Doc/lib/libqueue.tex b/Doc/lib/libqueue.tex
index db6cabc..680238d 100644
--- a/Doc/lib/libqueue.tex
+++ b/Doc/lib/libqueue.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{Queue}}
+\section{Standard Module \module{Queue}}
 \stmodindex{Queue}
 \label{module-Queue}
 
diff --git a/Doc/lib/librand.tex b/Doc/lib/librand.tex
index 3e19440..a48ea22 100644
--- a/Doc/lib/librand.tex
+++ b/Doc/lib/librand.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{rand}}
+\section{Standard Module \module{rand}}
 \label{module-rand}
 \stmodindex{rand}
 
diff --git a/Doc/lib/librandom.tex b/Doc/lib/librandom.tex
index 35271ba..fb62f8f 100644
--- a/Doc/lib/librandom.tex
+++ b/Doc/lib/librandom.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{random}}
+\section{Standard Module \module{random}}
 \label{module-random}
 \stmodindex{random}
 
diff --git a/Doc/lib/libre.tex b/Doc/lib/libre.tex
index 424ca9c..f04f4dc 100644
--- a/Doc/lib/libre.tex
+++ b/Doc/lib/libre.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{re}}
+\section{Built-in Module \module{re}}
 \label{module-re}
 
 \bimodindex{re}
diff --git a/Doc/lib/libregex.tex b/Doc/lib/libregex.tex
index 6582c72..0c216d2 100644
--- a/Doc/lib/libregex.tex
+++ b/Doc/lib/libregex.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{regex}}
+\section{Built-in Module \module{regex}}
 \label{module-regex}
 \bimodindex{regex}
 
diff --git a/Doc/lib/libregsub.tex b/Doc/lib/libregsub.tex
index 6ee873d..93c955e 100644
--- a/Doc/lib/libregsub.tex
+++ b/Doc/lib/libregsub.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{regsub}}
+\section{Standard Module \module{regsub}}
 \label{module-regsub}
 
 \stmodindex{regsub}
diff --git a/Doc/lib/libresource.tex b/Doc/lib/libresource.tex
index 7e7a288..b07240a 100644
--- a/Doc/lib/libresource.tex
+++ b/Doc/lib/libresource.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{resource}}
+\section{Built-in Module \module{resource}}
 \label{module-resource}
 
 \bimodindex{resource}
diff --git a/Doc/lib/librexec.tex b/Doc/lib/librexec.tex
index 03e8284..baddece 100644
--- a/Doc/lib/librexec.tex
+++ b/Doc/lib/librexec.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{rexec}}
+\section{Standard Module \module{rexec}}
 \label{module-rexec}
 \stmodindex{rexec}
 
diff --git a/Doc/lib/librfc822.tex b/Doc/lib/librfc822.tex
index bfc63c9..945aef2 100644
--- a/Doc/lib/librfc822.tex
+++ b/Doc/lib/librfc822.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{rfc822}}
+\section{Standard Module \module{rfc822}}
 \label{module-rfc822}
 \stmodindex{rfc822}
 
diff --git a/Doc/lib/libselect.tex b/Doc/lib/libselect.tex
index ba234ab..b7a8c85 100644
--- a/Doc/lib/libselect.tex
+++ b/Doc/lib/libselect.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{select}}
+\section{Built-in Module \module{select}}
 \label{module-select}
 \bimodindex{select}
 
diff --git a/Doc/lib/libsgmllib.tex b/Doc/lib/libsgmllib.tex
index f86e729..f086b4b 100644
--- a/Doc/lib/libsgmllib.tex
+++ b/Doc/lib/libsgmllib.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{sgmllib}}
+\section{Standard Module \module{sgmllib}}
 \label{module-sgmllib}
 \stmodindex{sgmllib}
 \index{SGML}
diff --git a/Doc/lib/libshelve.tex b/Doc/lib/libshelve.tex
index 4349534..90afbc6 100644
--- a/Doc/lib/libshelve.tex
+++ b/Doc/lib/libshelve.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{shelve}}
+\section{Standard Module \module{shelve}}
 \label{module-shelve}
 \stmodindex{shelve}
 
diff --git a/Doc/lib/libsignal.tex b/Doc/lib/libsignal.tex
index 266454f..49eb62e 100644
--- a/Doc/lib/libsignal.tex
+++ b/Doc/lib/libsignal.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{signal}}
+\section{Built-in Module \module{signal}}
 \label{module-signal}
 
 \bimodindex{signal}
diff --git a/Doc/lib/libsite.tex b/Doc/lib/libsite.tex
index 3796801..5ddbe8a 100644
--- a/Doc/lib/libsite.tex
+++ b/Doc/lib/libsite.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{site}}
+\section{Standard Module \module{site}}
 \label{module-site}
 \stmodindex{site}
 
diff --git a/Doc/lib/libsocket.tex b/Doc/lib/libsocket.tex
index 030eb72..76d2b1a 100644
--- a/Doc/lib/libsocket.tex
+++ b/Doc/lib/libsocket.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{socket}}
+\section{Built-in Module \module{socket}}
 \label{module-socket}
 \bimodindex{socket}
 
diff --git a/Doc/lib/libsocksvr.tex b/Doc/lib/libsocksvr.tex
index 2ee36a4..8769c36 100644
--- a/Doc/lib/libsocksvr.tex
+++ b/Doc/lib/libsocksvr.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{SocketServer}}
+\section{Standard Module \module{SocketServer}}
 \label{module-SocketServer}
 \stmodindex{SocketServer}
 
diff --git a/Doc/lib/libsoundex.tex b/Doc/lib/libsoundex.tex
index 5ea1ad3..7d483ed 100644
--- a/Doc/lib/libsoundex.tex
+++ b/Doc/lib/libsoundex.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{soundex}}
+\section{Built-in Module \module{soundex}}
 \label{module-soundex}
 \bimodindex{soundex}
 
diff --git a/Doc/lib/libstat.tex b/Doc/lib/libstat.tex
index 8f861d3..18bd1d7 100644
--- a/Doc/lib/libstat.tex
+++ b/Doc/lib/libstat.tex
@@ -1,6 +1,6 @@
 % By Skip Montanaro
 
-\section{Standard Module \sectcode{stat}}
+\section{Standard Module \module{stat}}
 \stmodindex{stat}
 \label{module-stat}
 
diff --git a/Doc/lib/libstdwin.tex b/Doc/lib/libstdwin.tex
index fbccba9..ef3ff1c 100644
--- a/Doc/lib/libstdwin.tex
+++ b/Doc/lib/libstdwin.tex
@@ -14,7 +14,7 @@
 under X11, Win32 for Windows and Windows NT, and a collection of
 native toolkit interfaces for the Macintosh.
 
-\section{Built-in Module \sectcode{stdwin}}
+\section{Built-in Module \module{stdwin}}
 \label{module-stdwin}
 \bimodindex{stdwin}
 
@@ -32,7 +32,7 @@
 For a complete description of STDWIN please refer to the documentation
 of STDWIN for C programmers (aforementioned CWI report).
 
-\subsection{Functions Defined in Module \sectcode{stdwin}}
+\subsection{Functions Defined in Module \module{stdwin}}
 \nodename{STDWIN Functions}
 
 The following functions are defined in the \code{stdwin} module:
@@ -775,7 +775,7 @@
 main()
 \end{verbatim}
 %
-\section{Standard Module \sectcode{stdwinevents}}
+\section{Standard Module \module{stdwinevents}}
 \label{module-stdwinevents}
 \stmodindex{stdwinevents}
 
@@ -790,7 +790,7 @@
 >>> 
 \end{verbatim}
 %
-\section{Standard Module \sectcode{rect}}
+\section{Standard Module \module{rect}}
 \label{module-rect}
 \stmodindex{rect}
 
diff --git a/Doc/lib/libstring.tex b/Doc/lib/libstring.tex
index c7889c9..6df547e 100644
--- a/Doc/lib/libstring.tex
+++ b/Doc/lib/libstring.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{string}}
+\section{Standard Module \module{string}}
 \label{module-string}
 \stmodindex{string}
 
diff --git a/Doc/lib/libstrio.tex b/Doc/lib/libstrio.tex
index cf96dbb..9449dc2 100644
--- a/Doc/lib/libstrio.tex
+++ b/Doc/lib/libstrio.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{StringIO}}
+\section{Standard Module \module{StringIO}}
 \label{module-StringIO}
 
 \stmodindex{StringIO}
diff --git a/Doc/lib/libstruct.tex b/Doc/lib/libstruct.tex
index b92076c..5703c05 100644
--- a/Doc/lib/libstruct.tex
+++ b/Doc/lib/libstruct.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{struct}}
+\section{Built-in Module \module{struct}}
 \label{module-struct}
 \bimodindex{struct}
 \indexii{C@\C{}}{structures}
diff --git a/Doc/lib/libsymbol.tex b/Doc/lib/libsymbol.tex
index bb103a3..0761405 100644
--- a/Doc/lib/libsymbol.tex
+++ b/Doc/lib/libsymbol.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{symbol}}
+\section{Standard Module \module{symbol}}
 \label{module-symbol}
 \stmodindex{symbol}
 
diff --git a/Doc/lib/libsys.tex b/Doc/lib/libsys.tex
index 605a63c..1dac264 100644
--- a/Doc/lib/libsys.tex
+++ b/Doc/lib/libsys.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{sys}}
+\section{Built-in Module \module{sys}}
 \label{module-sys}
 
 \bimodindex{sys}
diff --git a/Doc/lib/libsyslog.tex b/Doc/lib/libsyslog.tex
index f748186..c4c6166 100644
--- a/Doc/lib/libsyslog.tex
+++ b/Doc/lib/libsyslog.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{syslog}}
+\section{Built-in Module \module{syslog}}
 \label{module-syslog}
 \bimodindex{syslog}
 
diff --git a/Doc/lib/libtempfile.tex b/Doc/lib/libtempfile.tex
index 7832aa2..d81084e 100644
--- a/Doc/lib/libtempfile.tex
+++ b/Doc/lib/libtempfile.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{tempfile}}
+\section{Standard Module \module{tempfile}}
 \label{module-tempfile}
 \stmodindex{tempfile}
 \indexii{temporary}{file name}
diff --git a/Doc/lib/libtermios.tex b/Doc/lib/libtermios.tex
index 05f7371..5e2ce1e 100644
--- a/Doc/lib/libtermios.tex
+++ b/Doc/lib/libtermios.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{termios}}
+\section{Built-in Module \module{termios}}
 \label{module-termios}
 \bimodindex{termios}
 \indexii{\POSIX{}}{I/O control}
@@ -92,7 +92,7 @@
     return passwd
 \end{verbatim}
 
-\section{Standard Module \sectcode{TERMIOS}}
+\section{Standard Module \module{TERMIOS}}
 \label{module-TERMIOSuppercase}
 \stmodindex{TERMIOS}
 \indexii{\POSIX{}}{I/O control}
diff --git a/Doc/lib/libthread.tex b/Doc/lib/libthread.tex
index 1307619..9e9d8ba 100644
--- a/Doc/lib/libthread.tex
+++ b/Doc/lib/libthread.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{thread}}
+\section{Built-in Module \module{thread}}
 \label{module-thread}
 \bimodindex{thread}
 
diff --git a/Doc/lib/libtime.tex b/Doc/lib/libtime.tex
index b8fe4c5..0f0ed01 100644
--- a/Doc/lib/libtime.tex
+++ b/Doc/lib/libtime.tex
@@ -1,4 +1,4 @@
-\section{Built-in Module \sectcode{time}}
+\section{Built-in Module \module{time}}
 \label{module-time}
 \bimodindex{time}
 
diff --git a/Doc/lib/libtoken.tex b/Doc/lib/libtoken.tex
index deec2c6..15ab2a4 100644
--- a/Doc/lib/libtoken.tex
+++ b/Doc/lib/libtoken.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{token}}
+\section{Standard Module \module{token}}
 \label{module-token}
 \stmodindex{token}
 
diff --git a/Doc/lib/libtraceback.tex b/Doc/lib/libtraceback.tex
index dd4feb1..f9aa74a 100644
--- a/Doc/lib/libtraceback.tex
+++ b/Doc/lib/libtraceback.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{traceback}}
+\section{Standard Module \module{traceback}}
 \label{module-traceback}
 \stmodindex{traceback}
 
diff --git a/Doc/lib/liburllib.tex b/Doc/lib/liburllib.tex
index 1732d85..8995798 100644
--- a/Doc/lib/liburllib.tex
+++ b/Doc/lib/liburllib.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{urllib}}
+\section{Standard Module \module{urllib}}
 \label{module-urllib}
 \stmodindex{urllib}
 \index{WWW}
diff --git a/Doc/lib/liburlparse.tex b/Doc/lib/liburlparse.tex
index 41c66bf..3d98688 100644
--- a/Doc/lib/liburlparse.tex
+++ b/Doc/lib/liburlparse.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{urlparse}}
+\section{Standard Module \module{urlparse}}
 \label{module-urlparse}
 \stmodindex{urlparse}
 \index{WWW}
diff --git a/Doc/lib/libuser.tex b/Doc/lib/libuser.tex
index 2ed7f62..e545972 100644
--- a/Doc/lib/libuser.tex
+++ b/Doc/lib/libuser.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{user}}
+\section{Standard Module \module{user}}
 \label{module-user}
 \stmodindex{user}
 \indexii{.pythonrc.py}{file}
diff --git a/Doc/lib/libuserdict.tex b/Doc/lib/libuserdict.tex
index 0ec1f2a..321f94f 100644
--- a/Doc/lib/libuserdict.tex
+++ b/Doc/lib/libuserdict.tex
@@ -1,4 +1,4 @@
-\section{Standard Modules \sectcode{UserDict} and \sectcode{UserList}}
+\section{Standard Modules \module{UserDict} and \module{UserList}}
 \nodename{UserDict and UserList}
 \stmodindex{UserDict}
 \stmodindex{UserList}
diff --git a/Doc/lib/libuu.tex b/Doc/lib/libuu.tex
index 82621b9..5c9e06c 100644
--- a/Doc/lib/libuu.tex
+++ b/Doc/lib/libuu.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{uu}}
+\section{Standard Module \module{uu}}
 \label{module-uu}
 \stmodindex{uu}
 
diff --git a/Doc/lib/libwhichdb.tex b/Doc/lib/libwhichdb.tex
index 5928126..2caace2 100644
--- a/Doc/lib/libwhichdb.tex
+++ b/Doc/lib/libwhichdb.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{whichdb}}
+\section{Standard Module \module{whichdb}}
 \label{module-whichdb}
 \stmodindex{whichdb}
 
diff --git a/Doc/lib/libwhrandom.tex b/Doc/lib/libwhrandom.tex
index b83e6ab..0645b6f 100644
--- a/Doc/lib/libwhrandom.tex
+++ b/Doc/lib/libwhrandom.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{whrandom}}
+\section{Standard Module \module{whrandom}}
 \label{module-whrandom}
 \stmodindex{whrandom}
 
diff --git a/Doc/lib/libxdrlib.tex b/Doc/lib/libxdrlib.tex
index d831682..cea50e0 100644
--- a/Doc/lib/libxdrlib.tex
+++ b/Doc/lib/libxdrlib.tex
@@ -1,4 +1,4 @@
-\section{Standard Module \sectcode{xdrlib}}
+\section{Standard Module \module{xdrlib}}
 \label{module-xdrlib}
 \stmodindex{xdrlib}
 \index{XDR}