Fix for some comments/headers. No functional change.

Includes parameter rename from Tang Chen.