fix some of the API names to be real
fix up some more API names