made comment names consistent