Update comments on rename
Merge pull request #654 from anandpdoshi/anand-wip

Update comments on rename