re #8597 Code maintenance - comments, namespace changes
Simple parser - missing comments, code needed asap
Rename