Merge "Update some autofill var names for clarity" into sc-dev