diff --git a/make-includes/build_lecture_rules.make b/make-includes/build_lecture_rules.make
index 3a5666a..8aac815 100644
--- a/make-includes/build_lecture_rules.make
+++ b/make-includes/build_lecture_rules.make
@@ -53,12 +53,17 @@
 
 include $(GLOBAL_HANDBOOK_INCLUDE)/standard_environment.make
 #
-# Base file names for the various documents.
+# Base file names for the various input and output documents.
 #
-SLIDES?=Chapter$(CHAPTER)slides
-FIGURES?=Chapter$(CHAPTER)figures
-COMBINED?=Chapter$(CHAPTER)combined
-NOTES?=Chapter$(CHAPTER)notes
+SLIDES_IN?=$(DOC_TYPE)_slides
+FIGURES_IN?=$(DOC_TYPE)_figures
+COMBINED_IN?=$(DOC_TYPE)_combined
+NOTES_IN?=$(DOC_TYPE)_notes
+
+SLIDES?=$(DOC_TYPE)_$(DOC_NUM)_slides
+FIGURES?=$(DOC_TYPE)_$(DOC_NUM)_figures
+COMBINED?=$(DOC_TYPE)_$(DOC_NUM)_combined
+NOTES?=$(DOC_TYPE)_$(DOC_NUM)_notes
 #
 # Standard files to be installed on the web server.
 #
@@ -85,7 +90,7 @@
 # Display a message if someone tries to build a target that has been
 # disabled (by setting the appropriate variable to empty in the makefile).
 #
-disabled_message=@$(ECHO) The \"$(1)\" target has been disabled for this chapter.
+disabled_message=@$(ECHO) The \"$(1)\" target has been disabled for this $(DOC_TYPE).
 
 
 ################################################################################
@@ -93,9 +98,9 @@
 # Alternate LaTeXs for Unicode vs. non-Unicode processing.
 #
 ifdef UNICODE
-LATEXCMD:=$(XELATEX)
+LATEXCMD:=$(XELATEX) $(LATEX_FLAGS)
 else
-LATEXCMD:=$(PDFLATEX)
+LATEXCMD:=$(PDFLATEX) $(LATEX_FLAGS)
 endif
 
 
@@ -128,9 +133,9 @@
 #
 slides: $(SLIDES_PREREQS)
 
-$(SLIDES).pdf: $(SLIDES).tex $(SLIDE_IMAGES) $(SLIDE_BACKGROUNDS) $(SLIDE_FILES)
-	$(LATEXCMD) --jobname=$(SLIDES) '\documentclass[$(LATEX_OPTS)]{lectureslides}\input{$(SLIDES)}'
-	$(LATEXCMD) --jobname=$(SLIDES) '\documentclass[$(LATEX_OPTS)]{lectureslides}\input{$(SLIDES)}'
+$(SLIDES).pdf: $(SLIDES_IN).tex $(SLIDE_IMAGES) $(SLIDE_BACKGROUNDS) $(SLIDE_FILES)
+	$(LATEXCMD) -jobname=$(SLIDES) '\documentclass[$(LATEX_OPTS)]{lectureslides}\input{$(SLIDES_IN)}'
+	$(LATEXCMD) -jobname=$(SLIDES) '\documentclass[$(LATEX_OPTS)]{lectureslides}\input{$(SLIDES_IN)}'
 
 else
 
@@ -165,18 +170,18 @@
 #
 slides-notes: $(SLIDES_NOTES_PREREQS)
 
-slides-notes.pdf: $(SLIDES).tex $(SLIDE_IMAGES) $(SLIDE_BACKGROUNDS) $(SLIDE_FILES)
-	$(LATEXCMD) --jobname=slides-notes '\documentclass[$(LATEX_OPTS),notes=onlyslideswithnotes]{lectureslides}\input{$(SLIDES)}'
-	$(LATEXCMD) --jobname=slides-notes '\documentclass[$(LATEX_OPTS),notes=onlyslideswithnotes]{lectureslides}\input{$(SLIDES)}'
+slides-notes.pdf: $(SLIDES_IN).tex $(SLIDE_IMAGES) $(SLIDE_BACKGROUNDS) $(SLIDE_FILES)
+	$(LATEXCMD) -jobname=slides-notes '\documentclass[$(LATEX_OPTS),notes=onlyslideswithnotes]{lectureslides}\input{$(SLIDES_IN)}'
+	$(LATEXCMD) -jobname=slides-notes '\documentclass[$(LATEX_OPTS),notes=onlyslideswithnotes]{lectureslides}\input{$(SLIDES_IN)}'
 
 #
 # Build the slides with notes, 6-up.
 #
 notes: $(NOTES_PREREQS)
 
-$(NOTES).pdf: $(NOTES).tex slides-notes.pdf
-	$(LATEXCMD) $<
-	$(LATEXCMD) $<
+$(NOTES).pdf: $(NOTES_IN).tex slides-notes.pdf
+	$(LATEXCMD) -jobname=$(NOTES) $<
+	$(LATEXCMD) -jobname=$(NOTES) $<
 
 else
 
@@ -199,9 +204,9 @@
 # omitted from the combined document.
 #
 ifeq ($(strip $(FIGURES)),)
-COMBINED_PREREQS:=$(COMBINED).tex slides-combined.pdf
+COMBINED_PREREQS:=$(COMBINED_IN).tex slides-combined.pdf
 else
-COMBINED_PREREQS:=$(COMBINED).tex slides-combined.pdf $(FIGURES).pdf
+COMBINED_PREREQS:=$(COMBINED_IN).tex slides-combined.pdf $(FIGURES).pdf
 endif
 
 #
@@ -209,9 +214,9 @@
 #
 slides-combined: slides-combined.pdf
 
-slides-combined.pdf: $(SLIDES).tex $(SLIDE_IMAGES) $(SLIDE_BACKGROUNDS)
-	$(LATEXCMD) --jobname=slides-combined '\documentclass[$(LATEX_OPTS),handout]{lectureslides}\input{$(SLIDES)}'
-	$(LATEXCMD) --jobname=slides-combined '\documentclass[$(LATEX_OPTS),handout]{lectureslides}\input{$(SLIDES)}'
+slides-combined.pdf: $(SLIDES_IN).tex $(SLIDE_IMAGES) $(SLIDE_BACKGROUNDS)
+	$(LATEXCMD) -jobname=slides-combined '\documentclass[$(LATEX_OPTS),handout]{lectureslides}\input{$(SLIDES_IN)}'
+	$(LATEXCMD) -jobname=slides-combined '\documentclass[$(LATEX_OPTS),handout]{lectureslides}\input{$(SLIDES_IN)}'
 
 #
 # Build the complete combined document.
@@ -219,8 +224,8 @@
 combined: $(COMBINED).pdf
 
 $(COMBINED).pdf: $(COMBINED_PREREQS) $(COMBI_IMAGES) $(COMBI_FILES)
-	$(LATEXCMD) $<
-	$(LATEXCMD) $<
+	$(LATEXCMD) -jobname=$(COMBINED) $<
+	$(LATEXCMD) -jobname=$(COMBINED) $<
 
 else
 
@@ -239,9 +244,9 @@
 
 figures: $(FIGURES).pdf
 
-$(FIGURES).pdf: $(FIGURES).tex $(FIG_IMAGES) $(FIG_FILES)
-	$(LATEXCMD) $<
-	$(LATEXCMD) $<
+$(FIGURES).pdf: $(FIGURES_IN).tex $(FIG_IMAGES) $(FIG_FILES)
+	$(LATEXCMD) -jobname=$(FIGURES) $<
+	$(LATEXCMD) -jobname=$(FIGURES) $<
 
 figures2up: $(FIGURES)-reduced.pdf
 
@@ -307,7 +312,6 @@
 	@$(ECHO) "ALL_PAPERS_ROOT = [$(ALL_PAPERS_ROOT)]"
 	@$(ECHO) "TEACHING_SHARED = [$(TEACHING_SHARED)]"
 	@$(ECHO) "HANDBOOK_INSTALL_ROOT = [$(HANDBOOK_INSTALL_ROOT)]"
-	@$(ECHO) "CHAPTER = [$(CHAPTER)]"
 	@$(ANNOUNCE) Internally defined variables
 	@$(ECHO) "GLOBAL_HANDBOOK_INCLUDE = [$(GLOBAL_HANDBOOK_INCLUDE)]"
 	@$(ECHO) "INSTALL_DIRECTORY = [$(INSTALL_DIRECTORY)]"
@@ -317,6 +321,8 @@
 	@$(ECHO) "LATEX_INIT_FILE = [$(LATEX_INIT_FILE)]"
 	@$(ECHO) "SUBJECT_CODE = [$(SUBJECT_CODE)]"
 	@$(ECHO) "PAPER_NUMBER = [$(PAPER_NUMBER)]"
+	@$(ECHO) "DOC_TYPE = [$(DOC_TYPE)]"
+	@$(ECHO) "DOC_NUM = [$(DOC_NUM)]"
 	@$(ECHO) "INSTALL_FILES = [$(INSTALL_FILES)]"
 	@$(ECHO) "SLIDE_IMAGES = [$(SLIDE_IMAGES)]"
 	@$(ECHO) "SLIDE_BACKGROUNDS = [$(SLIDE_BACKGROUNDS)]"
@@ -331,11 +337,15 @@
 	@$(ECHO) "LATEXCMD = [$(LATEXCMD)]"
 	@$(ECHO) "DRAFT = [$(DRAFT)]"
 	@$(ECHO) "LATEX_OPTS = [$(LATEX_OPTS)]"
+	@$(ECHO) "SLIDES_IN = [$(SLIDES_IN)]"
 	@$(ECHO) "SLIDES = [$(SLIDES)]"
 	@$(ECHO) "SLIDES_PREREQS = [$(SLIDES_PREREQS)]"
 	@$(ECHO) "SLIDES_NOTES_PREREQS = [$(NOTES_PREREQS)]"
+	@$(ECHO) "FIGURES_IN = [$(FIGURES_IN)]"
 	@$(ECHO) "FIGURES = [$(FIGURES)]"
+	@$(ECHO) "COMBINED_IN = [$(COMBINED_IN)]"
 	@$(ECHO) "COMBINED = [$(COMBINED)]"
+	@$(ECHO) "NOTES_IN = [$(NOTES_IN)]"
 	@$(ECHO) "NOTES = [$(NOTES)]"
 	@$(ECHO) "NOTES_PREREQS = [$(NOTES_PREREQS)]"
 	@$(ECHO) "COMBINED_PREREQS = [$(COMBINED_PREREQS)]"