Fix names and added comment.