change some names and minor syntax