Update PNGCommentator for new naming conventions
Merge pull request #1643 from Cottser/pngcommentator

Update PNGCommentator for new naming conventions