Clean up DataSourceId, DataLayerId #7560
Description
Let’s think about what’s needed where and what names make the most sense
See discussions at https://scm.slack.com/archives/C5AKLAV0B/p1700831539308049?thread_ts=1697184159.482769&cid=C5AKLAV0B and #7395 (comment)