Fix silly-sounding names