API updates and method renames.