Better names for file and dir parameters and internal vars