Fix comments to be up to date with current API.
Merge pull request #1630 from zaheerm/fixcomments

Fix comments to be up to date with current API.