Fixes for blackberry requirement

Cant have filenames with _ in them for blackberry webworkds