Use legacy naming to avoid 'source' being pushed of the list of streams prematurely