File names changed according to standards