change file names, finish up to 3.25