Makefile changed to reference new-style document names