Rename variable.
Merge topic 'target-sources-error-conditions' into next

251827cc Rename variable.