Fix issue in folder naming