Use first_name in comments as well