Unify directory names