misc: change some names