locations with names, renaming, more externals elimination