Rename slightly and improve comments.