Merge "Rename data_processing client"