Tweaked some names.