fixed directory naming conflict