cleaning some variables names

Signed-off-by: Mickael Philit <mickey.phy@gmail.com>