Merge "Rename service client classes which include "Ip""