add project id and name, fix case for datasource