reworked stronger uniq def + renaming lemma