Renamed some more files to imply function.