Calculate datasource/datapoint names in the exact same way as other places.
Easier solution
Merge pull request #240 from zenoss/feature/ZEN-13250

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