Fixed variable and file names, and other typos.