Update comments to reflect new variable names. Patch contributed by