[PATCH 5.10 20/71] ice: Rename a couple of variables