Replace manual name updating with -setNameWithFormat: