Use original file names to make Makefile construction easier