I don’t think there’s anything in there that is specifically requiring the PointID to be the column name… I think the point id can be any value that’s unique for the point (so in this case, perhaps something like “siteid_pointid”).
Everything else about the click to graph supports the setup you’ve described, so it may just be an issue of tracking down where it generates the point id for a new pen and changing it to include the datasource name or something else.
Regards,