continue to migrate API to object-oriented model
change variable names to match changes to API