comm: Rename a lot of state pointer variables