Minor variable renames.