Rename clientId to eShopId