naming conventions changed, updated to public api version