fixed naming issues with new api