Re-refix maintypes.