Made directory names consistent