nameerror resolution + semantic changes