update unit tests and code to use new api names