Types renamed back (take 2)