$name is more right as it handles the case when $Name is not defined
Merge branch '4.2/cf-combobox-name-fix' into 4.2-trunk