More generic renaming
Normalization for Effects with working equality