change some names. fix some warnings