Changed file names to new format