Fixed some names