fix some naming + dupe update loop

it could use finalization