Fixed for the new file names and for python3.