renaming stuff in old equivalence code