Merge "Standardize the pap pod/service name."