fix(rest): switch to use the new api everywhere