Fixed dir naming