Fixed file names and removed duplicates