Changed naming for IP union.
Fixed build errors.