make sure datasource type and name are interpreted correctly