Refactored some file names.