fix aligning in optionalof
rename & split z2 ring