Rename these. They're marked ABI, but no ZMZ using them has been released yet.