Update names and some comment.