Updated intent naming and comments.