Cleaned up the file names