Fix massage and file name