Fix up some names