updated naming to match new api