fix hidden reply to deleted comment (and change a few names)
Merge branch 'fix/reference-deleted-comment'