old_api working again

All the code renaming and refactoring broke the old_api code (test_old_api.py). This commit fixes it I think.