more renaming for updated API methods and variables