Fixed some names and titles