File names and format adjustment