enhance variable names

Signed-off-by: Sami Kerola <kerolasa@iki.fi>