Update template comment with name changes
Add previous comment list