[FIX] Change some file names