Variable renames, now consistent with source.