Update some names and clean up a bit