Fix typos and fiddle with file names