Rename variables to be compatible with resumable-pp.
Merge remote-tracking branch 'upstream/master'