Fixed some names.