Calculate datasource/datapoint names in the exact same way as other plac...

...es.