Adjusting APIs, typos, renames.