Slight modification to file names, TODO file still out of date