Change variable names to avoid clash

The variable names in the statement of the octopus roll lemma
overlap with names used (for a different purpose) in the proof,
which is confusing.
Reverse text/diagram ordering in octopus roll lemma

I find it easier to follow the proof if the text precedes the
associated diagram.