In the data preparation agent, there is an option to "Create a better name for the variable sets, including a number if it exists (e.g., How old are you? -> Q3. Age)."

It should be possible to select both things separately, i.e., an option for:

"Add variable name(s) to the beginning of the label where these can be determined"

and

"Create a better name for...." (as is but without the number part).

As a user, I may well want one, but not the other.

See also the feature request for "Show variable names in front of label" which works on a variable level, but not for grouped variables. That is, it would be better to have a labelling option that can do this intelligently.