Remove underscores from library & framework names

This is more compatible with the various conventions used on various
systems.