Fix renaming of datastreams

[#63779812]