Change some names and icons