Merge "Rename image members clients"