Fixing folder names for cbu