renamed repository_id/service_id to repository/service