fixed dir naming issues