Fixes in directories names