GADGETS-72 Change to consistent datasource name