Cosmetic improvement to auto-gen variable names