Amended some names