improve some names