diff --git a/Makefile b/Makefile
index d5e1bae9c..b2fcbbcbd 100644
--- a/Makefile
+++ b/Makefile
@@ -218,14 +218,14 @@ heap: sampleledgers hledgerp
 	mv hledgerp.hp profs/$(TIME).hp
 	(cd profs; rm -f latest.hp; ln -s $(TIME).hp latest.hp; \
 		hp2ps $(TIME).hp; rm -f latest.ps; ln -s $(TIME).ps latest.ps; rm -f *.aux)
-	$(VIEWPSCMD) profs/latest.ps
+	$(VIEWPS) profs/latest.ps
 
 # generate and display a code coverage report
 coverage: sampleledgers hledgercov
 	@echo "Generating coverage report with $(COVCMD)"
 	tools/coverage "markup --destdir=profs/coverage" test
 	cd profs/coverage; rm -f index.html; ln -s hpc_index.html index.html
-	$(VIEWHTMLCMD) profs/coverage/index.html
+	$(VIEWHTML) profs/coverage/index.html
 
 # get a debug prompt
 ghci:
@@ -288,11 +288,11 @@ codepdf:
 # view all docs and code as pdf
 PDFS=website/{README,README2,MANUAL,NEWS,CONTRIBUTORS,SCREENSHOTS}.pdf code.pdf
 viewall: pdf
-	$(VIEWPDFCMD) $(PDFS)
+	$(VIEWPDF) $(PDFS)
 
 # print all docs and code for offline reading
 printall: pdf
-	$(PRINTCMD) $(PDFS)
+	$(PRINT) $(PDFS)
 
 # push latest docs etc. and update the hledger.org site
 site: push
@@ -309,7 +309,7 @@ apidocs: haddock hscolour #sourcegraph #hoogle
 
 # generate and view the api docs
 viewapidocs: apidocs
-	$(VIEWHTMLCMD) website/api-doc/index.html
+	$(VIEWHTML) website/api-doc/index.html
 
 # generate code documentation with haddock
 # --ignore-all-exports means we are documenting internal implementation, not library api