Fix comment names