Fix default variable names.