Refactoring

Change variable name.
Change message output file name.