more accurate folder naming