Refactored some file names