Better variable name.
phpdoc
More BODYPART fixes.

Possibly related to Bug: 13729