DS folder name consistency