Adjusted dir variable names.