Improved directories names