sync up w/ the draft e3x api and terminology