Clean up some chars.

Trying to automate this in bash without mangling names failed horribly.