Fixed conflicts in file names