Make some names better.