RTGOV-297 Change datasource name to be consistent