Fix up missed renames and comments.