changed variable names to reflect API changes