refactor some file names