rename class for unwind tie
split invariant, and move bits around