minor cosmetic changes (names of files, and consequent calls)