adapted to the changed file names