Adjusted dir names