removed trailing `_` from dir names