Name change and corresponding edits elsewhere.