Some small renames and comments.