Rename some variables in select/linear, no change in logic