fix dir and name