removed underscores

for compatibility with bb
Removed underscore from names

removed underscore from filename to make it bb compatible