Little refactoring to assign defaultv property file name.