Change of file names to match standard