Fix the path name conflicts