Minor fixes to r55918 - documentation and variable names