Each time I look at this code I get confused about what the different
variables represent. Rename a few of them to better indicate what they
represent.
(From OE-Core rev: e39d97c0b191add9281bac463ca059685288c81a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>